From fbb309a90ce4184cfad6c439cc5a6515a085e44b Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 19 六月 2024 08:42:33 +0800
Subject: [PATCH] 临时提交
---
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
index c269ffd..2cbfbbb 100644
--- a/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
+++ b/src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
import com.ruoyi.project.tr.specialCheck.mapper.*;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
+import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -41,7 +42,8 @@
@Autowired
private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
-
+ @Autowired
+ private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService;
@Override
public ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO) {
@@ -139,13 +141,17 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- if (updateBO.getTaskId() == null){
+ if (updateBO.getIndexId() == null){
resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ if (updateBO.getTaskId() == null){
+ resultVO.setMsg("专项任务不能为空");
return resultVO;
}
TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
- resultVO.setMsg("任务不存在");
+ resultVO.setMsg("专项任务不存在");
return resultVO;
}
if (updateBO.getCheckItemId() == null){
@@ -200,7 +206,11 @@
resultVO.setMsg("检查项不存在，删除失败");
return resultVO;
}
-
+ TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogById = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogById(specialCheckItemLogByIndexId.getCheckItemId());
+ if (!ObjectUtils.isEmpty(specialCheckScoreAndDangerLogById)){
+ resultVO.setMsg("该检查项存在评价记录，无法删除");
+ return resultVO;
+ }
TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
LocalDateTime dateTime = LocalDateTime.now();
--
Gitblit v1.9.2