修改履约进度表更新问题

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

@@ -5,6 +5,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
 
 /**
  * @ClassName UpdatePerformanceProgressParam
@@ -25,7 +26,7 @@ public class UpdatePerformanceProgressParam {
 
 
     @ApiModelProperty("今日预计完成吨数")
-    private String todayExpectComplete;
+    private BigDecimal todayExpectComplete;
 
 
     @ApiModelProperty("交易要求到站时间")

performance-web/src/main/java/com/clx/performance/dao/PerformanceProgressDao.java

@@ -19,4 +19,6 @@ public interface PerformanceProgressDao extends BaseDao<PerformanceProgressMappe
     void updateRecordOrder(Long seq,boolean isUp);
 
     long getMaxSeq();
+
+    void updatePerformanceProgress(PerformanceProgress update);
 }

performance-web/src/main/java/com/clx/performance/dao/impl/PerformanceProgressDaoImpl.java

@@ -47,4 +47,17 @@ public class PerformanceProgressDaoImpl extends BaseDaoImpl<PerformanceProgressM
         LambdaQueryWrapper<PerformanceProgress> query = new LambdaQueryWrapper<>();
         return baseMapper.selectCount(query);
     }
+
+    @Override
+    public void updatePerformanceProgress(PerformanceProgress update) {
+        LambdaUpdateWrapper<PerformanceProgress> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(PerformanceProgress :: getId,update.getId());
+        updateWrapper.set(PerformanceProgress :: getTodayExpectComplete,update.getTodayExpectComplete());
+        updateWrapper.set(PerformanceProgress :: getTransportExpectArriveStationTime,update.getTransportExpectArriveStationTime());
+        updateWrapper.set(PerformanceProgress :: getTradeRequireArriveStationTime,update.getTradeRequireArriveStationTime());
+        updateWrapper.set(PerformanceProgress :: getAbnormalRemark,update.getAbnormalRemark());
+        updateWrapper.set(PerformanceProgress :: getPerformanceAbnormalReason,update.getPerformanceAbnormalReason());
+        updateWrapper.set(PerformanceProgress :: getDispatchFollow,update.getDispatchFollow());
+        baseMapper.update(null,updateWrapper);
+    }
 }

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

@@ -214,19 +214,17 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     public void updatePerformanceProgress(UpdatePerformanceProgressParam param, Long userNo, String userName) {
         PerformanceProgress item = performanceProgressDao.getEntityByKey(param.getId()).
                 orElseThrow(ResultEnum.DATA_NOT_FIND);
-        PerformanceProgress update = new PerformanceProgress();
-        update.setId(param.getId());
+
         List<PerformanceProgressLog> logs = new ArrayList<>();
         boolean change = false;
         BigDecimal todayExpectComplete = Objects.nonNull(item.getTodayExpectComplete())
                 ?item.getTodayExpectComplete():BigDecimal.ZERO;
 
-        if(StringUtils.isNotBlank(param.getTodayExpectComplete())){
-            if(new BigDecimal(param.getTodayExpectComplete()).compareTo(todayExpectComplete) !=  0){
+        if(Objects.nonNull(param.getTodayExpectComplete())){
+            if(param.getTodayExpectComplete().compareTo(todayExpectComplete) !=  0){
                 PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                         PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
                         param.getTodayExpectComplete(),userNo,userName);
-                update.setTodayExpectComplete(new BigDecimal(param.getTodayExpectComplete()));
                 logs.add(log);
                 change = true;
             }
@@ -235,8 +233,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
               if(todayExpectComplete.compareTo(BigDecimal.ZERO) != 0){
                   PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                           PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
-                          BigDecimal.ZERO,userNo,userName);
-                  update.setTodayExpectComplete(new BigDecimal(param.getTodayExpectComplete()));
+                          "-",userNo,userName);
                   logs.add(log);
                   change = true;
               }
@@ -249,7 +246,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TRADE_REQUIRE_ARRIVE_STATION_TIME,
                     param.getTradeRequireArriveStationTime(),userNo,userName);
-            update.setTradeRequireArriveStationTime(param.getTradeRequireArriveStationTime());
             logs.add(log);
             change = true;
         }
@@ -260,7 +256,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TRANSPORT_EXPECT_ARRIVE_STATION_TIME,
                     param.getTransportExpectArriveStationTime(),userNo,userName);
-            update.setTransportExpectArriveStationTime(param.getTransportExpectArriveStationTime());
             logs.add(log);
             change = true;
         }
@@ -269,7 +264,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.ABNORMAL_REMARK,
                     param.getAbnormalRemark(),userNo,userName);
-            update.setAbnormalRemark(param.getAbnormalRemark());
             logs.add(log);
             change = true;
         }
@@ -277,7 +271,6 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.PERFORMANCE_ABNORMAL_REASON,
                     param.getPerformanceAbnormalReason(),userNo,userName);
-            update.setPerformanceAbnormalReason(param.getPerformanceAbnormalReason());
             logs.add(log);
             change = true;
         }
@@ -285,13 +278,13 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.DISPATCH_FOLLOW,
                     param.getDispatchFollow(),userNo,userName);
-            update.setDispatchFollow(param.getDispatchFollow());
             logs.add(log);
             change = true;
         }
 
+        PerformanceProgress update = performanceProgressStruct.convertParam(param);
+        performanceProgressDao.updatePerformanceProgress(update);
         if(change){
-            performanceProgressDao.updateEntityByKey(update);
             performanceProgressLogDao.saveBatchList(logs);
         }
     }

performance-web/src/main/java/com/clx/performance/struct/PerformanceProgressStruct.java

 package com.clx.performance.struct;
 
 import com.clx.performance.model.PerformanceProgress;
+import com.clx.performance.param.pc.carrier.UpdatePerformanceProgressParam;
 import com.clx.performance.vo.pc.PerformanceProgressDetailVO;
 import com.clx.performance.vo.pc.PerformanceProgressVO;
 import com.msl.common.utils.DateStructUtil;
@@ -15,4 +16,5 @@ public interface PerformanceProgressStruct {
 
     PerformanceProgressDetailVO convert(PerformanceProgress item);
 
+    PerformanceProgress convertParam(UpdatePerformanceProgressParam param);
 }