From 7e7195766eb018b4ba00b2d0663f6dcb11adefc8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期二, 27 九月 2022 09:01:38 +0800
Subject: [PATCH] 临时提交-目前改到隐患上报部分
---
src/main/java/com/ruoyi/project/tr/baseCheckPoint/service/impl/BaseCheckPointServiceImpl.java | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 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 330b492..e5577fe 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,17 +2,12 @@
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业务层处理
@@ -25,9 +20,6 @@
{
@Autowired
private BaseCheckPointMapper baseCheckPointMapper;
-
- @Autowired
- private PreventRiskCheckUnitRepository riskCheckUnitRepository;
/**
* 查询基础清单检查点
@@ -73,21 +65,10 @@
* @return 结果
*/
@Override
- @Transactional
public int updateBaseCheckPoint(BaseCheckPoint baseCheckPoint)
{
baseCheckPoint.setUpdateTime(DateUtils.getNowDate());
- 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;
+ return baseCheckPointMapper.updateBaseCheckPoint(baseCheckPoint);
}
/**
@@ -97,14 +78,9 @@
* @return 结果
*/
@Override
- @Transactional
public int deleteBaseCheckPointByIds(String ids)
{
- baseCheckPointMapper.deleteBaseCheckPointByIds(Convert.toStrArray(ids));
-
- //todo-2022 对措施与检查点关联的表根据原检查点id进行批量删除
- int deletePointAndMeasureResult = riskCheckUnitRepository.deleteRiskCheckUnitByCheckPointIds(Convert.toStrArray(ids));
- return deletePointAndMeasureResult;
+ return baseCheckPointMapper.deleteBaseCheckPointByIds(Convert.toStrArray(ids));
}
/**
--
Gitblit v1.9.2