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/DangerReportController.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
index 2c6c26a..608337a 100644
--- a/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
+++ b/src/main/java/com/ruoyi/project/tr/hiddenDangerCheck/controller/DangerReportController.java
@@ -8,6 +8,7 @@
import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
import com.ruoyi.doublePrevention.entity.dto.resp.PreventRiskUnitCodeAndNameListQueryRespDTO;
import com.ruoyi.doublePrevention.service.RiskService;
+import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerConfirmLogService;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
@@ -57,6 +58,9 @@
@Autowired
private RiskService riskService;
+
+ @Autowired
+ private PreventRiskDangerConfirmLogService confirmLogService;
@GetMapping()
public String hiddenDangerCheck(ModelMap mmap) {
@@ -158,6 +162,12 @@
@ResponseBody
@Transactional
public AjaxResult addDangerReportSave(HiddenDangerCheckPoint hdcp) {
+ if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
+ throw new RuntimeException("检查人不能为空");
+ }
+ if (ObjectUtils.isEmpty(hdcp.getFindTime())){
+ throw new RuntimeException("发现时间不能为空");
+ }
HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck();
hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间
@@ -230,7 +240,12 @@
HiddenDangerCheck hiddenDangerCheck = new HiddenDangerCheck();
// hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
// hiddenDangerCheck.setCreateTime(DateUtils.getNowDate());//获取创建时间
-
+ if (ObjectUtils.isEmpty(hdcp.getCheckPerson())){
+ throw new RuntimeException("检查人不能为空");
+ }
+ if (ObjectUtils.isEmpty(hdcp.getFindTime())){
+ throw new RuntimeException("发现时间不能为空");
+ }
hiddenDangerCheck.setCreateBy(ShiroUtils.getLoginName());//创建者
hiddenDangerCheck.setCreateTime(hdcp.getRectifyCreateTime());//获取创建时间
@@ -338,11 +353,6 @@
-
-
-
-
-
/**
* 修改隐患上报
*/
@@ -352,11 +362,13 @@
// todo-2022 修改前查询
PreventRiskDangerInfo dangerInfo = riskService.getDangerInfoById(hdcp.getId());
- hdcp.setHazardCode(dangerInfo.getHazardCode());
- hdcp.setDangerSrc(dangerInfo.getDangerSrc());
- hdcp.setDangerReason(dangerInfo.getDangerReason());
- hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
- hdcp.setDangerResult(dangerInfo.getDangerResult());
+ if (ObjectUtils.isNotEmpty(dangerInfo)){
+ hdcp.setHazardCode(dangerInfo.getHazardCode());
+ hdcp.setDangerSrc(dangerInfo.getDangerSrc());
+ hdcp.setDangerReason(dangerInfo.getDangerReason());
+ hdcp.setHazardDangerType(dangerInfo.getHazardDangerType());
+ hdcp.setDangerResult(dangerInfo.getDangerResult());
+ }
mmap.put("hiddenDangerCheckPoint", hdcp);
@@ -440,7 +452,6 @@
/**
* 修改判定隐患上报保存
- * todo-2022 隐患核查（判定隐患） 以判定的隐患，才需要上报
*/
@Log(title = "修改判定隐患上报保存", businessType = BusinessType.UPDATE)
@PostMapping("/editJudgeDangerReportSave")
@@ -459,7 +470,7 @@
hiddenDangerCheckPoint.setStage(TrHiddenDangerCheckConstants.DANGER_STAGE_PLAN_EXAMINE);//隐患核查阶段(数据进入到隐患核查阶段)
hiddenDangerCheckPoint.setExamineStatus(TrHiddenDangerCheckConstants.EXAMINE_STATUS_NOT_EXAMINE);//核查状态(待核查)
-// // todo-2022 隐患信息判定
+// //
// int result = riskService.updateDangerInfoJudge(hiddenDangerCheckPoint);
// if (result < 1){
// throw new RuntimeException("整改信息保存失败");
@@ -469,6 +480,11 @@
}
int i = hiddenDangerCheckPointService.updateHiddenDangerCheckPoint(hiddenDangerCheckPoint);
+ int result = confirmLogService.saveConfirmLog(hiddenDangerCheckPoint);
+ if (result < 1){
+ return AjaxResult.error("操作失败");
+ }
+
hiddenDangerCheckPointService.getTaskCountTotal(getSysUser().getUserId());//查询未执行任务总数量并推送
return toAjax(i);
--
Gitblit v1.9.2