双重预防项目-国泰新华二开定制版
16639036659
2024-06-19 75efb755b3e5ac69de7be1502d710fa77ce0b692
src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java
@@ -13,6 +13,7 @@
import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogQueryBO;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckItem;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckScore;
import com.ruoyi.project.tr.specialCheck.domin.TbBaseCheckTask;
import com.ruoyi.project.tr.specialCheck.domin.TbSpecialCheckScoreAndDangerLog;
import com.ruoyi.project.tr.specialCheck.mapper.*;
import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;
@@ -106,7 +107,7 @@
            resultVO.setMsg("隐患不存在");
            return resultVO;
        }
        if (scoreAndDangerLog.getCheckDate() == null){
        if (scoreAndDangerEditLog.getCheckDate() == null){
            resultVO.setMsg("检查时间不能为空");
            return resultVO;
        }
@@ -114,7 +115,7 @@
            resultVO.setMsg("检查类型不能为空");
            return resultVO;
        }
        TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
        TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
            resultVO.setMsg("专项任务不存在");
            return resultVO;
@@ -136,6 +137,7 @@
        scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());
        scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());
        scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());
        scoreAndDangerLog.setTaskId(baseCheckItemByItemId.getTaskId());
        scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault()));
@@ -192,7 +194,7 @@
            resultVO.setMsg("隐患不存在");
            return resultVO;
        }
        if (scoreAndDangerLog.getCheckDate() == null){
        if (scoreAndDangerEditLog.getCheckDate() == null){
            resultVO.setMsg("检查时间不能为空");
            return resultVO;
        }
@@ -200,7 +202,7 @@
            resultVO.setMsg("检查类型不能为空");
            return resultVO;
        }
        TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
        TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());
        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){
            resultVO.setMsg("专项任务不存在");
            return resultVO;