From 68c92dc86cc15ca8d4982a73e7404bd479f2232c Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 22 十一月 2022 17:20:28 +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/IDispatchHandleServiceImpl.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
index 306be5b..e6a650f 100644
--- a/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java
@@ -3,8 +3,8 @@
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.StepName;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DispatchInfo;
@@ -26,7 +26,7 @@
/**
* <p>
- * 璋冨害澶勭悊 鏈嶅姟瀹炵幇绫�
+ * 璋冨害澶勭悊 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author mg
@@ -42,6 +42,7 @@
DisposeRecordMapper disposeRecordMapper;
@Resource
WorkflowConfigStepMapper workflowConfigStepMapper;
+
@Override
public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
//鏂板璋冨害淇℃伅
@@ -64,11 +65,12 @@
}
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 disposeRecord = new DisposeRecord();
disposeRecord.setHandlerId(dispatchInfo.getCreateUser());
+ disposeRecord.setResult(dispatchInfo.getDispatchOpinion());
//璋冨害宸茬粨鏉�
disposeRecord.setState(1);
disposeRecord.setEndTime(LocalDateTime.now());
@@ -84,7 +86,8 @@
stepNextRecord.setBaseCaseId(baseCase.getId());
stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
stepNextRecord.setStepName(stepNext.getName());
- stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
+ stepNextRecord.setLimitTime(dispatchInfoParam.getDisposeDate());
+ stepNextRecord.setHandlerId(dispatchInfoParam.getLawEnforcer());
//涓婁紶澶勭疆鏈粨鏉�
stepNextRecord.setState(0);
stepNextRecord.setStartTime(LocalDateTime.now());
--
Gitblit v1.8.0