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 | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 insertions(+), 0 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 677e71a..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
@@ -2,7 +2,9 @@
import com.ruoyi.common.constant.TrHiddenDangerCheckConstants;
import com.ruoyi.common.utils.DateUtils;
+import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.security.ShiroUtils;
+import com.ruoyi.doublePrevention.service.RiskService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -13,8 +15,10 @@
import com.ruoyi.project.system.user.service.IUserService;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.domain.HiddenDangerCheckPoint;
import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService;
+import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.*;
@@ -40,6 +44,9 @@
@Autowired
JpushService jpushService;
+ @Autowired
+ private RiskService riskService;
+
@GetMapping()
public String hiddenDangerCheckPoint() {
return prefix + "/dangerRectify";
@@ -59,6 +66,7 @@
/**
* 隐患整改--整改
+ *
*/
@Log(title = "隐患整改--整改")
@GetMapping("/editDangerRectify/{id}")
@@ -78,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";
+ }
+
/**
* 隐患整改--保存
@@ -85,6 +115,7 @@
@Log(title = "隐患整改--保存", businessType = BusinessType.UPDATE)
@PostMapping("/editDangerRectifySave")
@ResponseBody
+ @Transactional
public AjaxResult editDangerRectifySave(HiddenDangerCheckPoint hiddenDangerCheckPoint) {
//获取当前更新用户信息
hiddenDangerCheckPoint.setUpdateBy(ShiroUtils.getLoginName());
@@ -94,6 +125,12 @@
hiddenDangerCheckPoint.setAcceptStatus(TrHiddenDangerCheckConstants.ACCEPT_STATUS_NOT_ACCEPT);//验收状态(未验收)
hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段)
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
+
+ // todo-2022 隐患信息附属表
+ int result = riskService.updateDangerInfoRectify(hiddenDangerCheckPoint);
+ if (result < 1){
+ throw new RuntimeException("整改信息保存失败");
+ }
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
@@ -115,4 +152,26 @@
}
+ /**
+ * 隐患整改延期 - 保存
+ */
+ @Log(title = "隐患上报", businessType = BusinessType.DELETE)
+ @PostMapping("/rectifyTimeOut")
+ @ResponseBody
+ @Transactional
+ public AjaxResult rectifyTimeOutSave(HiddenDangerCheckPoint hdcp) {
+ if(ObjectUtils.isEmpty(hdcp.getId())){
+ return AjaxResult.error("id不能为空");
+ }
+ if(ObjectUtils.isEmpty(hdcp.getRectifyDeadlineTime())){
+ return AjaxResult.error("延期时间不能为空");
+ }
+ int i = hiddenDangerCheckPointService.rectifyTimeOut(hdcp.getId(), hdcp.getRectifyDeadlineTime());
+ if (i < 1){
+ return AjaxResult.error("操作失败");
+ }
+ return AjaxResult.success();
+ }
+
+
}
--
Gitblit v1.9.2