From 2cc927ebf07a748c8c88dbe940b2850c18953005 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 08 五月 2023 19:31:53 +0800
Subject: [PATCH] 管控措施按照风险事件id排序
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
index 67c1a5a..ac1c7bf 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerScheduleController.java
@@ -6,6 +6,7 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
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;
@@ -32,6 +33,7 @@
import org.apache.shiro.authz.annotation.RequiresPermissions;
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.*;
@@ -72,6 +74,9 @@
@Autowired
private IRoleService roleService;
+
+ @Autowired
+ private RiskService riskService;
@GetMapping()
public String hiddenDangerCheck(ModelMap mmap) {
@@ -395,7 +400,7 @@
//是隐患设置核查人ID、核查人名称
if ((!StringUtils.isEmpty(hdcp.getWhetherDanger())) &&
(TrHiddenDangerCheckConstants.WHETHER_DANGER_YES.equals(hdcp.getWhetherDanger()))) {
- hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
+ hdcp.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状8态(待核查)
hdcp.setExamineUserId(hiddenDangerCheck.getExamineUserId());//核查人ID
hdcp.setExamineUserName(hiddenDangerCheck.getExamineUserName());//核查人名称
hdcp.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//3隐患核查阶段(/** 更新者 */数据进入到3隐患核查阶段)
@@ -536,8 +541,18 @@
@Log(title = "删除定时隐患排查", businessType = BusinessType.DELETE)
@PostMapping("/remove")
@ResponseBody
+ @Transactional
public AjaxResult remove(String ids) {
- return toAjax(hiddenDangerCheckService.deleteHiddenDangerCheckByIds(ids));
+ //老代码
+ int result = hiddenDangerCheckService.deleteHiddenDangerCheckByIds(ids);
+
+ // todo-2022 删除定时核查任务 新代码添加
+ int result1 = riskService.deleteDangerCheck(ids);
+ if (result1 < 1){
+ throw new RuntimeException("删除核查任务附属表失败");
+ }
+
+ return toAjax(result);
}
--
Gitblit v1.9.2