Merge remote-tracking branch 'origin/v19.4_order_performance_progress_20240712' into dev

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

@@ -27,7 +27,7 @@ import java.util.List;
 @RestController
 @RequestMapping(value="/pc/carrier/performanceProgress")
 @Validated
-@Api(tags = "承运端-承运履约表")
+@Api(tags = "承运端-履约进度表")
 @AllArgsConstructor
 public class CarrierPerformanceProgressController {
 
@@ -47,8 +47,8 @@ public class CarrierPerformanceProgressController {
     @ApiOperation(value = "进行中数据调整顺序",notes = "<br>By:刘海泉")
     @GetMapping("/updateAdjustOrder")
     public Result<Object> updateAdjustOrder(
-              @RequestParam("adjustOrderOneId") @NotBlank(message = "调整订单1的id不能为空") Integer adjustOrderId,
-            @RequestParam("adjustOrderTwoId") @NotBlank(message = "调整订单2的id不能为空") Integer adjustOrderBeforeId
+              @RequestParam("adjustOrderOneId") @NotNull(message = "调整订单1的id不能为空") Integer adjustOrderId,
+            @RequestParam("adjustOrderTwoId") @NotNull(message = "调整订单2的id不能为空") Integer adjustOrderBeforeId
             ) {
         performanceProgressService.updateAdjustOrder(adjustOrderId,adjustOrderBeforeId);
         return Result.ok();

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

@@ -38,6 +38,7 @@ import com.msl.common.utils.DateUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.exception.ExceptionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -193,11 +194,14 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         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;
-        if(Objects.nonNull(item.getTodayExpectComplete())
-                && Objects.nonNull(param.getTodayExpectComplete())
-                && item.getTodayExpectComplete().compareTo(param.getTodayExpectComplete()) != 0){
+        BigDecimal todayExpectComplete = Objects.nonNull(item.getTodayExpectComplete())
+                ?item.getTodayExpectComplete():BigDecimal.ZERO;
+
+        if(Objects.nonNull(param.getTodayExpectComplete())
+                && todayExpectComplete.compareTo(param.getTodayExpectComplete()) != 0){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TODAY_EXPECT_COMPLETE,
                     param.getTodayExpectComplete(),userNo,userName);
@@ -206,7 +210,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             change = true;
         }
 
-        if(Objects.equals(item.getTradeRequireArriveStationTime(),param.getTradeRequireArriveStationTime())){
+        if(!StringUtils.equals(item.getTradeRequireArriveStationTime(),param.getTradeRequireArriveStationTime())){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TRADE_REQUIRE_ARRIVE_STATION_TIME,
                     param.getTradeRequireArriveStationTime(),userNo,userName);
@@ -215,7 +219,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             change = true;
         }
 
-        if(Objects.equals(item.getTransportExpectArriveStationTime(),param.getTransportExpectArriveStationTime())){
+        if(!StringUtils.equals(item.getTransportExpectArriveStationTime(),param.getTransportExpectArriveStationTime())){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TRADE_REQUIRE_ARRIVE_STATION_TIME,
                     param.getTransportExpectArriveStationTime(),userNo,userName);
@@ -224,7 +228,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             change = true;
         }
 
-        if(Objects.equals(item.getAbnormalRemark(),param.getAbnormalRemark())){
+        if(!StringUtils.equals(item.getAbnormalRemark(),param.getAbnormalRemark())){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.ABNORMAL_REMARK,
                     param.getAbnormalRemark(),userNo,userName);
@@ -232,7 +236,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             logs.add(log);
             change = true;
         }
-        if(Objects.equals(item.getPerformanceAbnormalReason(),param.getPerformanceAbnormalReason())){
+        if(!StringUtils.equals(item.getPerformanceAbnormalReason(),param.getPerformanceAbnormalReason())){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.PERFORMANCE_ABNORMAL_REASON,
                     param.getPerformanceAbnormalReason(),userNo,userName);
@@ -240,7 +244,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             logs.add(log);
             change = true;
         }
-        if(Objects.equals(item.getDispatchFollow(),param.getDispatchFollow())){
+        if(!StringUtils.equals(item.getDispatchFollow(),param.getDispatchFollow())){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.DISPATCH_FOLLOW,
                     param.getDispatchFollow(),userNo,userName);
@@ -405,8 +409,8 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
         FeignOrderInfoVO orderInfo = orderService.getOrderInfo(data.getOrderNo()).get();
 
         //取完成之前的运单数据
-        List<OrderChild> childs = orderChildDao.listBeforeCompleteByOrderNo(data.getOrderNo());
-        int orderedTruckNum = childs.size();  //接单车数
+        List<OrderChild> orderChildList = orderChildDao.listBeforeCompleteByOrderNo(data.getOrderNo());
+        int orderedTruckNum = orderChildList.size();  //接单车数
         int arriveSendTruckNum = 0; //到达货源地车数
         int loadTruckNum = 0;  //装车车数
         int unloadTruckNum = 0;   //卸车车数
@@ -419,7 +423,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
 
         BigDecimal orderedWeight = BigDecimal.ZERO;     //接单吨数
 
-        for (OrderChild child : childs) {
+        for (OrderChild child : orderChildList) {
             if(child.getStatus() >= OrderChildEnum.Status.ARRIVE_SEND.getCode()){
                 arriveSendTruckNum = arriveSendTruckNum + 1;
             }