From 54aff4794f199c40323e8704f660819b73fea768 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期日, 28 九月 2025 16:32:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java | 36 +++++++++++++++++-------------------
1 files changed, 17 insertions(+), 19 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
index e75a765..ac523fd 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/ManageRecordIntervalsTotalController.java
@@ -1,17 +1,17 @@
package com.ruoyi.manage.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.CustomClazzName;
-import com.ruoyi.manage.annotation.ValueClassify;
+
+
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
import com.ruoyi.manage.pojo.ManageRecordIntervalsTotal;
import com.ruoyi.manage.service.ManageRecordIntervalsTotalService;
-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 javax.annotation.Resource;
import java.util.Map;
@@ -21,37 +21,35 @@
* 鏂囦欢瀹氭湡瀹℃煡璁板綍鎬诲巻鍙茶褰曡〃 鍓嶇鎺у埗鍣�
* </p>
*
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
* @since 2024-11-15 01:12:11
*/
+@Api(tags = "璁板綍鐨勬帶鍒�")
@RestController
@RequestMapping("/manageRecordIntervalsTotal")
-@CustomClazzName(name = "浣撶郴绠＄悊瑕佹眰", index = 10)
public class ManageRecordIntervalsTotalController {
@Resource
private ManageRecordIntervalsTotalService manageRecordIntervalsTotalService;
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鏌ヨ鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
- @PostMapping("/pageManageRecordIntervalsTotal")
- public Result pageManageRecordIntervalsTotal(@RequestBody Map<String, Object> data) throws Exception {
- Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
- ManageRecordIntervalsTotal manageRecordIntervalsTotal = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), ManageRecordIntervalsTotal.class);
+ @GetMapping("/pageManageRecordIntervalsTotal")
+ public Result pageManageRecordIntervalsTotal(Page page,ManageRecordIntervalsTotal manageRecordIntervalsTotal) throws Exception {
return Result.success(manageRecordIntervalsTotalService.pageManageRecordIntervalsTotal(page, manageRecordIntervalsTotal));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎻愪氦鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/submitManageRecordIntervalsTotal")
- public Result submitManageRecordIntervalsTotal(Integer id) {
+ public Result submitManageRecordIntervalsTotal(@RequestBody Map<String, Integer> param) {
+ Integer id = param.get("id");
return Result.success(manageRecordIntervalsTotalService.submitManageRecordIntervalsTotal(id));
}
- @ValueClassify(value = "璁板綍鐨勬帶鍒�")
@ApiOperation(value = "鎵瑰噯鏂囦欢瀹氭湡瀹℃煡璁板綍鍘嗗彶鍒楄〃")
@PostMapping("/ratifyManageRecordIntervalsTotal")
- public Result ratifyManageRecordIntervalsTotal(Integer id, String ratifyState) {
+ public Result ratifyManageRecordIntervalsTotal(@RequestBody Map<String, Object> param) {
+ Integer id = (Integer) param.get("id");
+ String ratifyState = (String) param.get("ratifyState");
return Result.success(manageRecordIntervalsTotalService.ratifyManageRecordIntervalsTotal(id, ratifyState));
}
--
Gitblit v1.9.3