From f5cea23daacef18a3d0c60260fefdc6e8fb45b79 Mon Sep 17 00:00:00 2001
From: dfdg <2710245601@qq.com>
Date: Tue, 9 Dec 2025 09:06:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=89=E5=85=A8=E4=BA=8B=E6=95=85=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/HseSafetySgdcServiceImpl.java      | 13 +++++++++++--
 .../main/java/org/dromara/safety/enums/AqEnums.java |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java
index 3090167e..96532344 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/service/impl/HseSafetySgdcServiceImpl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.core.utils.MapstructUtils;
 import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
@@ -25,6 +26,7 @@ import org.dromara.system.service.impl.SysDeptServiceImpl;
 import org.dromara.system.service.impl.SysUserServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Collection;
 import java.util.List;
@@ -170,6 +172,7 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
      * @return 是否修改成功
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Boolean updateByBo(HseSafetySgdcBo bo) {
         HseSafetySgdc update = MapstructUtils.convert(bo, HseSafetySgdc.class);
         validEntityBeforeSave(update);
@@ -285,19 +288,25 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl<HseSafetySgdcMapper, H
      */
     public void addZgxx(Long id){
         if (id ==  null){
-            return;
+            throw new ServiceException("调查id不能为空");
         }
         HseSafetySgzgbh sgzg = new HseSafetySgzgbh();
         //调查
         HseSafetySgdcVo sgdc = queryById(id);
+        if (sgdc == null){
+            throw new ServiceException("找不到事故调查信息，请联系管理员");
+        }
         //事故id
         sgzg.setSgId(sgdc.getSgId());
         //事故编号
         sgzg.setSgbh(sgdc.getSgbh());
+        sgzg.setProjectId(sgdc.getProjectId());
+        String banBen = BatchNumberGenerator.generateBatchNumber("ZGYBH-");
+        sgzg.setZgbhbh(banBen);
         //事发地点 需要查询
         HseSafetySgsb sgsb = baseMapper.getSgsb(sgdc.getSgId());
         if (sgsb == null){
-            return;
+            throw new ServiceException("找不到事故信息，请联系管理员");
         }
         sgzg.setSfdd(sgsb.getSfdd());
         //事故类型
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/enums/AqEnums.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/enums/AqEnums.java
index ded7a6ca..6d4dceff 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/enums/AqEnums.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/enums/AqEnums.java
@@ -5,7 +5,7 @@ public enum AqEnums {
     AQJDZT_S("是否交底", "1"),
     AQJDZT_F("是否交底", "2"),
     AQWXJX_S("是否存在危险迹象", "1"),
-    AQWXJX_F("是否存在危险迹象", "2");
+    AQWXJX_F("是否存在危险迹象", "0");