From b9e7a0261443ca41b80108b9fef555093f20bb8b Mon Sep 17 00:00:00 2001 From: mg <maokecheng@163.com> Date: 星期五, 14 十月 2022 16:48:13 +0800 Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server --- ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 files changed, 52 insertions(+), 8 deletions(-) diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java index 33f4d14..ccf530a 100644 --- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java +++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java @@ -1,17 +1,24 @@ package com.ycl.service.caseHandler.impl; +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.common.constant.BaseCaseStatus; +import com.ycl.common.constant.StepName; import com.ycl.dto.caseHandler.ChechParam; import com.ycl.entity.caseHandler.BaseCase; import com.ycl.entity.caseHandler.DisposeRecord; +import com.ycl.entity.caseHandler.WorkflowConfigStep; +import com.ycl.exception.ApiException; import com.ycl.mapper.caseHandler.BaseCaseMapper; import com.ycl.mapper.caseHandler.DisposeRecordMapper; +import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper; import com.ycl.service.caseHandler.ICheckHandleService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.time.LocalDateTime; /** * <p> @@ -28,21 +35,58 @@ @Resource BaseCaseMapper baseCaseMapper; + @Resource + DisposeRecordMapper disposeRecordMapper; + @Resource + WorkflowConfigStepMapper workflowConfigStepMapper; + @Override public Boolean check(ChechParam chechParam) { - //鏂板娴佺▼璁板綍淇℃伅 - DisposeRecord disposeRecord = new DisposeRecord(); - disposeRecord.setBaseCaseId(chechParam.getBaseCaseId()); - disposeRecord.setWorkflowConfigStepId(3); - disposeRecord.setState(chechParam.getStatus()); - disposeRecord.setCreateUser(chechParam.getCurrentUser()); - disposeRecord.setStepName("鏍告煡"); - baseMapper.insert(disposeRecord); //淇敼妗堜欢鐘舵�佷负瀹℃牳 BaseCase baseCase = new BaseCase(); baseCase.setId(chechParam.getBaseCaseId()); baseCase.setState(BaseCaseStatus.CHECK); + baseCase.setAuditOpinion(chechParam.getCheckOpinion()); baseCaseMapper.updateById(baseCase); + + + QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>(); + stepQurey.eq("name", StepName.CHECK.getName()); + WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey); + + if (workflowConfigStep == null) { + throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�"); + } + + UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id",workflowConfigStep.getId()); + + //淇敼鏍告煡璁板綍 + DisposeRecord disposeRecord = new DisposeRecord(); + disposeRecord.setHandlerId(chechParam.getCurrentUser()); + //鏍告煡宸茬粨鏉� + disposeRecord.setState(1); + disposeRecord.setEndTime(LocalDateTime.now()); + disposeRecordMapper.update(disposeRecord, updateWrapper); + + QueryWrapper<WorkflowConfigStep> stepNextqurey = new QueryWrapper<>(); + stepNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId()); + stepNextqurey.eq("seq", workflowConfigStep.getSeq() + 1); + WorkflowConfigStep stepNext = workflowConfigStepMapper.selectOne(stepNextqurey); + + //娣诲姞涓嬩竴姝ヨ褰� + DisposeRecord stepNextRecord = new DisposeRecord(); + stepNextRecord.setBaseCaseId(baseCase.getId()); + stepNextRecord.setWorkflowConfigStepId(stepNext.getId()); + stepNextRecord.setStepName(stepNext.getName()); + stepNextRecord.setHandlerRoleId(stepNext.getRoleId()); + //涓婁紶澶勭疆鏈粨鏉� + stepNextRecord.setState(0); + stepNextRecord.setStartTime(LocalDateTime.now()); + stepNextRecord.setCreateUser(chechParam.getCurrentUser()); + stepNextRecord.setCreateTime(LocalDateTime.now()); + + disposeRecordMapper.insert(stepNextRecord); return true; } } -- Gitblit v1.8.0