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

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

@@ -231,7 +231,10 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
               }
         }
 
-        if(!StringUtils.equals(item.getTradeRequireArriveStationTime(),param.getTradeRequireArriveStationTime())){
+        String tradeRequireArriveStationTime = StringUtils.isBlank(param.getTradeRequireArriveStationTime())
+                ?null:param.getTradeRequireArriveStationTime();
+
+        if(!StringUtils.equals(item.getTradeRequireArriveStationTime(),tradeRequireArriveStationTime)){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TRADE_REQUIRE_ARRIVE_STATION_TIME,
                     param.getTradeRequireArriveStationTime(),userNo,userName);
@@ -240,7 +243,9 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             change = true;
         }
 
-        if(!StringUtils.equals(item.getTransportExpectArriveStationTime(),param.getTransportExpectArriveStationTime())){
+        String transportExpectArriveStationTime = StringUtils.isBlank(param.getTransportExpectArriveStationTime())
+                ?null:param.getTransportExpectArriveStationTime();
+        if(!StringUtils.equals(item.getTransportExpectArriveStationTime(),transportExpectArriveStationTime)){
             PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
                     PerformanceProgressEnum.LogType.TRANSPORT_EXPECT_ARRIVE_STATION_TIME,
                     param.getTransportExpectArriveStationTime(),userNo,userName);