From 7be0d5b901b999d2347774df3cc1a64927838bb3 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期二, 15 四月 2025 10:10:35 +0800
Subject: [PATCH] 优化每年专项数据获取

---
 src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
index 1269eea..a021ed0 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java
@@ -86,6 +86,28 @@
         return prefix + "/editDangerRectify";
     }
 
+    /**
+     * 隐患整改--延期
+     *
+     */
+    @Log(title = "隐患整改--整改")
+    @GetMapping("/delayDangerRectify/{id}")
+    public String delayDangerRectify(@PathVariable("id") Long id, ModelMap mmap) {
+        //隐患排查实体
+        HiddenDangerCheckPoint hiddenDangerCheckPoint = hiddenDangerCheckPointService.selectHiddenDangerCheckPointById(Long.valueOf(id));
+        mmap.put("hdcp", hiddenDangerCheckPoint);
+
+        //获取所在公司人员信息
+        User sysUser = getSysUser();
+        if (sysUser != null && sysUser.getCompanyId() != null) {
+            User userTemp = new User();
+            userTemp.setCompanyId(sysUser.getCompanyId());
+            List<User> userList = userService.selectUserList(userTemp);
+            mmap.put("userList", userList);
+        }
+        return prefix + "/delayDangerRectify";
+    }
+
 
     /**
      * 隐患整改--保存
@@ -129,14 +151,15 @@
         return prefix + "/detailDangerRectify";
     }
 
+
     /**
-     * 隐患整改延期
+     * 隐患整改延期 - 保存
      */
     @Log(title = "隐患上报", businessType = BusinessType.DELETE)
     @PostMapping("/rectifyTimeOut")
     @ResponseBody
     @Transactional
-    public AjaxResult rectifyTimeOut(HiddenDangerCheckPoint hdcp) {
+    public AjaxResult rectifyTimeOutSave(HiddenDangerCheckPoint hdcp) {
         if(ObjectUtils.isEmpty(hdcp.getId())){
             return AjaxResult.error("id不能为空");
         }
@@ -150,4 +173,5 @@
         return AjaxResult.success();
     }
 
+
 }

--
Gitblit v1.9.2