From f201f17d7e25e71d22b9c8b821e387bdc8fba52d Mon Sep 17 00:00:00 2001
From: zhuo <2089219845@qq.com>
Date: 星期一, 12 五月 2025 16:42:07 +0800
Subject: [PATCH] 添加判断当前时间是否没有该检测项的抽样计划功能

---
 cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java |   32 ++++++++++++++++----------------
 1 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
index 0e445d3..b357a71 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/controller/InternalCorrectController.java
@@ -2,13 +2,15 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.manage.annotation.ValueAuth;
+import com.deepoove.poi.data.style.*;
+import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.utils.JackSonUtil;
 import com.ruoyi.manage.mapper.InternalCorrectFileMapper;
 import com.ruoyi.manage.pojo.InternalCorrect;
 import com.ruoyi.manage.pojo.InternalCorrectFile;
 import com.ruoyi.manage.service.InternalCorrectService;
-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 lombok.AllArgsConstructor;
@@ -24,7 +26,7 @@
  * 鍐呭绠$悊绾犳澶勭悊琛� 鍓嶇鎺у埗鍣�
  * </p>
  *
- * @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
+ * @author
  * @since 2024-11-13 04:00:15
  */
 @Api(tags = "鍐呭绾犳鎺柦")
@@ -40,7 +42,7 @@
      * 鏂板鍐呭绠$悊绾犳澶勭悊淇℃伅
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏂板鍐呭绠$悊绾犳澶勭悊")
     @PostMapping("/addInternalCorrect")
     public Result addInternalCorrect(@RequestBody InternalCorrect internalCorrect){
@@ -51,7 +53,7 @@
      * 鏌ヨ鍐呭绠$悊绾犳澶勭悊
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏌ヨ鍐呭绠$悊绾犳澶勭悊")
     @GetMapping("/getInternalCorrect")
     public Result<InternalCorrect> getInternalCorrect(Integer correctId){
@@ -62,12 +64,10 @@
      * 鏌ヨ鍐呭绠$悊绾犳鎺柦鍒楄〃
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏌ヨ鍐呭绠$悊绾犳鎺柦鍒楄〃")
-    @PostMapping("/pageInternalCorrect")
-    public Result<IPage<InternalCorrect>> pageInternalCorrect(@RequestBody Map<String, Object> data) throws Exception {
-        Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        InternalCorrect detailsCorrect = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), InternalCorrect.class);
+    @GetMapping("/pageInternalCorrect")
+    public Result<IPage<InternalCorrect>> pageInternalCorrect(Page page, InternalCorrect detailsCorrect) {
         return Result.success(internalCorrectService.pageInternalCorrect(page, detailsCorrect));
     }
 
@@ -77,7 +77,7 @@
      * @param file
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏂板鍐呭绠$悊绾犳鎺柦闄勪欢")
     @PostMapping("/uploadInternalCorrectFile")
     public Result<?> uploadInternalCorrectFile(Integer correctId, MultipartFile file) {
@@ -89,7 +89,7 @@
      * 鏌ヨ鍐呭绠$悊绾犳鎺柦闄勪欢
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鏌ヨ鍐呭绠$悊绾犳鎺柦闄勪欢")
     @GetMapping("/getInternalCorrectFileList")
     public Result<List<InternalCorrectFile>> getInternalCorrectFileList(Integer correctId){
@@ -100,9 +100,9 @@
      * 鍒犻櫎鍐呭绠$悊绾犳鎺柦闄勪欢
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "鍒犻櫎鍐呭绠$悊绾犳鎺柦闄勪欢")
-    @GetMapping("/delInternalCorrectFile")
+    @DeleteMapping("/delInternalCorrectFile")
     public Result delInternalCorrectFile(Integer correctFileId){
         return Result.success(internalCorrectFileMapper.deleteById(correctFileId));
     }
@@ -111,7 +111,7 @@
      * 瀵煎嚭绾犳鎺柦
      * @return
      */
-    @ValueAuth
+
     @ApiOperation(value = "瀵煎嚭绾犳鎺柦")
     @GetMapping("/exportInternalCorrect")
     public void exportInternalCorrect(Integer correctId, HttpServletResponse response){

--
Gitblit v1.9.3