From 2d061ec924b4b55ea825bfb0ea5b602cc4f8b94b Mon Sep 17 00:00:00 2001 From: lius <Lius2225@163.com> Date: 星期三, 02 八月 2023 10:13:34 +0800 Subject: [PATCH] update --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/controller/MdcEfficiencyReportController.java | 38 ++++++++++++++++++++++++++++++++++---- 1 files changed, 34 insertions(+), 4 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 874b959..cc80bee 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 @@ -7,16 +7,16 @@ import org.jeecg.common.api.vo.Result; import org.jeecg.common.aspect.annotation.AutoLog; import org.jeecg.common.system.vo.LoginUser; +import org.jeecg.modules.mdc.dto.ComparativeAnalysisDto; +import org.jeecg.modules.mdc.dto.DayUtilizationRateDto; 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.jeecg.modules.mdc.vo.*; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @author: LiuS @@ -61,4 +61,34 @@ return Result.OK(result); } + @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃") + @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃", notes = "璁惧鏁堢巼鎶ヨ〃-缁熻鍒嗘瀽鍒楄〃") + @GetMapping("/dayStatisticalRate") + public Result dayStatisticalRate(MdcEfficiencyReportQueryVo vo) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = user.getId(); + StatisticalAnalysisVo result = mdcEfficiencyReportService.dayStatisticalRate(userId, vo); + return Result.OK(result); + } + + @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽") + @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽", notes = "璁惧鏁堢巼鎶ヨ〃-瀵规瘮鍒嗘瀽") + @GetMapping("/comparativeAnalysis") + public Result comparativeAnalysis(ComparativeAnalysisQueryVo vo) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = user.getId(); + ComparativeAnalysisDto result = mdcEfficiencyReportService.comparativeAnalysis(userId, vo); + return Result.OK(result); + } + + @AutoLog(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼") + @ApiOperation(value = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼", notes = "璁惧鏁堢巼鎶ヨ〃-璁惧鏃ュ埄鐢ㄧ巼") + @GetMapping("/dayUtilizationRate") + public Result dayUtilizationRate(DayUtilizationRateQueryVo vo) { + LoginUser user = (LoginUser) SecurityUtils.getSubject().getPrincipal(); + String userId = user.getId(); + DayUtilizationRateDto result = mdcEfficiencyReportService.dayUtilizationRate(userId, vo); + return Result.OK(result); + } + } -- Gitblit v1.9.3