Commit decd39b5 by 王力

Merge branch 'dev_bugfix_workbench_summary' into 'develop'

修复类型转换错误

See merge request !156
2 parents 409b3b04 da85dc10
......@@ -2,6 +2,7 @@ package com.dituhui.pea.order.controller;
import com.dituhui.pea.common.BusinessException;
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.service.WorkbenchService;
import lombok.extern.slf4j.Slf4j;
......@@ -34,10 +35,11 @@ public class WorkbenchController {
}
@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;
LocalDate localDate = TimeUtils.IsoDate2LocalDate(date);
try {
res = workbenchService.getWorkbenchSummary(levelType, levelValue, date);
res = workbenchService.getWorkbenchSummary(levelType, levelValue, localDate);
} catch (BusinessException e) {
return Result.failed(e.getMessage());
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!