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 |   10 +++++-----
 1 files changed, 5 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 d3ef954..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;
@@ -22,7 +22,6 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.Date;
 
 /**
@@ -71,6 +70,7 @@
         //淇敼璋冨害璁板綍
         DisposeRecord disposeRecord = new DisposeRecord();
         disposeRecord.setHandlerId(dispatchInfo.getCreateUser());
+        disposeRecord.setResult(dispatchInfo.getDispatchOpinion());
         //璋冨害宸茬粨鏉�
         disposeRecord.setState(1);
         disposeRecord.setEndTime(LocalDateTime.now());
@@ -86,8 +86,8 @@
         stepNextRecord.setBaseCaseId(baseCase.getId());
         stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
         stepNextRecord.setStepName(stepNext.getName());
-        stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
-        stepNextRecord.setLimitTime(LocalDateTime.parse(dispatchInfoParam.getDisposeDate(), DateTimeFormatter.ofPattern("yyyy-MM-dd hh:mm:ss")));
+        stepNextRecord.setLimitTime(dispatchInfoParam.getDisposeDate());
+        stepNextRecord.setHandlerId(dispatchInfoParam.getLawEnforcer());
         //涓婁紶澶勭疆鏈粨鏉�
         stepNextRecord.setState(0);
         stepNextRecord.setStartTime(LocalDateTime.now());

--
Gitblit v1.8.0