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 |  202 +++++++++++++++++++++++++------------------------
 1 files changed, 103 insertions(+), 99 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..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
@@ -2,17 +2,18 @@
 
 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.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.TbSpecialCheckItemDangerLog;
-import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckTaskLog;
-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.SpecialCheckScoreAndDangerDangerLogService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
@@ -27,25 +28,39 @@
 public class SpecialCheckItemDangerLogServiceImpl implements SpecialCheckItemDangerLogService {
 
     @Autowired
-    private TbSpecialCheckItemDangerLogMapper itemDangerLogMapper;
+    private TbSpecialCheckItemLogMapper itemLogMapper;
 
+    @Autowired
+    private TbBaseCheckTaskMapper baseCheckTaskMapper;
+
+    @Autowired
+    private TbBaseCheckItemMapper baseCheckItemMapper;
+
+    @Autowired
+    private TbBaseCheckScoreMapper baseCheckScoreMapper;
+
+    @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);
@@ -56,51 +71,55 @@
     }
 
     @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());
 
-        // 四类id,挨个查询,判断是否存在
-        if (itemDangerLog.getCheckItemId() == null){
-            resultVO.setMsg("检查项不能为空");
-            return resultVO;
-        }
         if (itemDangerLog.getTaskId() == null){
             resultVO.setMsg("任务不能为空");
             return resultVO;
         }
-        if (itemDangerLog.getCheckScoreId() == null){
-            resultVO.setMsg("评分不能为空");
+        TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(itemDangerLog.getTaskId());
+        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
+            resultVO.setMsg("任务不存在");
             return resultVO;
         }
-        if (itemDangerLog.getDangerId() == null){
-            resultVO.setMsg("关联隐患不能为空");
+        if (itemDangerLog.getCheckItemId() == null){
+            resultVO.setMsg("检查项不能为空");
             return resultVO;
         }
-        if (itemDangerLog.getCheckDate() == null){
-            resultVO.setMsg("检查时间不能为空");
+        TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(itemDangerLog.getCheckItemId());
+        if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+            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);
+        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());
@@ -112,54 +131,56 @@
     }
 
     @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());
 
-        // 四类id,挨个查询,判断是否存在
+        if (updateBO.getIndexId() == null){
+            resultVO.setMsg("任务不能为空");
+            return resultVO;
+        }
+        if (updateBO.getTaskId() == null){
+            resultVO.setMsg("专项任务不能为空");
+            return resultVO;
+        }
+        TbBaseCheckTask 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("任务不能为空");
-            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("检查类型不能为空");
+        TbBaseCheckItem baseCheckItemByItemId = baseCheckItemMapper.getBaseCheckItemByItemId(updateBO.getCheckItemId());
+        if (ObjectUtils.isEmpty(baseCheckItemByItemId)){
+            resultVO.setMsg("检查项不存在");
             return resultVO;
         }
 
+        TbSpecialCheckItemLog itemLog = new TbSpecialCheckItemLog();
         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);
 
-        int updateResult = itemDangerLogMapper.updateSpecialCheckItemDangerLogById(updateBO);
+        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 = itemLogMapper.updateSpecialCheckItemDangerLogById(itemLog);
         if (updateResult == 0){
             resultVO.setCode(ResultCodes.SERVER_UPDATE_ERROR.getCode());
             resultVO.setMsg(ResultCodes.SERVER_UPDATE_ERROR.getDesc());
@@ -171,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());
@@ -180,48 +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;
         }
-
-        // 四类id,挨个查询,判断是否存在
-        if (updateBO.getCheckItemId() == null){
-            resultVO.setMsg("检查项不能为空");
+        TbSpecialCheckScoreAndDangerLog specialCheckScoreAndDangerLogById = scoreAndDangerDangerLogService.getSpecialCheckScoreAndDangerLogById(specialCheckItemLogByIndexId.getCheckItemId());
+        if (!ObjectUtils.isEmpty(specialCheckScoreAndDangerLogById)){
+            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();
+        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());
@@ -232,5 +231,10 @@
         return resultVO;
     }
 
+    @Override
+    public TbSpecialCheckItemLog getSpecialCheckItemDangerLogById(String id) {
+        return itemLogMapper.getSpecialCheckItemDangerLogById(id);
+    }
+
 
 }

--
Gitblit v1.9.2