临时提交

16639036659

2024-06-19 4af33a0acb04bc487a4aa671dc98874fea9bd88f

 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;

@@ -21,6 +22,7 @@
import org.springframework.util.ObjectUtils;



import java.time.LocalDateTime;

import java.time.ZoneId;

import java.util.List;

import java.util.UUID;



@@ -77,15 +79,7 @@
        ResultVO resultVO = new ResultVO<>();

        resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());

        TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);

        if (scoreAndDangerLog.getTaskId() == null){

            resultVO.setMsg("任务不能为空");

            return resultVO;

        }

        TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(scoreAndDangerLog.getTaskId());

        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){

            resultVO.setMsg("任务不存在");

            return resultVO;

        }



        if (scoreAndDangerLog.getCheckItemId() == null){

            resultVO.setMsg("检查项不能为空");

            return resultVO;

@@ -113,12 +107,17 @@
            resultVO.setMsg("隐患不存在");

            return resultVO;

        }

        if (scoreAndDangerLog.getCheckDate() == null){

        if (scoreAndDangerEditLog.getCheckDate() == null){

            resultVO.setMsg("检查时间不能为空");

            return resultVO;

        }

        if (scoreAndDangerLog.getCheckType() == null){

            resultVO.setMsg("检查类型不能为空");

            return resultVO;

        }

        TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());

        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){

            resultVO.setMsg("专项任务不存在");

            return resultVO;

        }



@@ -138,7 +137,8 @@
        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()));







@@ -160,20 +160,13 @@
    }



    @Override

    public ResultVO<TbSpecialCheckScoreAndDangerLog> updateSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLog scoreAndDangerLog) {

    public ResultVO<TbSpecialCheckScoreAndDangerLog> updateSpecialCheckScoreAndDangerLog(TbSpecialCheckScoreAndDangerLogEditBO scoreAndDangerEditLog) {

        User sysUser = getSysUser();

        ResultVO resultVO = new ResultVO<>();

        resultVO.setCode(ErrorCodes.REQUEST_PARAM_ERROR.getCode());



        if (scoreAndDangerLog.getTaskId() == null){

            resultVO.setMsg("任务不能为空");

            return resultVO;

        }

        TbBaseCheckTaskMapper baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(scoreAndDangerLog.getTaskId());

        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){

            resultVO.setMsg("任务不存在");

            return resultVO;

        }

        TbSpecialCheckScoreAndDangerLog scoreAndDangerLog = BeanCopyUtils.copyBean(scoreAndDangerEditLog, TbSpecialCheckScoreAndDangerLog.class);



        if (scoreAndDangerLog.getCheckItemId() == null){

            resultVO.setMsg("检查项不能为空");

            return resultVO;

@@ -201,12 +194,17 @@
            resultVO.setMsg("隐患不存在");

            return resultVO;

        }

        if (scoreAndDangerLog.getCheckDate() == null){

        if (scoreAndDangerEditLog.getCheckDate() == null){

            resultVO.setMsg("检查时间不能为空");

            return resultVO;

        }

        if (scoreAndDangerLog.getCheckType() == null){

            resultVO.setMsg("检查类型不能为空");

            return resultVO;

        }

        TbBaseCheckTask baseCheckTaskByTaskId = baseCheckTaskMapper.getBaseCheckTaskByTaskId(baseCheckItemByItemId.getTaskId());

        if (ObjectUtils.isEmpty(baseCheckTaskByTaskId)){

            resultVO.setMsg("专项任务不存在");

            return resultVO;

        }



@@ -220,6 +218,7 @@
        scoreAndDangerLog.setIsReject(baseCheckScoreByScoreId.getIsReject());

        scoreAndDangerLog.setDeductPoint(baseCheckScoreByScoreId.getDeductPoint());

        scoreAndDangerLog.setDeductIllustrate(baseCheckScoreByScoreId.getDeductIllustrate());

        scoreAndDangerLog.setCheckDate(LocalDateTime.ofInstant(scoreAndDangerEditLog.getCheckDate().toInstant(), ZoneId.systemDefault()));



        int updateResult = scoreAndDangerLogMapper.updateSpecialCheckScoreAndDangerLogById(scoreAndDangerLog);

        if (updateResult == 0){