From ecb064d243bcc5eabefe96612f387e40cc4719d8 Mon Sep 17 00:00:00 2001
From: 16639036659 <577530412@qq.com>
Date: 星期三, 19 六月 2024 13:14:11 +0800
Subject: [PATCH] 查询隐患列表，时间倒序排列
---
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckItemDangerLogServiceImpl.java | 198 ++++++++++++++++++-------------------------------
1 files changed, 72 insertions(+), 126 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 a6f9b95..5df30eb 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
@@ -6,22 +6,14 @@
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.*;
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.mapper.*;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckItemDangerLogService;
-import com.ruoyi.project.tr.specialCheck.service.TbBaseCheckService;
+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;
@@ -36,7 +28,7 @@
public class SpecialCheckItemDangerLogServiceImpl implements SpecialCheckItemDangerLogService {
@Autowired
- private TbSpecialCheckItemDangerLogMapper itemDangerLogMapper;
+ private TbSpecialCheckItemLogMapper itemLogMapper;
@Autowired
private TbBaseCheckTaskMapper baseCheckTaskMapper;
@@ -50,24 +42,25 @@
@Autowired
private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;
-
+ @Autowired
+ private SpecialCheckScoreAndDangerDangerLogService scoreAndDangerDangerLogService;
@Override
- public ResultVO<List<TbSpecialCheckItemDangerLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO) {
+ public ResultVO<List<TbSpecialCheckItemLog>> selectSpecialCheckItemDangerLogPage(TbSpecialCheckItemDangerLogBO itemDangerLogBO) {
Integer pageIndex = itemDangerLogBO.getPageNum();
Integer pageSize = itemDangerLogBO.getPageSize();
if (pageIndex == 0 || pageSize == 0){
return new ResultVO<>(ErrorCodes.REQUEST_PARAM_ERROR.getCode(),"当前页码或当前页显示数不能为0");
}
- Page<TbSpecialCheckItemDangerLog> page = PageHelper.startPage(pageIndex, pageSize);
- itemDangerLogMapper.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
+ Page<TbSpecialCheckItemLog> page = PageHelper.startPage(pageIndex, pageSize);
+ itemLogMapper.selectSpecialCheckItemDangerLogPage(itemDangerLogBO);
Long total = page.getTotal();
int count = total.intValue();
- List<TbSpecialCheckItemDangerLog> pageResult = null;
+ List<TbSpecialCheckItemLog> pageResult = null;
- ResultVO<List<TbSpecialCheckItemDangerLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
+ ResultVO<List<TbSpecialCheckItemLog>> resultVO = new ResultVO<>(ResultCodes.OK,pageResult);
resultVO.setData(page.getResult());
resultVO.setCount(count);
@@ -78,7 +71,7 @@
}
@Override
- public ResultVO<TbSpecialCheckItemDangerLog> addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog) {
+ public ResultVO<TbSpecialCheckItemLog> addSpecialItemDanger(TbSpecialCheckItemDangerLog itemDangerLog) {
User sysUser = getSysUser();
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
@@ -87,7 +80,7 @@
resultVO.setMsg("任务不能为空");
return resultVO;
}
- TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
+ TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
resultVO.setMsg("任务不存在");
return resultVO;
@@ -101,67 +94,32 @@
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){
- resultVO.setMsg("检查时间不能为空");
- return resultVO;
- }
- if (itemDangerLog.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
+
+ TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
LocalDateTime dateTime = LocalDateTime.now();
String uuid = UUID.randomUUID().toString();
- itemDangerLog.setId(uuid);
- itemDangerLog.setCompanyCode("652310082");
- itemDangerLog.setCreateDate(dateTime);
- itemDangerLog.setUpdateDate(dateTime);
- itemDangerLog.setCreateBy(sysUser.getUserName());
- itemDangerLog.setUpdateBy(sysUser.getUserName());
- 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.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());
+ itemLog.setId(uuid);
+ itemLog.setCompanyCode("652310082");
+ itemLog.setCheckItemId(itemDangerLog.getCheckItemId());
+ itemLog.setTaskId(itemDangerLog.getTaskId());
+ itemLog.setCheckName(baseCheckItemByItemId.getCheckName());
+ itemLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ itemLog.setCheckWay(baseCheckItemByItemId.getCheckWay());
+ itemLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ itemLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
+ itemLog.setDeleted((byte) 0);
+ itemLog.setCreateDate(dateTime);
+ itemLog.setUpdateDate(dateTime);
+ itemLog.setCreateBy(sysUser.getUserName());
+ itemLog.setUpdateBy(sysUser.getUserName());
+ itemLog.setReportStatus((byte) 1);
+ itemLog.setReportTime(null);
-
-
- int saveResult = itemDangerLogMapper.save(itemDangerLog);
+ int saveResult = itemLogMapper.save(itemLog);
if (saveResult == 0){
resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());
resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());
@@ -173,23 +131,27 @@
}
@Override
- public TbSpecialCheckItemDangerLog getSpecialCheckItemDangerLogByIndexId(Long indexId) {
- return itemDangerLogMapper.getSpecialCheckItemDangerLogByIndexId(indexId);
+ public TbSpecialCheckItemLog getSpecialCheckItemDangerLogByIndexId(Long indexId) {
+ return itemLogMapper.getSpecialCheckItemDangerLogByIndexId(indexId);
}
@Override
- public ResultVO<TbSpecialCheckItemDangerLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
+ public ResultVO<TbSpecialCheckItemLog> updateSpecialCheckItemDangerLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
User sysUser = getSysUser();
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
- if (updateBO.getTaskId() == null){
+ if (updateBO.getIndexId() == null){
resultVO.setMsg("任务不能为空");
return resultVO;
}
- TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
+ if (updateBO.getTaskId() == null){
+ resultVO.setMsg("专项任务不能为空");
+ return resultVO;
+ }
+ TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(updateBO.getTaskId());
if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
- resultVO.setMsg("任务不存在");
+ resultVO.setMsg("专项任务不存在");
return resultVO;
}
if (updateBO.getCheckItemId() == null){
@@ -201,49 +163,24 @@
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){
- resultVO.setMsg("检查时间不能为空");
- return resultVO;
- }
- if (updateBO.getCheckType() == null){
- resultVO.setMsg("检查类型不能为空");
- return resultVO;
- }
+ TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
LocalDateTime dateTime = LocalDateTime.now();
updateBO.setUpdateDate(dateTime);
updateBO.setUpdateBy(sysUser.getUserName());
updateBO.setReportStatus((byte) 1);
- 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());
+ itemLog.setCheckItemId(updateBO.getCheckItemId());
+ itemLog.setTaskId(updateBO.getTaskId());
+ itemLog.setCheckName(baseCheckItemByItemId.getCheckName());
+ itemLog.setCheckContent(baseCheckItemByItemId.getCheckContent());
+ itemLog.setCheckWay(baseCheckItemByItemId.getCheckWay());
+ itemLog.setCheckBasis(baseCheckItemByItemId.getCheckBasis());
+ itemLog.setApplicablePlace(baseCheckItemByItemId.getApplicablePlace());
- int updateResult = itemDangerLogMapper.updateSpecialCheckItemDangerLogById(updateBO);
+
+ int updateResult = itemLogMapper.updateSpecialCheckItemDangerLogById(itemLog);
if (updateResult == 0){
resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
@@ -255,7 +192,7 @@
}
@Override
- public ResultVO<TbSpecialCheckItemDangerLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
+ public ResultVO<TbSpecialCheckItemLog> deleteTbSpecialItemDangerTaskLog(TbSpecialCheckItemDangerLogUpdateBO updateBO) {
User sysUser = getSysUser();
ResultVO resultVO = new ResultVO<>();
resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());
@@ -264,22 +201,26 @@
resultVO.setMsg("检查项为空");
return resultVO;
}
- TbSpecialCheckItemDangerLog specialCheckItemDangerLogByIndexId = itemDangerLogMapper.getSpecialCheckItemDangerLogByIndexId(updateBO.getIndexId());
- if (ObjectUtils.isEmpty(specialCheckItemDangerLogByIndexId)){
+ TbSpecialCheckItemLog specialCheckItemLogByIndexId = itemLogMapper.getSpecialCheckItemDangerLogByIndexId(updateBO.getIndexId());
+ if (ObjectUtils.isEmpty(specialCheckItemLogByIndexId)){
resultVO.setMsg("检查项不存在，删除失败");
return resultVO;
}
-
- TbSpecialCheckItemDangerLog tbSpecialCheckItemDangerLog = new TbSpecialCheckItemDangerLog();
+ TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogById = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogById(specialCheckItemLogByIndexId.getCheckItemId());
+ if (!ObjectUtils.isEmpty(specialCheckScoreAndDangerLogById)){
+ resultVO.setMsg("该检查项存在评价记录，无法删除");
+ return resultVO;
+ }
+ TbSpecialCheckItemLog tbSpecialCheckItemLog = new TbSpecialCheckItemLog();
LocalDateTime dateTime = LocalDateTime.now();
- tbSpecialCheckItemDangerLog.setIndexId(updateBO.getIndexId());
- tbSpecialCheckItemDangerLog.setUpdateDate(dateTime);
- tbSpecialCheckItemDangerLog.setUpdateBy(sysUser.getUserName());
- tbSpecialCheckItemDangerLog.setReportStatus((byte) 1);
- tbSpecialCheckItemDangerLog.setDeleted((byte) 1);
+ tbSpecialCheckItemLog.setIndexId(updateBO.getIndexId());
+ tbSpecialCheckItemLog.setUpdateDate(dateTime);
+ tbSpecialCheckItemLog.setUpdateBy(sysUser.getUserName());
+ tbSpecialCheckItemLog.setReportStatus((byte) 1);
+ tbSpecialCheckItemLog.setDeleted((byte) 1);
- int deleteResult = itemDangerLogMapper.deleteTbSpecialCheckItemDangerLog(tbSpecialCheckItemDangerLog);
+ int deleteResult = itemLogMapper.deleteTbSpecialCheckItemDangerLog(tbSpecialCheckItemLog);
if (deleteResult == 0){
resultVO.setCode(ResultCodes.SERVER_DEL_ERROR.getCode());
resultVO.setMsg(ResultCodes.SERVER_DEL_ERROR.getDesc());
@@ -290,5 +231,10 @@
return resultVO;
}
+ @Override
+ public TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id) {
+ return itemLogMapper.getSpecialCheckItemDangerLogById(id);
+ }
+
}
--
Gitblit v1.9.2