From 788b1abbdc75d6bc727be65fc107fb10eaa484b6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 30 七月 2024 20:04:10 +0800
Subject: [PATCH] 模版变更,下单的界面设置区间,如果填写0.48*0.5的时候筛选条件用0.48,下单的模版查看根据委托单位进行筛选,如果委托单位为空就可以查看所有

---
 performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 2c9fad5..0831c44 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -4,6 +4,7 @@
 import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueClassify;
 import com.yuanchu.mom.dto.PerformanceShiftAddDto;
 import com.yuanchu.mom.pojo.PerformanceShift;
 import com.yuanchu.mom.service.PerformanceShiftService;
@@ -38,34 +39,39 @@
     @Autowired
     private PerformanceShiftService performanceShiftService;
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-鎺掔彮")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "鎺掔彮")
     @PostMapping("add")
     public Result<?> performanceShiftAdd(@RequestBody PerformanceShiftAddDto performanceShiftAddDto) {
         performanceShiftService.performanceShiftAdd(performanceShiftAddDto);
         return Result.success();
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-鏈堜唤鍒嗛〉鏌ヨ")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
     @PostMapping("page")
     public Result<?> performanceShiftPage(Integer size, Integer current, String time, String userName, String laboratory) {
         return Result.success(performanceShiftService.performanceShiftPage(new Page<>(current, size), time, userName, laboratory));
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
     @PostMapping("pageYear")
     public Result<?> performanceShiftPageYear(Integer size, Integer current, String time, String userName, String laboratory) {
         return Result.success(performanceShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, laboratory));
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "鐝鐘舵�佷慨鏀�")
     @PutMapping("update")
     public Result<?> performanceShiftUpdate(@RequestBody PerformanceShift performanceShift) {
         performanceShiftService.performanceShiftUpdate(performanceShift);
         return Result.success();
     }
 
-    @ApiOperation(value = "缁╂晥绠＄悊-鐝-瀵煎嚭")
-    @GetMapping("update")
+    @ValueClassify("鐝")
+    @ApiOperation(value = "瀵煎嚭")
+    @GetMapping("export")
     public void exportToExcel(@NotNull(message = "鏃堕棿涓嶈兘涓虹┖锛�") String time, String userName, String laboratory, Boolean isMonth, HttpServletResponse response) throws Exception {
         Map<Object, Object> data;
         response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");

--
Gitblit v1.9.3