提交 e8eef8f6 authored 作者: 刘海泉's avatar 刘海泉

兼容前端时间组件不选择传空的问题

上级 601194c7
...@@ -231,7 +231,10 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -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(), PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
PerformanceProgressEnum.LogType.TRADE_REQUIRE_ARRIVE_STATION_TIME, PerformanceProgressEnum.LogType.TRADE_REQUIRE_ARRIVE_STATION_TIME,
param.getTradeRequireArriveStationTime(),userNo,userName); param.getTradeRequireArriveStationTime(),userNo,userName);
...@@ -240,7 +243,9 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi ...@@ -240,7 +243,9 @@ public class PerformanceProgressServiceImpl implements PerformanceProgressServi
change = true; 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(), PerformanceProgressLog log = performanceProgressLogService.generateLog(item.getOrderNo(),
PerformanceProgressEnum.LogType.TRANSPORT_EXPECT_ARRIVE_STATION_TIME, PerformanceProgressEnum.LogType.TRANSPORT_EXPECT_ARRIVE_STATION_TIME,
param.getTransportExpectArriveStationTime(),userNo,userName); param.getTransportExpectArriveStationTime(),userNo,userName);
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论