Merge branch 'develop' of https://gitlab.dituhui.com/bsh/project/project into develop

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

@@ -151,6 +151,12 @@ public class OrderInfoServiceImpl implements OrderInfoService {
             if (StringUtils.isNotBlank(request.getDescription())) {
             if (StringUtils.isNotBlank(request.getDescription())) {
                 orderInfo.setDescription(request.getDescription());
                 orderInfo.setDescription(request.getDescription());
             }
             }
+            if (BeanServiceFlowEnum.STARTED.getStatus().equals(BeanServiceFlowEnum.getStatusByName(request.getStage()))) {
+                orderInfo.setActualStartTime(LocalDateTimeUtil.of(request.getHappen()));
+            }
+            if (BeanServiceFlowEnum.FINISHED.getStatus().equals(BeanServiceFlowEnum.getStatusByName(request.getStage()))) {
+                orderInfo.setActualEndTime(LocalDateTimeUtil.of(request.getHappen()));
+            }
             orderInfoDao.save(orderInfo);
             orderInfoDao.save(orderInfo);
             //记录流程
             //记录流程
             commonService.addOrderEvent(request.getOrderId(), "", "BEAN", "BEAN", OrderStatusEnum.NORMAL.getDescription(), request.getStage(), "", LocalDateTimeUtil.of(request.getHappen()));
             commonService.addOrderEvent(request.getOrderId(), "", "BEAN", "BEAN", OrderStatusEnum.NORMAL.getDescription(), request.getStage(), "", LocalDateTimeUtil.of(request.getHappen()));
@@ -336,7 +342,7 @@ public class OrderInfoServiceImpl implements OrderInfoService {
 
 
         //处理一家多单
         //处理一家多单
         // order = handleMultipleOrders(order);
         // order = handleMultipleOrders(order);
-        if (!orderDt.isEqual(expectBegin.toLocalDate())){
+        if (!orderDt.isEqual(expectBegin.toLocalDate())) {
             order = handleMultipleOrders(order);
             order = handleMultipleOrders(order);
         }
         }
         order.setOrgClusterId(clusterId);
         order.setOrgClusterId(clusterId);

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

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

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManager;
@@ -44,7 +45,8 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 
 
     @Override
     @Override
     public Result<?> getOrderChangeList(OrderChangeListDTO.Request reqDTO) {
     public Result<?> getOrderChangeList(OrderChangeListDTO.Request reqDTO) {
-		Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize());
+        Sort sort = Sort.by(Sort.Order.desc("createTime"));
+        Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize(), sort);
         Page<OrderEventEntity> page;
         Page<OrderEventEntity> page;
         String levelType = reqDTO.getLevelType();
         String levelType = reqDTO.getLevelType();
         String levelValue = reqDTO.getLevelValue();
         String levelValue = reqDTO.getLevelValue();