From 0b64efc97ee0594a84f28d23c847f738d68eae6d Mon Sep 17 00:00:00 2001 From: lius <Lius2225@163.com> Date: 星期一, 17 七月 2023 17:09:55 +0800 Subject: [PATCH] 加工数量 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java | 22 +++++++++++++++++----- 1 files changed, 17 insertions(+), 5 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java index 1dcddd9..874b959 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java @@ -9,6 +9,8 @@ import org.jeecg.common.system.vo.LoginUser; import org.jeecg.modules.mdc.service.MdcEfficiencyReportService; import org.jeecg.modules.mdc.vo.MdcEfficiencyReportQueryVo; +import org.jeecg.modules.mdc.vo.MdcEfficiencyReportShiftQueryVo; +import org.jeecg.modules.mdc.vo.MdcEfficiencyShiftVo; import org.jeecg.modules.mdc.vo.MdcEfficiencyVo; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -39,13 +41,23 @@ return Result.OK(result); } - @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�") - @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�", notes = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�") - @GetMapping("/shiftEfficiencyList") - public Result shiftEfficiencyList(MdcEfficiencyReportQueryVo vo) { + @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ") + @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ", notes = "璁惧鏁堢巼鎶ヨ〃-寮�鍔ㄧ巼鍒楄〃鏌ヨ") + @GetMapping("/efficiencyPOList") + public Result efficiencyPOList(MdcEfficiencyReportQueryVo vo) { LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); String userId = user.getId(); - MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyList(userId, vo); + MdcEfficiencyVo result = mdcEfficiencyReportService.efficiencyPOList(userId, vo); + return Result.OK(result); + } + + @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�") + @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�", notes = "璁惧鏁堢巼鎶ヨ〃-鐝鍒╃敤鐜囧垪琛ㄦ煡璇�") + @GetMapping("/efficiencyShiftList") + public Result efficiencyShiftList(MdcEfficiencyReportShiftQueryVo vo) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = user.getId(); + MdcEfficiencyShiftVo result = mdcEfficiencyReportService.efficiencyShiftList(userId, vo); return Result.OK(result); } -- Gitblit v1.9.3