diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java index 9a1d147d..3c94aaa5 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/domain/vo/HseSafetySgdcVo.java @@ -242,4 +242,9 @@ public class HseSafetySgdcVo implements Serializable { */ private String fcjg; + /** + * 事故状态 + */ + private String sgzt; + } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java index ec586b53..1ff03355 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/accident/mapper/HseSafetySgdcMapper.java @@ -1,6 +1,7 @@ package org.dromara.safety.accident.mapper; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.safety.accident.domain.HseSafetySgdc; import org.dromara.safety.accident.domain.HseSafetySgsb; @@ -24,4 +25,7 @@ public interface HseSafetySgdcMapper extends BaseMapperPlus getSgsbListByProjectId(Long projectId); + + @Update("update hse_safety_sgsb set sgzt = #{state} where id = #{id}") + boolean updateSgzt(Long id, String state); } 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 121f44ac..bce2b498 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 @@ -179,6 +179,12 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl 0; } @@ -279,6 +285,13 @@ public class HseSafetySgdcServiceImpl extends ServiceImpl().eq(HseSafetySgdc::getSgId, sgsb.getId())); if (sgdcVo != null){ //待调查事故 已生成调查事件但还未调查 - if (sgdcVo.getBczt() == null){ + if (sgdcVo.getBczt() == null || sgdcVo.getBczt().equals(SGStatusEnum.DRAFT.getCode())){ ddcsg++; continue; } //调查中事故 已调查但提交状态为草稿 - if (SGStatusEnum.DRAFT.getCode().equals(sgdcVo.getBczt())){ + if (SGStatusEnum.SUBMIT.getCode().equals(sgdcVo.getBczt())){ dczsg++; } }