上报数据与拉去任务初步版本

16639036659

2024-07-02 91eeb185de1e8ccc632d4fc1efeb0f9abf315050

 src/main/java/com/ruoyi/project/tr/specialCheck/service/impl/SpecialCheckScoreAndDangerLogServiceImpl.java

@@ -9,11 +9,10 @@
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.specialCheck.domin.*;

import com.ruoyi.project.tr.specialCheck.domin.BO.HandlerSpecialCheckReportParam;

import com.ruoyi.project.tr.specialCheck.domin.BO.TbSpecialCheckScoreAndDangerLogEditBO;

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.TbSpecialCheckScoreAndDangerLog;

import com.ruoyi.project.tr.specialCheck.mapper.*;

import com.ruoyi.project.tr.specialCheck.service.SpecialCheckScoreAndDangerDangerLogService;

import org.springframework.beans.factory.annotation.Autowired;

@@ -44,6 +43,9 @@


    @Autowired

    private PreventCJReportDangerInfoRepository preventCJReportDangerInfoRepository;



    @Autowired

    private TbSpecialCheckItemLogMapper specialCheckItemLogMapper;







@@ -106,7 +108,7 @@
            resultVO.setMsg("隐患不存在");

            return resultVO;

        }

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

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

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

            return resultVO;

        }

@@ -114,7 +116,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 +138,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()));





@@ -145,6 +148,15 @@
        if (saveResult == 0){

            resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());

            resultVO.setMsg(ResultCodes.SERVER_ADD_ERROR.getDesc());

            return resultVO;

        }

        HandlerSpecialCheckReportParam specialCheckItemLog = new HandlerSpecialCheckReportParam();

        specialCheckItemLog.setReportStatus((byte) 2);

        specialCheckItemLog.setReportTime(dateTime);

        int i = specialCheckItemLogMapper.updateItemDangerReportStatusById(specialCheckItemLog);

        if (i == 0){

            resultVO.setCode(ResultCodes.SERVER_ADD_ERROR.getCode());

            resultVO.setMsg("修改检查项状态失败");

            return resultVO;

        }

        resultVO.setCode(ResultCodes.OK.getCode());

@@ -192,7 +204,7 @@
            resultVO.setMsg("隐患不存在");

            return resultVO;

        }

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

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

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

            return resultVO;

        }

@@ -200,7 +212,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;