Merge branch 'develop-dingwf-0714' into develop

# Conflicts:
#	project-order/src/main/java/com/dituhui/pea/order/dao/OrderEventDao.java
#	project-order/src/main/java/com/dituhui/pea/order/service/impl/WorkbenchServiceImpl.java

project-order/src/main/java/com/dituhui/pea/order/dao/OrderEventDao.java

@@ -7,7 +7,6 @@ import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 import org.springframework.stereotype.Repository;
 
 
-import java.time.LocalDate;
 import java.util.Date;
 import java.util.Date;
 
 
 @Repository
 @Repository

project-order/src/main/java/com/dituhui/pea/order/entity/OrderChangeEntity.java

-package com.dituhui.pea.order.entity;
-
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import javax.persistence.*;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-
-@Entity
-@Data
-@Accessors(chain = true)
-@Table(name="order_change")
-public class OrderChangeEntity {
-    /**
-     * 自增id
-     */
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Integer id;
-
-    /**
-     * 工单id
-     */
-    private String orderId;
-
-    /**
-     * 子工单id
-     */
-    private String suborderId;
-
-    /**
-     * 变更发起源(bean/pea-web/pea-backend)
-     */
-    private String source;
-
-    /**
-     * 发起人
-     */
-    private String operator;
-
-    /**
-     * 操作内容，指派，规划路线
-     */
-    private String content;
-
-    /**
-     * 变更前的信息
-     */
-    private String contentOld;
-
-    /**
-     * 备注
-     */
-    private String memo;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime createTime;
-
-    /**
-     * 创建时间
-     */
-    private LocalDateTime updateTime;
-
-    public OrderChangeEntity() {}
-}

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

@@ -6,12 +6,11 @@ import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dao.*;
 import com.dituhui.pea.order.dao.*;
 import com.dituhui.pea.order.dto.OrderChangeListDTO;
 import com.dituhui.pea.order.dto.OrderChangeListDTO;
 import com.dituhui.pea.order.dto.WorkbenchSummaryResp;
 import com.dituhui.pea.order.dto.WorkbenchSummaryResp;
-import com.dituhui.pea.order.entity.OrderChangeEntity;
+import com.dituhui.pea.order.entity.OrderEventEntity;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.dituhui.pea.order.entity.OrderRequest;
 import com.dituhui.pea.order.entity.OrderRequestEntity;
 import com.dituhui.pea.order.entity.OrderRequestEntity;
 import com.dituhui.pea.order.service.WorkbenchService;
 import com.dituhui.pea.order.service.WorkbenchService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.time.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 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;
@@ -19,11 +18,8 @@ import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.time.LocalDate;
 import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.*;
 
 
-import static com.dituhui.pea.order.config.OrderConfig.PATTERN_DATE;
-
 @Slf4j
 @Slf4j
 @Service
 @Service
 public class WorkbenchServiceImpl implements WorkbenchService {
 public class WorkbenchServiceImpl implements WorkbenchService {
@@ -49,34 +45,33 @@ 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());
         Pageable pageable = PageRequest.of(reqDTO.getPage() - 1, reqDTO.getSize());
-        Page<?> changes;
+        Page<OrderEventEntity> page;
         String levelType = reqDTO.getLevelType();
         String levelType = reqDTO.getLevelType();
         String levelValue = reqDTO.getLevelValue();
         String levelValue = reqDTO.getLevelValue();
 		Date date = DateUtil.parse(reqDTO.getDate());
 		Date date = DateUtil.parse(reqDTO.getDate());
         if ("cluster".equals(levelType)) {
         if ("cluster".equals(levelType)) {
-            changes = orderEventDao.findAllByClusterId(levelValue, date,  pageable);
+            page = orderEventDao.findAllByClusterId(levelValue, date,  pageable);
         } else if ("branch".equals(levelType)) {
         } else if ("branch".equals(levelType)) {
-            changes = orderEventDao.findAllByBranchId(levelValue, date, pageable);
+            page = orderEventDao.findAllByBranchId(levelValue, date, pageable);
         } else {
         } else {
-            changes = orderEventDao.findAllByGroupId(levelValue, date, pageable);
+            page = orderEventDao.findAllByGroupId(levelValue, date, pageable);
         }
         }
         List<OrderChangeListDTO.Content> contents = new ArrayList<>();
         List<OrderChangeListDTO.Content> contents = new ArrayList<>();
-        for (Object e1 : changes.getContent()) {
-            OrderChangeEntity e = (OrderChangeEntity) e1;
+        for (OrderEventEntity entity : page.getContent()) {
             OrderChangeListDTO.Content content = new OrderChangeListDTO.Content();
             OrderChangeListDTO.Content content = new OrderChangeListDTO.Content();
-            OrderRequestEntity orderRequestEntity = orderRequestDao.getByOrderId(e.getOrderId());
-            content.setOrderId(e.getOrderId())
+            OrderRequestEntity orderRequestEntity = orderRequestDao.getByOrderId(entity.getOrderId());
+            content.setOrderId(entity.getOrderId())
                     .setCustomerName(orderRequestEntity.getName())
                     .setCustomerName(orderRequestEntity.getName())
-                    .setOperator(e.getOperator())
-                    .setDescription(e.getContent())
-                    .setMemo(e.getMemo())
-                    .setUpdateTime(e.getUpdateTime());
+                    .setOperator(entity.getOperator())
+                    .setDescription(entity.getDescription())
+                    .setMemo(entity.getMemo())
+                    .setUpdateTime(entity.getUpdateTime());
             contents.add(content);
             contents.add(content);
         }
         }
         OrderChangeListDTO.Result rs = new OrderChangeListDTO.Result();
         OrderChangeListDTO.Result rs = new OrderChangeListDTO.Result();
-        rs.setTotal(changes.getTotalElements())
-                .setPages(changes.getTotalPages())
-                .setPageSize(changes.getSize())
+        rs.setTotal(page.getTotalElements())
+                .setPages(page.getTotalPages())
+                .setPageSize(page.getSize())
                 .setContent(contents);
                 .setContent(contents);
         return Result.success(rs);
         return Result.success(rs);
     }
     }