commit

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,9 @@ public class PerformanceProgressDaoImpl extends BaseDaoImpl<PerformanceProgressM
         LambdaQueryWrapper<PerformanceProgress> query = new LambdaQueryWrapper<>();
         return baseMapper.selectCount(query);
     }
+
+    @Override
+    public void updatePerformanceProgress(PerformanceProgress update) {
+
+    }
 }

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

@@ -214,32 +214,29 @@ 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;
             }
         }else{
-               //今日预计完成吨数从有变成无
-              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()));
-                  logs.add(log);
-                  change = true;
-              }
+            //今日预计完成吨数从有变成无
+            if(todayExpectComplete.compareTo(BigDecimal.ZERO) != 0){
+                PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
+                        PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
+                        "-",userNo,userName);
+                logs.add(log);
+                change = true;
+            }
         }
 
         String tradeRequireArriveStationTime = StringUtils.isBlank(param.getTradeRequireArriveStationTime())
@@ -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);
         }
     }