From d46beba25ccb64a1047a98d642b6ce45e82f0bee Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 17 十月 2022 18:07:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 40 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 ccf530a..1a4d0c4 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
@@ -4,6 +4,7 @@
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.CheckResult;
import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.ChechParam;
import com.ycl.entity.caseHandler.BaseCase;
@@ -42,17 +43,50 @@
@Override
public Boolean check(ChechParam chechParam) {
- //淇敼妗堜欢鐘舵�佷负瀹℃牳
- 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);
+ //淇敼妗堜欢鐘舵�佷负瀹℃牳
+ BaseCase baseCase = new BaseCase();
+ baseCase.setId(chechParam.getBaseCaseId());
+ 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);
+ 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()-2);
+ 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.setHandlerId(chechParam.getCurrentUser());
+ //鏍告煡宸茬粨鏉�
+ disposeRecord.setState(0);
+ disposeRecord.setEndTime(LocalDateTime.now());
+ disposeRecordMapper.update(disposeRecord, updateWrapper);
+ //璋冨害
+ baseCase.setState(BaseCaseStatus.DISPATCH);
+ baseCaseMapper.updateById(baseCase);
+ return true;
+ }
+ //鏍告煡
+ baseCase.setState(BaseCaseStatus.CHECK);
+ baseCaseMapper.updateById(baseCase);
+
if (workflowConfigStep == null) {
throw new ApiException("鏈煡璇㈠埌璇ユ祦绋嬬幆鑺�");
@@ -61,8 +95,6 @@
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);
--
Gitblit v1.8.0