From 5e566bdd716e2279dd8f2a10429a0622f1c59ba6 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 17 三月 2025 10:13:44 +0800
Subject: [PATCH] 标准树查询修改, 工时生成回退
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java | 40 ++++++++++++++++------------------------
1 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
index 37ce175..3278dc1 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIssueRecycleController.java
@@ -1,18 +1,18 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueAuth;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+import com.deepoove.poi.data.style.*;
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordIssueRecycle;
import com.ruoyi.manage.service.ManageRecordIssueRecycleService;
-import com.ruoyi.manage.utils.JackSonUtil;
-import com.ruoyi.manage.vo.Result;
+import com.deepoove.poi.data.style.*;
+import com.deepoove.poi.data.style.*;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
@@ -27,53 +27,45 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-13 09:11:05
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIssueRecycle")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordIssueRecycleController {
@Resource
private ManageRecordIssueRecycleService manageRecordIssueRecycleService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
- @PostMapping("/pageManageRecordIssueRecycle")
- public Result pageManageRecordIssueRecycle(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordIssueRecycle manageRecordIssueRecycle = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIssueRecycle.class);
+ @GetMapping("/pageManageRecordIssueRecycle")
+ public Result pageManageRecordIssueRecycle(Page page,ManageRecordIssueRecycle manageRecordIssueRecycle) throws Exception {
return Result.success(manageRecordIssueRecycleService.pageManageRecordIssueRecycle(page, manageRecordIssueRecycle));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
- @PostMapping("/delManageRecordIssueRecycle")
+ @DeleteMapping("/delManageRecordIssueRecycle")
public Result delManageRecordIssueRecycle(Integer id){
return Result.success(manageRecordIssueRecycleService.removeById(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/addManageRecordIssueRecycle")
public Result addManageRecordIssueRecycle(@RequestBody ManageRecordIssueRecycle manageRecordIssueRecycle){
return Result.success(manageRecordIssueRecycleService.addManageRecordIssueRecycle(manageRecordIssueRecycle));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/doManageRecordIssueRecycle")
public Result doManageRecordIssueRecycle(@RequestBody ManageRecordIssueRecycle manageRecordIssueRecycle){
return Result.success(manageRecordIssueRecycleService.doManageRecordIssueRecycle(manageRecordIssueRecycle));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
- @PostMapping("/exportOutManageRecordIssueRecycle")
- public Result exportOutManageRecordIssueRecycle(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordIssueRecycle manageRecordIssueRecycle = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIssueRecycle.class);
+ @GetMapping("/exportOutManageRecordIssueRecycle")
+ public Result exportOutManageRecordIssueRecycle(ManageRecordIssueRecycle manageRecordIssueRecycle, HttpServletResponse response) {
return Result.success(manageRecordIssueRecycleService.exportOutManageRecordIssueRecycle(manageRecordIssueRecycle,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鎵�鏈夋枃浠剁殑鍙戞斁涓庡洖鏀惰褰�")
@PostMapping("/exportInManageRecordIssueRecycle")
public Result exportInManageRecordIssueRecycle(MultipartFile file){
--
Gitblit v1.9.3