新增履约进度表相关接口

performance-api/src/main/java/com/clx/performance/enums/PerformanceProgressTabEnum.java → performance-api/src/main/java/com/clx/performance/enums/PerformanceProgressEnum.java

@@ -6,14 +6,14 @@ import lombok.Getter;
 import java.util.Arrays;
 import java.util.Optional;
 
-public enum PerformanceProgressTabEnum {
+public enum PerformanceProgressEnum {
     ;
 
 
     //1：进行中的线路（不分页）  2：已结束线路  3：全部线路
     @Getter
     @AllArgsConstructor
-    public enum Type {
+    public enum Tab {
 
         IN_PROCESS(1, "进行中的线路"),
 
@@ -26,12 +26,38 @@ public enum PerformanceProgressTabEnum {
         private final Integer code;
         private final String name;
 
-        public static Optional<Type> getByCode(Integer code) {
+        public static Optional<Tab> getByCode(Integer code) {
             return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
         }
 
         public static String getMsgByCode(int code) {
-            return getByCode(code).map(Type::getName).orElse(null);
+            return getByCode(code).map(Tab::getName).orElse(null);
+        }
+    }
+
+
+
+    @Getter
+    @AllArgsConstructor
+    public enum LogType {
+
+        TODAY_EXPECT_COMPLETE(1, "今日预计完成吨数"),
+        TRADE_REQUIRE_ARRIVE_STATION_TIME(2, "交易要求到站时间"),
+        TRANSPORT_EXPECT_ARRIVE_STATION_TIME(3, "调度备注/跟进措施"),
+        ABNORMAL_REMARK(4, "异常备注"),
+        PERFORMANCE_ABNORMAL_REASON(5, "履约异常原因"),
+        DISPATCH_FOLLOW(6, "物流预计到站时间"),
+        ;
+
+        private final Integer code;
+        private final String name;
+
+        public static Optional<LogType> getByCode(Integer code) {
+            return Arrays.stream(values()).filter(e -> e.code.equals(code)).findFirst();
+        }
+
+        public static String getMsgByCode(int code) {
+            return getByCode(code).map(LogType::getName).orElse(null);
         }
     }
 

performance-api/src/main/java/com/clx/performance/param/pc/carrier/UpdatePerformanceProgressParam.java

+package com.clx.performance.param.pc.carrier;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * @ClassName UpdatePerformanceProgressParam
+ * @Description
+ * @Author kavin
+ * @Date 2024/7/16 10:29
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+public class UpdatePerformanceProgressParam {
+
+
+    @NotNull(message = "id不能为空")
+    @ApiModelProperty("id")
+    private Integer id;
+
+
+    @ApiModelProperty("今日预计完成吨数")
+    private BigDecimal todayExpectComplete;
+
+
+    @ApiModelProperty("交易要求到站时间")
+    private String tradeRequireArriveStationTime;
+
+
+    @ApiModelProperty("物流预计到站时间")
+    private String transportExpectArriveStationTime;
+
+
+    @ApiModelProperty("异常备注")
+    private String abnormalRemark;
+
+    @ApiModelProperty("履约异常原因")
+    private String performanceAbnormalReason;
+
+    @ApiModelProperty("调度备注/跟进措施")
+    private String dispatchFollow;
+}

performance-api/src/main/java/com/clx/performance/vo/pc/PerformanceProgressOperationLogVO.java

+package com.clx.performance.vo.pc;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @ClassName PerformanceProgressOperationLog
+ * @Description
+ * @Author kavin
+ * @Date 2024/7/16 11:07
+ * @Version 1.0
+ */
+
+@Getter
+@Setter
+public class PerformanceProgressOperationLogVO {
+
+
+    @ApiModelProperty("操作时间")
+    private String createTime;
+
+    @ApiModelProperty("操作人")
+    private String createName;
+
+
+    @ApiModelProperty("操作内容")
+    private String operateContent;
+
+}

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/CarrierPerformanceProgressController.java

@@ -2,11 +2,15 @@ package com.clx.performance.controller.pc.carrier;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.carrier.PagePerformanceProgress;
+import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
 import com.clx.performance.service.PerformanceProgressService;
+import com.clx.performance.vo.pc.PerformanceProgressOperationLogVO;
 import com.clx.performance.vo.pc.PerformanceProgressVO;
 import com.msl.common.base.PageData;
 import com.msl.common.convertor.aspect.UnitCovert;
 import com.msl.common.result.Result;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
@@ -15,6 +19,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -48,4 +54,29 @@ public class CarrierPerformanceProgressController {
     }
 
 
+    @ApiOperation(value = "编辑履约进度",notes = "<br>By:刘海泉")
+    @PostMapping("/updatePerformanceProgress")
+    public Result<Object> updatePerformanceProgress(@RequestBody @Validated UpdatePerformanceProgressParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        performanceProgressService.updatePerformanceProgress(param,loginUserInfo.getUserNo(),loginUserInfo.getUserName());
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "编辑履约进度",notes = "<br>By:刘海泉")
+    @GetMapping("/getPerformanceProgressDetail")
+    public Result<Object> getPerformanceProgressDetail(@RequestParam("id") @NotNull(message = "id不能为空") Integer id) {
+        performanceProgressService.getPerformanceProgressDetail(id);
+        return Result.ok();
+    }
+
+
+    @ApiOperation(value = "编辑履约进度",notes = "<br>By:刘海泉")
+    @GetMapping("/getOperationLog")
+    public Result<List<PerformanceProgressOperationLogVO>> getOperationLog(@RequestParam("orderNo") @NotBlank(message = "订单编号不能为空") String orderNo) {
+        List<PerformanceProgressOperationLogVO> list  = performanceProgressService.getOperationLog(orderNo);
+        return Result.ok(list);
+    }
+
+
 }

performance-web/src/main/java/com/clx/performance/model/PerformanceProgress.java

@@ -173,7 +173,7 @@ public class PerformanceProgress implements HasKey<Integer> {
     private String tradeRequireArriveStationTime;
 
     @TableField("transport_expect_arrive_station_time")
-    @ApiModelProperty("交易要求到站时间")
+    @ApiModelProperty("物流预计到站时间")
     private String transportExpectArriveStationTime;
 
     @TableField("prediction_freight_price")

performance-web/src/main/java/com/clx/performance/model/PerformanceProgressLog.java

 package com.clx.performance.model;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
@@ -8,10 +10,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.experimental.Accessors;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+
 import java.time.LocalDateTime;
-import java.io.Serializable;
 
 /**
  * @author kavin
@@ -35,6 +35,15 @@ public class PerformanceProgressLog implements HasKey<Integer> {
     @ApiModelProperty("操作内容")
     private String operateContent;
 
+
+    @TableField("create_by")
+    @ApiModelProperty("操作人编号")
+    private Long createBy;
+
+    @TableField("create_name")
+    @ApiModelProperty("操作人名称")
+    private String createName;
+
     @TableField("create_time")
     @ApiModelProperty("创建时间")
     private LocalDateTime createTime;

performance-web/src/main/java/com/clx/performance/service/PerformanceProgressService.java

@@ -3,8 +3,12 @@ package com.clx.performance.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.PerformanceProgress;
 import com.clx.performance.param.pc.carrier.PagePerformanceProgress;
+import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
+import com.clx.performance.vo.pc.PerformanceProgressOperationLogVO;
 import com.clx.performance.vo.pc.PerformanceProgressVO;
 
+import java.util.List;
+
 /**
  * @author kavin
  * Date 2024-07-12
@@ -18,5 +22,9 @@ public interface PerformanceProgressService {
 
     void saveOrUpdatePerformanceProgress(PerformanceProgress item);
 
+    void updatePerformanceProgress(UpdatePerformanceProgressParam param, Long userNo, String userName);
+
+    void getPerformanceProgressDetail(Integer id);
 
+    List<PerformanceProgressOperationLogVO> getOperationLog(String orderNo);
 }

performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java

@@ -4,12 +4,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.PerformanceProgressDao;
 import com.clx.performance.enums.OrderEnum;
-import com.clx.performance.enums.PerformanceProgressTabEnum;
+import com.clx.performance.enums.PerformanceProgressEnum;
 import com.clx.performance.enums.ResultEnum;
 import com.clx.performance.model.PerformanceProgress;
 import com.clx.performance.param.pc.carrier.PagePerformanceProgress;
+import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
 import com.clx.performance.service.PerformanceProgressService;
 import com.clx.performance.struct.PerformanceProgressStruct;
+import com.clx.performance.vo.pc.PerformanceProgressOperationLogVO;
 import com.clx.performance.vo.pc.PerformanceProgressVO;
 import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
@@ -72,15 +74,15 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         IPage<PerformanceProgressVO> returnPage = new Page<>();
 
 
-        if(Objects.equals(param.getTab(), PerformanceProgressTabEnum.Type.IN_PROCESS.getCode())){
+        if(Objects.equals(param.getTab(), PerformanceProgressEnum.Tab.IN_PROCESS.getCode())){
             param.setPage(1);
             param.setPageSize(10000);
             page =  performanceProgressDao.pagePerformanceProgress(inProcessStatusList,param);
 
-        }else if(Objects.equals(param.getTab(), PerformanceProgressTabEnum.Type.END.getCode())){
+        }else if(Objects.equals(param.getTab(), PerformanceProgressEnum.Tab.END.getCode())){
             page =  performanceProgressDao.pagePerformanceProgress(endStatusList,param);
 
-        }else if(Objects.equals(param.getTab(), PerformanceProgressTabEnum.Type.ALL.getCode())){
+        }else if(Objects.equals(param.getTab(), PerformanceProgressEnum.Tab.ALL.getCode())){
             page =  performanceProgressDao.pagePerformanceProgress(allStatusList,param);
 
         }
@@ -96,7 +98,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
 
 
         //如果查询的是 已结束线路,则不需要计算，直接返回
-        if(Objects.equals(param.getTab(), PerformanceProgressTabEnum.Type.END.getCode())){
+        if(Objects.equals(param.getTab(), PerformanceProgressEnum.Tab.END.getCode())){
             return returnPage;
         }
 
@@ -146,4 +148,19 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             performanceProgressDao.saveEntity(item);
         }
     }
+
+    @Override
+    public void updatePerformanceProgress(UpdatePerformanceProgressParam param, Long userNo, String userName) {
+
+    }
+
+    @Override
+    public void getPerformanceProgressDetail(Integer id) {
+
+    }
+
+    @Override
+    public List<PerformanceProgressOperationLogVO> getOperationLog(String orderNo) {
+        return null;
+    }
 }