From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001 From: zhanghua <314079846@qq.com> Date: 星期四, 15 十二月 2022 11:29:08 +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 | 74 +++++++++++++++++++++++++----------- 1 files changed, 51 insertions(+), 23 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 62d6428..3b898cc 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,9 +1,11 @@ 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.controller.video.common.constant.BaseCaseStatus; +import com.ycl.controller.video.common.constant.CheckResult; +import com.ycl.controller.video.common.constant.StepName; import com.ycl.dto.caseHandler.ChechParam; import com.ycl.entity.caseHandler.BaseCase; import com.ycl.entity.caseHandler.DisposeRecord; @@ -41,36 +43,63 @@ @Override public Boolean check(ChechParam chechParam) { - //淇敼妗堜欢鐘舵�佷负瀹℃牳 + + + QueryWrapper<WorkflowConfigStep> stepQurey = new QueryWrapper<>(); + stepQurey.eq("name", StepName.CHECK.getName()); + WorkflowConfigStep workflowConfigStep = workflowConfigStepMapper.selectOne(stepQurey); + //淇敼妗堜欢鐘舵�佷负瀹℃牳 BaseCase baseCase = new BaseCase(); baseCase.setId(chechParam.getBaseCaseId()); - baseCase.setState(BaseCaseStatus.CHECK); 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()); + WorkflowConfigStep lastStep = workflowConfigStepMapper.selectOne(lastNextqurey); + //鍒犻櫎褰撳墠鏁版嵁 + UpdateWrapper<DisposeRecord> deleteWrapper = new UpdateWrapper<>(); + 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() - 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()); + + //澶勭悊鏈紑濮� + disposeRecord.setState(0); + disposeRecordMapper.update(disposeRecord, updateWrapper); + //璋冨害 + baseCase.setState(BaseCaseStatus.DISPATCH); + baseCaseMapper.updateById(baseCase); + return true; + } + //鏍告煡 + baseCase.setState(BaseCaseStatus.CHECK); 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("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�"); } - //娣诲姞璋冨害璁板綍 - DisposeRecord disposeRecord = new DisposeRecord(); - disposeRecord.setBaseCaseId(baseCase.getId()); - disposeRecord.setWorkflowConfigStepId(workflowConfigStep.getId()); - disposeRecord.setStepName(workflowConfigStep.getName()); - disposeRecord.setHandlerRoleId(workflowConfigStep.getRoleId()); - disposeRecord.setHandlerId(chechParam.getCurrentUser()); - disposeRecord.setState(1); - disposeRecord.setStartTime(LocalDateTime.now()); - disposeRecord.setEndTime(LocalDateTime.now()); - disposeRecord.setResult(chechParam.getResult()); - disposeRecord.setCreateUser(chechParam.getCurrentUser()); - disposeRecord.setCreateTime(LocalDateTime.now()); - disposeRecordMapper.insert(disposeRecord); + UpdateWrapper<DisposeRecord> updateWrapper = new UpdateWrapper<>(); + updateWrapper.eq("base_case_id", baseCase.getId()).eq("workflow_config_step_id", workflowConfigStep.getId()); + + disposeRecord.setHandlerId(chechParam.getCurrentUser()); + //鏍告煡宸茬粨鏉� + disposeRecord.setState(1); + disposeRecord.setResult(chechParam.getResult()); + 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); @@ -82,7 +111,6 @@ stepNextRecord.setWorkflowConfigStepId(stepNext.getId()); stepNextRecord.setStepName(stepNext.getName()); stepNextRecord.setHandlerRoleId(stepNext.getRoleId()); - stepNextRecord.setHandlerId(chechParam.getCurrentUser()); //涓婁紶澶勭疆鏈粨鏉� stepNextRecord.setState(0); stepNextRecord.setStartTime(LocalDateTime.now()); -- Gitblit v1.8.0