Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-11-29 704e7207d74b6477c5f472c5aba92d484ab17f98

 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java

@@ -3,9 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.controller.video.common.constant.BaseCaseStatus;
import com.ycl.controller.video.common.constant.CheckResult;
import com.ycl.controller.video.common.constant.StepName;
import com.ycl.common.constant.BaseCaseStatus;
import com.ycl.common.constant.CheckResult;
import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.ChechParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DisposeRecord;
@@ -54,29 +54,27 @@
        baseCase.setAuditOpinion(chechParam.getCheckOpinion());
        //修改核查记录
        DisposeRecord disposeRecord = new DisposeRecord();
         //驳回处理
        //驳回处理
        if (CheckResult.REJECT.getName().equals(chechParam.getResult())) {
            QueryWrapper<WorkflowConfigStep> lastNextqurey = new QueryWrapper<>();
            lastNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
            lastNextqurey.eq("seq", workflowConfigStep.getSeq()-1);
            lastNextqurey.eq("seq", workflowConfigStep.getSeq());
            WorkflowConfigStep lastStep = workflowConfigStepMapper.selectOne(lastNextqurey);
            //删除上一步数据
            //删除当前数据
            UpdateWrapper<DisposeRecord> deleteWrapper = new UpdateWrapper<>();
            deleteWrapper.eq("base_case_id", chechParam.getBaseCaseId()).eq("workflow_config_step_id",lastStep.getId());
            deleteWrapper.eq("base_case_id", chechParam.getBaseCaseId()).eq("workflow_config_step_id", lastStep.getId());
            disposeRecordMapper.delete(deleteWrapper);
            //修改状态为上上一步状态
            //修改状态为上一步状态
            QueryWrapper<WorkflowConfigStep> lastLastNextqurey = new QueryWrapper<>();
            lastLastNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
            lastLastNextqurey.eq("seq", workflowConfigStep.getSeq()-2);
            lastLastNextqurey.eq("seq", workflowConfigStep.getSeq() - 1);
            WorkflowConfigStep lastLastStep = workflowConfigStepMapper.selectOne(lastLastNextqurey);

            UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
            updateWrapper.eq("base_case_id", chechParam.getBaseCaseId()).eq("workflow_config_step_id",lastLastStep.getId());
            updateWrapper.eq("base_case_id", chechParam.getBaseCaseId()).eq("workflow_config_step_id", lastLastStep.getId());

            disposeRecord.setHandlerId(chechParam.getCurrentUser());
            //核查已结束
            //处理未开始
            disposeRecord.setState(0);
            disposeRecord.setEndTime(LocalDateTime.now());
            disposeRecordMapper.update(disposeRecord, updateWrapper);
            //调度
            baseCase.setState(BaseCaseStatus.DISPATCH);
@@ -93,7 +91,7 @@
        }

        UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>();
        updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id",workflowConfigStep.getId());
        updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId());

        disposeRecord.setHandlerId(chechParam.getCurrentUser());
        //核查已结束