From 1bdce029a16f396a933848b368040e78740728fa Mon Sep 17 00:00:00 2001
From: huangzhen <867127663@qq.com>
Date: 星期五, 16 九月 2022 09:39:03 +0800
Subject: [PATCH] 新增原巡检点与措施的删除、修改、查询功能
---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java b/src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java
index e5577fe..330b492 100644
--- a/src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java
+++ b/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;
}
/**
--
Gitblit v1.9.2