src/main/java/com/ruoyi/doublePrevention/repository/PreventRiskCheckUnitRepository.java
@@ -10,4 +10,19 @@ * 保存原检查点与管控措施的对应关系 */ int insertPointAndMeasure(PreventRiskCheckUnit checkUnit); /** * @description 根据原检查点id查询原检查点与管控措施对应的单条记录 */ PreventRiskCheckUnit getPointAndMeasureByPointId(Long checkPointId); /** * @description 根据id对相关记录进行修改 */ int updateRiskCheckUnitById(PreventRiskCheckUnit riskCheckUnit); /** * @description 根据原检查点批量删除 原检查点与管控措施对应的多条记录 */ int deleteRiskCheckUnitByCheckPointIds(String[] checkPointIds); } src/main/java/com/ruoyi/doublePrevention/service/RiskService.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit; import com.ruoyi.doublePrevention.entity.PreventRiskControlMeasure; import com.ruoyi.doublePrevention.entity.PreventRiskEvent; import com.ruoyi.doublePrevention.entity.dto.req.*; @@ -82,4 +83,10 @@ * 保存原检查点与管控措施的对应关系 */ int insertPointAndMeasure(PreventPointAndMeasureParams pointAndMeasureParams); /** * @description 根据原检查点查询 原检查点与管控措施对应记录 */ PreventRiskCheckUnit getRiskUnitByBaseCheckPointId(Long checkPointId); } src/main/java/com/ruoyi/doublePrevention/service/baseService/PreventRiskCheckUnitService.java
@@ -10,4 +10,9 @@ * 保存原检查点与管控措施的对应关系 */ int insertPointAndMeasure(PreventRiskCheckUnit checkUnit); /** * @description 根据原检查点查询 原检查点与管控措施对应记录 */ PreventRiskCheckUnit getRiskUnitByBaseCheckPointId(Long checkPointId); } src/main/java/com/ruoyi/doublePrevention/service/baseService/impl/PreventRiskCheckUnitServiceImpl.java
@@ -18,4 +18,12 @@ public int insertPointAndMeasure(PreventRiskCheckUnit checkUnit) { return preventRiskCheckUnitRepository.insertPointAndMeasure(checkUnit); } /** * @description 根据远检查点获取原检查点与管控措施关联的记录 */ @Override public PreventRiskCheckUnit getRiskUnitByBaseCheckPointId(Long checkPointId) { return preventRiskCheckUnitRepository.getPointAndMeasureByPointId(checkPointId); } } src/main/java/com/ruoyi/doublePrevention/service/impl/RiskServiceImpl.java
@@ -670,4 +670,12 @@ return result; } /** * @description 根据原检查点查询 原检查点与管控措施对应记录 */ @Override public PreventRiskCheckUnit getRiskUnitByBaseCheckPointId(Long checkPointId) { return preventRiskCheckUnitService.getRiskUnitByBaseCheckPointId(checkPointId); } } src/main/java/com/ruoyi/project/tr/baseCheckPoint/controller/BaseCheckPointController.java
@@ -8,6 +8,7 @@ import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.security.ShiroUtils; import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit; import com.ruoyi.doublePrevention.repository.param.PreventPointAndMeasureParams; import com.ruoyi.doublePrevention.service.RiskService; import com.ruoyi.project.enumerate.TrEvaluationMethodDetailsEnum; @@ -180,6 +181,12 @@ public String edit(@PathVariable("checkPointId") Long checkPointId, ModelMap mmap) { BaseCheckPoint baseCheckPoint = baseCheckPointService.selectBaseCheckPointById(checkPointId); //todo-2022 返回参数加入措施id PreventRiskCheckUnit riskCheckUnit = riskService.getRiskUnitByBaseCheckPointId(checkPointId); if (riskCheckUnit != null){ baseCheckPoint.setControlMeasureId(riskCheckUnit.getControlMeasureId()); } mmap.put("baseCheckPoint", baseCheckPoint); return prefix + "/edit"; } src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java
@@ -2,12 +2,17 @@ import java.util.List; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.doublePrevention.entity.PreventRiskCheckUnit; import com.ruoyi.doublePrevention.enums.ErrorCodes; import com.ruoyi.doublePrevention.repository.PreventRiskCheckUnitRepository; import com.ruoyi.doublePrevention.service.baseService.PreventRiskCheckUnitService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.project.tr.baseCheckPoint.mapper.BaseCheckPointMapper; import com.ruoyi.project.tr.baseCheckPoint.domain.BaseCheckPoint; import com.ruoyi.project.tr.baseCheckPoint.service.IBaseCheckPointService; import com.ruoyi.common.utils.text.Convert; import org.springframework.transaction.annotation.Transactional; /** * 基础清单检查点Service业务层处理 @@ -20,6 +25,9 @@ { @Autowired private BaseCheckPointMapper baseCheckPointMapper; @Autowired private PreventRiskCheckUnitRepository riskCheckUnitRepository; /** * 查询基础清单检查点 @@ -65,10 +73,21 @@ * @return 结果 */ @Override @Transactional public int updateBaseCheckPoint(BaseCheckPoint baseCheckPoint) { baseCheckPoint.setUpdateTime(DateUtils.getNowDate()); return baseCheckPointMapper.updateBaseCheckPoint(baseCheckPoint); baseCheckPointMapper.updateBaseCheckPoint(baseCheckPoint); //todo-2022 对措施与检查点关联的措施id进行修改 PreventRiskCheckUnit riskCheckUnit = riskCheckUnitRepository.getPointAndMeasureByPointId(baseCheckPoint.getCheckPointId()); if (riskCheckUnit == null){ throw new RuntimeException("查询不到对应的措施"); } riskCheckUnit.setControlMeasureId(baseCheckPoint.getControlMeasureId()); int riskCheckUnitUpdateResult = riskCheckUnitRepository.updateRiskCheckUnitById(riskCheckUnit); return riskCheckUnitUpdateResult; } /** @@ -78,9 +97,14 @@ * @return 结果 */ @Override @Transactional public int deleteBaseCheckPointByIds(String ids) { return baseCheckPointMapper.deleteBaseCheckPointByIds(Convert.toStrArray(ids)); baseCheckPointMapper.deleteBaseCheckPointByIds(Convert.toStrArray(ids)); //todo-2022 对措施与检查点关联的表根据原检查点id进行批量删除 int deletePointAndMeasureResult = riskCheckUnitRepository.deleteRiskCheckUnitByCheckPointIds(Convert.toStrArray(ids)); return deletePointAndMeasureResult; } /** src/main/resources/mybatis/doublePrevention/PreventRiskCheckUnitMapper.xml
@@ -15,4 +15,36 @@ insert into prevent_risk_check_unit values(null, #{uuid}, #{baseCheckPointId}, #{controlMeasureId}, #{riskId}) </insert> <update id="updateRiskCheckUnitById"> update prevent_risk_control_measure <set> <if test="baseCheckPointId != null "> base_check_point_id = #{baseCheckPointId}, </if> <if test="controlMeasureId != null"> control_measure_id = #{controlMeasureId}, </if> <if test="riskId != null"> risk_id = #{riskId}, </if> </set> </update> <delete id="deleteRiskCheckUnitByCheckPointIds"> delete from prevent_risk_control_measure where base_check_point_id in <foreach item="checkPointId" collection="array" open="(" separator="," close=")"> #{checkPointId} </foreach> </delete> <select id="getPointAndMeasureByPointId" resultMap="BaseResultMap"> select * from prevent_risk_check_unit where base_check_point_id = #{checkPointId} </select> </mapper>
