From aa2051a2327c079105110f5424f3a44ffaa0c7bb Mon Sep 17 00:00:00 2001 From: 马宇豪 <978517621@qq.com> Date: 星期五, 25 八月 2023 10:11:08 +0800 Subject: [PATCH] 延期整改 --- src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java index aba8b97..4edeb2d 100644 --- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java +++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerAcceptController.java @@ -4,6 +4,7 @@ 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; @@ -14,6 +15,7 @@ import com.ruoyi.project.tr.hiddenDangerCheckPoint.service.IHiddenDangerCheckPointService; 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.*; @@ -32,6 +34,9 @@ @Autowired private IHiddenDangerCheckPointService hiddenDangerCheckPointService; + + @Autowired + private RiskService riskService; @GetMapping() public String hiddenDangerCheckPoint() { @@ -70,6 +75,7 @@ @Log(title = "隐患验收--保存", businessType = BusinessType.UPDATE) @PostMapping("/editDangerAcceptSave") @ResponseBody + @Transactional public AjaxResult editDangerAcceptSave(HiddenDangerCheckPoint hiddenDangerCheckPoint) { //获取当前更新用户信息 User sysUser = getSysUser(); @@ -88,6 +94,13 @@ } } int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint); + + // todo-2022 验收通过,修改为已验收状态 + int result = riskService.updateDangerInfoAccept(hiddenDangerCheckPoint); + if (result < 1){ + throw new RuntimeException("隐患验收信息保存失败"); + } + hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送 return toAjax(i); } -- Gitblit v1.9.2