From ac8870aae3ec2b5ec5315cc668b482858195cfa4 Mon Sep 17 00:00:00 2001
From: heheng <475597332@qq.com>
Date: 星期五, 04 七月 2025 15:14:52 +0800
Subject: [PATCH] 优化处理

---
 src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
index 9069f25..a819682 100644
--- a/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
+++ b/src/main/java/com/ruoyi/project/mobile/service/ApiDangerScheduleService.java
@@ -9,6 +9,7 @@
 import com.ruoyi.common.utils.security.ShiroUtils;
 import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckAndMeasure;
 import com.ruoyi.doublePrevention.entity.PreventRiskDangerCheckLog;
+import com.ruoyi.doublePrevention.entity.PreventRiskDangerInfo;
 import com.ruoyi.doublePrevention.service.RiskService;
 import com.ruoyi.doublePrevention.service.baseService.PreventRiskDangerCheckAndMeasureService;
 import com.ruoyi.framework.web.domain.AjaxResult;
@@ -215,6 +216,9 @@
             if (ObjectUtils.isEmpty(hdcp.getFindTime())){
                 throw new RuntimeException("发现时间不能为空");
             }
+            if(ObjectUtils.isEmpty(hdcp.getDangerSrc())){
+                throw new RuntimeException("隐患来源不能为空");
+            }
             hdcp.setUpdateBy(header.loginName);
             hdcp.setUpdateTime(DateUtils.getNowDate());
             hdcp.setRegisterCreateTime(DateUtils.getNowDate());//设置隐患登记上报创建时间
@@ -269,11 +273,20 @@
                 hdcp.setUpdateTime(DateUtils.getNowDate());
                 i = hdcpService.updateHiddenDangerCheckPoint(hdcp);
 
-                // todo-2022 此处修改附属表 20250623 放开
-                int result = riskService.updateDangerInfo(hdcp);
-                if (result < 1){
-                    throw new RuntimeException("修改失败");
+                PreventRiskDangerInfo dangerInfoByDangerCheckPointId = riskService.getDangerInfoByDangerCheckPointId(hdcp.getId());
+                if (dangerInfoByDangerCheckPointId != null){
+                    // todo-2022 此处修改附属表 20250623 放开
+                    int result = riskService.updateDangerInfo(hdcp);
+                    if (result < 1){
+                        throw new RuntimeException("修改失败");
+                    }
+                }else {
+                    int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
+                    if (result < 1){
+                        throw new RuntimeException("修改失败");
+                    }
                 }
+
 //                int result = riskService.insertDangerInfo(hdcp.getId(), hdcp);
 //                if (result< 1){
 //                    throw new RuntimeException("添加隐患附属信息失败");
@@ -286,7 +299,7 @@
 
             return ApiResult.success("定时隐患排查--隐患登记--成功");
         } catch (Exception e) {
-            return ApiResult.error("异常");
+            return ApiResult.error(e.getMessage());
         }
     }
 }

--
Gitblit v1.9.2