Merge remote-tracking branch 'origin/develop' into develop

project-order/src/main/java/com/dituhui/pea/order/controller/WorkbenchController.java

@@ -19,28 +19,28 @@ import java.time.LocalDate;
 @RequestMapping("/pea-order")
 @RequestMapping("/pea-order")
 public class WorkbenchController {
 public class WorkbenchController {
 
 
-    @Autowired
-    WorkbenchService workbenchService;
+	@Autowired
+	WorkbenchService workbenchService;
 
 
-    @GetMapping("/workbench/serviceOrder/change/list")
-    public Result<?> orderChangeList(@Validated OrderChangeListReqDTO reqDTO) {
-        Result<?> res = null;
-        try {
-            res = workbenchService.getOrderChangeList(reqDTO);
-        } catch (BusinessException e) {
-            return Result.failed(e.getMessage());
-        }
-        return res;
-    }
+	@GetMapping("/workbench/serviceOrder/change/list")
+	public Result<?> orderChangeList(@Validated OrderChangeListReqDTO reqDTO) {
+		Result<?> res = null;
+		try {
+			res = workbenchService.getOrderChangeList(reqDTO);
+		} catch (BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
+	}
 
 
-    @GetMapping("/workbench/summary")
-    public Result<?> workbenchSummary(@RequestParam String levelType, @RequestParam String levelValue, @RequestParam LocalDate date) {
-        Result<?> res = null;
-        try{
-            res = workbenchService.getWorkbenchSummary(levelType, levelValue, date);
-        } catch (BusinessException e) {
-            return Result.failed(e.getMessage());
-        }
-        return res;
-    }
+	@GetMapping("/workbench/summary")
+	public Result<?> workbenchSummary(@RequestParam String levelType, @RequestParam String levelValue, @RequestParam LocalDate date) {
+		Result<?> res = null;
+		try {
+			res = workbenchService.getWorkbenchSummary(levelType, levelValue, date);
+		} catch (BusinessException e) {
+			return Result.failed(e.getMessage());
+		}
+		return res;
+	}
 }
 }

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

@@ -28,9 +28,6 @@ import java.util.Map;
 public class WorkbenchServiceImpl implements WorkbenchService {
 public class WorkbenchServiceImpl implements WorkbenchService {
 
 
 	@Autowired
 	@Autowired
-	private OrderChangeDao orderChangeDao;
-
-	@Autowired
 	private OrderRequestDao orderRequestDao;
 	private OrderRequestDao orderRequestDao;
 
 
 	@Autowired
 	@Autowired
@@ -43,6 +40,10 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 	private CapacityEngineerStatDao capacityEngineerStatDao;
 	private CapacityEngineerStatDao capacityEngineerStatDao;
 
 
 	@Autowired
 	@Autowired
+	private OrderEventDao orderEventDao;
+
+
+	@Autowired
 	private OrderRequestMPDao orderRequestMPDao;
 	private OrderRequestMPDao orderRequestMPDao;
 
 
 	@Override
 	@Override
@@ -52,11 +53,11 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 		String levelType = reqDTO.getLevelType();
 		String levelType = reqDTO.getLevelType();
 		String levelValue = reqDTO.getLevelValue();
 		String levelValue = reqDTO.getLevelValue();
 		if ("cluster".equals(levelType)) {
 		if ("cluster".equals(levelType)) {
-			changes = orderChangeDao.findAllByClusterId(levelValue, reqDTO.getDate(), pageable);
+			changes = orderEventDao.findAllByClusterId(levelValue, reqDTO.getDate(),  pageable);
 		} else if ("branch".equals(levelType)) {
 		} else if ("branch".equals(levelType)) {
-			changes = orderChangeDao.findAllByBranchId(levelValue, reqDTO.getDate(), pageable);
+			changes = orderEventDao.findAllByBranchId(levelValue, reqDTO.getDate(), pageable);
 		} else {
 		} else {
-			changes = orderChangeDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable);
+			changes = orderEventDao.findAllByGroupId(levelValue, reqDTO.getDate(), pageable);
 		}
 		}
 		List<OrderChangeListRespDTO.Content> contents = new ArrayList<>();
 		List<OrderChangeListRespDTO.Content> contents = new ArrayList<>();
 		for (Object e1 : changes.getContent()) {
 		for (Object e1 : changes.getContent()) {
@@ -68,7 +69,7 @@ public class WorkbenchServiceImpl implements WorkbenchService {
 					.setOperator(e.getOperator())
 					.setOperator(e.getOperator())
 					.setDescription(e.getContent())
 					.setDescription(e.getContent())
 					.setMemo(e.getMemo())
 					.setMemo(e.getMemo())
-					.setUpdateTime(e.getUpdateTime().toString());
+					.setUpdateTime(e.getUpdateTime());
 			contents.add(content);
 			contents.add(content);
 		}
 		}
 		OrderChangeListRespDTO respDTO = new OrderChangeListRespDTO();
 		OrderChangeListRespDTO respDTO = new OrderChangeListRespDTO();