From e6b7d6af8f9acf79f32fd386a9cead2d24ae2f9a Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期五, 30 十二月 2022 15:04:55 +0800
Subject: [PATCH] fix: 栏目订阅

---
 ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java |   26 ++++++++++++--------------
 1 files changed, 12 insertions(+), 14 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 1ea1d9a..5387357 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
@@ -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());
         //鏍告煡宸茬粨鏉�

--
Gitblit v1.8.0