From 2165f5c087838fa0a72034a7d6f938ee80d1f0e7 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期五, 25 八月 2023 09:48:55 +0800
Subject: [PATCH] 隐患整改延期
---
src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerRectifyController.java | 27 ++++++++++++++++++++++++++-
1 files changed, 26 insertions(+), 1 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 353460b..1269eea 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,6 +2,7 @@
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;
@@ -14,6 +15,7 @@
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;
@@ -102,8 +104,11 @@
hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_ACCEPT);//隐患验收阶段(数据进入到隐患验收阶段)
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
- // todo-2022 隐患信息保存
+ // todo-2022 隐患信息附属表
int result = riskService.updateDangerInfoRectify(hiddenDangerCheckPoint);
+ if (result < 1){
+ throw new RuntimeException("整改信息保存失败");
+ }
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
@@ -124,5 +129,25 @@
return prefix + "/detailDangerRectify";
}
+ /**
+ * 隐患整改延期
+ */
+ @Log(title = "隐患上报", businessType = BusinessType.DELETE)
+ @PostMapping("/rectifyTimeOut")
+ @ResponseBody
+ @Transactional
+ public AjaxResult rectifyTimeOut(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