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

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

@@ -2,6 +2,7 @@ package com.dituhui.pea.order.controller;
 
 
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
+import com.dituhui.pea.order.common.TimeUtils;
 import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
 import com.dituhui.pea.order.dto.OrderChangeListReqDTO;
 import com.dituhui.pea.order.service.WorkbenchService;
 import com.dituhui.pea.order.service.WorkbenchService;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
@@ -34,10 +35,11 @@ public class WorkbenchController {
 	}
 	}
 
 
 	@GetMapping("/workbench/summary")
 	@GetMapping("/workbench/summary")
-	public Result<?> workbenchSummary(@RequestParam String levelType, @RequestParam String levelValue, @RequestParam LocalDate date) {
+	public Result<?> workbenchSummary(@RequestParam String levelType, @RequestParam String levelValue, @RequestParam String date) {
 		Result<?> res = null;
 		Result<?> res = null;
+		LocalDate localDate = TimeUtils.IsoDate2LocalDate(date);
 		try {
 		try {
-			res = workbenchService.getWorkbenchSummary(levelType, levelValue, date);
+			res = workbenchService.getWorkbenchSummary(levelType, levelValue, localDate);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
 			return Result.failed(e.getMessage());
 			return Result.failed(e.getMessage());
 		}
 		}