From 76eaceb627cc08a2368e903b4e6ca366bc348010 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期一, 17 六月 2024 14:18:34 +0800
Subject: [PATCH] 查询调整
---
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 139 ++++++++++++++++++++++++++++++++++------------
1 files changed, 102 insertions(+), 37 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 fd1bd16..b8958ba 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
@@ -2,17 +2,26 @@
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
+import com.ruoyi.doublePrevention.entity.CJReport.PreventCJReportDangerInfo;
import com.ruoyi.doublePrevention.enums.ErrorCodes;
import com.ruoyi.doublePrevention.enums.ResultCodes;
+import com.ruoyi.doublePrevention.repository.PreventCJReportDangerInfoRepository;
+import com.ruoyi.doublePrevention.service.baseService.PreventCJReportDangerInfoService;
import com.ruoyi.doublePrevention.vo.ResultVO;
import com.ruoyi.project.system.user.domain.User;
import com.ruoyi.project.tr.riskList.domain.RiskList;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogBO;
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckItemDangerLogUpdateBO;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
+import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckItemDangerLog;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckItemMapper;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckScoreMapper;
+import com.ruoyi.project.tr.specialCheck.mapper.TbBaseCheckTaskMapper;
import com.ruoyi.project.tr.specialCheck.mapper.TbSpecialCheckItemDangerLogMapper;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
+import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -28,6 +37,19 @@
@Autowired
private TbSpecialCheckItemDangerLogMapper itemDangerLogMapper;
+
+ @Autowired
+ private TbBaseCheckTaskMapper baseCheckTaskMapper;
+
+ @Autowired
+ private TbBaseCheckItemMapper baseCheckItemMapper;
+
+ @Autowired
+ private TbBaseCheckScoreMapper baseCheckScoreMapper;
+
+ @Autowired
+ private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
+
@Override
@@ -61,21 +83,40 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- // 四类id，挨个查询，判断是否存在
+ if (itemDangerLog.getTaskId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("任务不存在");
+ return resultVO;
+ }
if (itemDangerLog.getCheckItemId() == null){
resultVO.setMsg("检查项不能为空");
return resultVO;
}
- if (itemDangerLog.getTaskId() == null){
- resultVO.setMsg("任务不能为空");
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(itemDangerLog.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
return resultVO;
}
if (itemDangerLog.getCheckScoreId() == null){
resultVO.setMsg("评分不能为空");
return resultVO;
}
+ TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(itemDangerLog.getCheckScoreId());
+ if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
+ resultVO.setMsg("评分标准不存在");
+ return resultVO;
+ }
if (itemDangerLog.getDangerId() == null){
resultVO.setMsg("关联隐患不能为空");
+ return resultVO;
+ }
+ PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(itemDangerLog.getDangerId());
+ if (ObjectUtils.isEmpty(dangerById)){
+ resultVO.setMsg("隐患不存在");
return resultVO;
}
if (itemDangerLog.getCheckDate() == null){
@@ -99,6 +140,27 @@
itemDangerLog.setReportStatus((byte) 1);
itemDangerLog.setReportTime(null);
itemDangerLog.setDeleted((byte) 0);
+// itemDangerLog.setDangerId(itemDangerLog.getDangerId());
+// itemDangerLog.setDangerId(itemDangerLog.getTaskId());
+// itemDangerLog.setCheckType(itemDangerLog.getCheckType());
+// itemDangerLog.setCheckItemId(itemDangerLog.getCheckItemId());
+// itemDangerLog.setCheckScoreId(itemDangerLog.getCheckScoreId());
+// itemDangerLog.setCheckDate(itemDangerLog.getCheckDate());
+// itemDangerLog.setCheckPay(itemDangerLog.getCheckPay());
+// itemDangerLog.setHarmType(itemDangerLog.getHarmType());
+ itemDangerLog.setDangerName(dangerById.getDangerName());
+ itemDangerLog.setCheckName(baseCheckItemByItemId.getCheckName());
+ itemDangerLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ itemDangerLog.setCheckWay(null);
+ itemDangerLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ itemDangerLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+ itemDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
+ itemDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
+ itemDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
+
+
+
+
int saveResult = itemDangerLogMapper.save(itemDangerLog);
if (saveResult == 0){
@@ -122,21 +184,40 @@
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- // 四类id，挨个查询，判断是否存在
+ if (updateBO.getTaskId() == null){
+ resultVO.setMsg("任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
+ if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+ resultVO.setMsg("任务不存在");
+ return resultVO;
+ }
if (updateBO.getCheckItemId() == null){
resultVO.setMsg("检查项不能为空");
return resultVO;
}
- if (updateBO.getTaskId() == null){
- resultVO.setMsg("任务不能为空");
+ TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(updateBO.getCheckItemId());
+ if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+ resultVO.setMsg("检查项不存在");
return resultVO;
}
if (updateBO.getCheckScoreId() == null){
resultVO.setMsg("评分不能为空");
return resultVO;
}
+ TbBaseCheckScore baseCheckScoreByScoreId = baseCheckScoreMapper.getBaseCheckScoreByScoreId(updateBO.getCheckScoreId());
+ if (ObjectUtils.isEmpty(baseCheckScoreByScoreId)){
+ resultVO.setMsg("评分标准不存在");
+ return resultVO;
+ }
if (updateBO.getDangerId() == null){
resultVO.setMsg("关联隐患不能为空");
+ return resultVO;
+ }
+ PreventCJReportDangerInfo dangerById = preventCJReportDangerInfoRepository.getDangerById(updateBO.getDangerId());
+ if (ObjectUtils.isEmpty(dangerById)){
+ resultVO.setMsg("隐患不存在");
return resultVO;
}
if (updateBO.getCheckDate() == null){
@@ -150,14 +231,19 @@
LocalDateTime dateTime = LocalDateTime.now();
- updateBO.setCompanyCode("652310082");
- updateBO.setCreateDate(dateTime);
updateBO.setUpdateDate(dateTime);
- updateBO.setCreateBy(sysUser.getUserName());
updateBO.setUpdateBy(sysUser.getUserName());
updateBO.setReportStatus((byte) 1);
- updateBO.setReportTime(null);
- updateBO.setDeleted((byte) 0);
+
+ updateBO.setDangerName(dangerById.getDangerName());
+ updateBO.setCheckName(baseCheckItemByItemId.getCheckName());
+ updateBO.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ updateBO.setCheckWay(null);
+ updateBO.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ updateBO.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+ updateBO.setIsReject(baseCheckScoreByScoreId.getIsReject());
+ updateBO.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
+ updateBO.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
int updateResult = itemDangerLogMapper.updateSpecialCheckItemDangerLogById(updateBO);
if (updateResult == 0){
@@ -186,32 +272,6 @@
return resultVO;
}
- // 四类id，挨个查询，判断是否存在
- if (updateBO.getCheckItemId() == null){
- resultVO.setMsg("检查项不能为空");
- return resultVO;
- }
- if (updateBO.getTaskId() == null){
- resultVO.setMsg("任务不能为空");
- return resultVO;
- }
- if (updateBO.getCheckScoreId() == null){
- resultVO.setMsg("评分不能为空");
- return resultVO;
- }
- if (updateBO.getDangerId() == null){
- resultVO.setMsg("关联隐患不能为空");
- return resultVO;
- }
- if (updateBO.getCheckDate() == null){
- resultVO.setMsg("检查时间不能为空");
- return resultVO;
- }
- if (updateBO.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
-
TbSpecialCheckItemDangerLog tbSpecialCheckItemDangerLog = new TbSpecialCheckItemDangerLog();
LocalDateTime dateTime = LocalDateTime.now();
@@ -232,5 +292,10 @@
return resultVO;
}
+ @Override
+ public TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogById(String id) {
+ return itemDangerLogMapper.getSpecialCheckItemDangerLogById(id);
+ }
+
}
--
Gitblit v1.9.2