From da59bd81334e7b4ddeaaa401f27c5b93797fde46 Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期四, 20 二月 2025 10:36:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
index ebd7253..716369f 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordCheckController.java
@@ -1,13 +1,16 @@
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.ManageRecordCheck;
import com.ruoyi.manage.service.ManageRecordCheckService;
-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;
@@ -27,67 +30,57 @@
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
* @since 2024-11-12 02:31:36
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordCheck")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordCheckController {
@Resource
private ManageRecordCheckService manageRecordCheckService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒嗛〉鏌ヨ鏂囦欢瀹℃壒璁板綍")
@PostMapping("/pageManageRecordCheck")
- public Result pageManageRecordCheck(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordCheck manageRecordCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCheck.class);
+ public Result pageManageRecordCheck(Page page,ManageRecordCheck manageRecordCheck) throws Exception {
return Result.success(manageRecordCheckService.pageManageRecordCheck(page, manageRecordCheck));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏂板鏂囦欢瀹℃壒璁板綍")
@PostMapping("/addManageRecordCheck")
public Result addManageRecordCheck(@RequestBody ManageRecordCheck manageRecordCheck) {
return Result.success(manageRecordCheckService.save(manageRecordCheck));
}
- @ValueAuth
+
@ApiOperation(value = "缂栬緫鏂囦欢瀹℃壒璁板綍")
@PostMapping("/doManageRecordCheck")
public Result doManageRecordCheck(@RequestBody ManageRecordCheck manageRecordCheck) {
return Result.success(manageRecordCheckService.updateById(manageRecordCheck));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鍒犻櫎鏂囦欢瀹℃壒璁板綍")
@PostMapping("/delManageRecordCheck")
public Result delManageRecordCheck(Integer id) {
return Result.success(manageRecordCheckService.removeById(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀹℃牳鏂囦欢瀹℃壒璁板綍")
@PostMapping("/checkManageRecordCheck")
public Result checkManageRecordCheck(Integer id,String checkState) {
return Result.success(manageRecordCheckService.checkManageRecordCheck(id,checkState));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯鏂囦欢瀹℃壒璁板綍")
@PostMapping("/ratifyManageRecordCheck")
public Result ratifyManageRecordCheck(Integer id,String ratifyState) {
return Result.success(manageRecordCheckService.ratifyManageRecordCheck(id,ratifyState));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎嚭鏂囦欢瀹℃壒璁板綍")
@PostMapping("/exportOutManageRecordCheck")
- public Result exportOutManageRecordCheck(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- ManageRecordCheck manageRecordCheck = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordCheck.class);
+ public Result exportOutManageRecordCheck(ManageRecordCheck manageRecordCheck, HttpServletResponse response) throws Exception {
return Result.success(manageRecordCheckService.exportOutManageRecordCheck(manageRecordCheck,response));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "瀵煎叆鏂囦欢瀹℃壒璁板綍")
@PostMapping("/exportInManageRecordCheck")
public Result exportInManageRecordCheck(MultipartFile file){
--
Gitblit v1.9.3