Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java

@@ -100,4 +100,8 @@ public class OrderServiceList {
      * 改约原因
      */
     private String reschedulingReason;
+
+    private String planStartTime;
+
+    private String planEndTime;
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -163,6 +163,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
 
             record.setActualStartTime(ObjectUtil.isNull(o.getActualStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime()));
             record.setActualEndTime(ObjectUtil.isNull(o.getActualEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime()));
+
+            record.setPlanStartTime(ObjectUtil.isNull(o.getPlanStartTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getPlanStartTime()));
+            record.setPlanEndTime(ObjectUtil.isNull(o.getPlanEndTime()) ? "" : TimeUtils.IsoTimestamp2DateTime(o.getPlanEndTime()));
             if (StringUtils.isNotEmpty(o.getMultipleOrders())) {
                 List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
                 List<OrderServiceList> multipleItems = new ArrayList<>();