From a8c48babd4bd3e181b0f0bb1130c4c900edcacc2 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期三, 12 十月 2022 18:01:03 +0800
Subject: [PATCH] 优化调度，审核流程
---
ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java | 9 ++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/IDispatchHandleServiceImpl.java | 56 ++++++++++++++++++
ycl-platform/src/main/java/com/ycl/service/caseHandler/impl/CheckHandleServiceImpl.java | 63 ++++++++++++++++++--
ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java | 4 +
ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java | 2
ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java | 8 ++
ycl-platform/src/main/java/com/ycl/common/constant/StepName.java | 26 ++++++++
ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java | 2
8 files changed, 159 insertions(+), 11 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java b/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java
new file mode 100644
index 0000000..59e809b
--- /dev/null
+++ b/ycl-platform/src/main/java/com/ycl/common/constant/StepName.java
@@ -0,0 +1,26 @@
+package com.ycl.common.constant;
+
+public enum StepName {
+
+ DISPATCH("01", "璋冨害"),
+ DISPOSE("02", "涓婁紶澶勭疆缁撴灉"),
+ CHECK("03", "鏍告煡"),
+ CLOSING_REGISTER("04", "缁撴");
+
+
+ private String code;
+ private String name;
+
+ StepName(String code, String name) {
+ this.code = code;
+ this.name = name;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public String getName() {
+ return name;
+ }
+}
\ No newline at end of file
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
index 2d9d80e..8dbc0d8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/CheckHandleController.java
@@ -1,11 +1,13 @@
package com.ycl.controller.caseHandler;
import com.ycl.api.CommonResult;
+import com.ycl.bo.AdminUserDetails;
import com.ycl.dto.caseHandler.ChechParam;
import com.ycl.service.caseHandler.ICheckHandleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -30,6 +32,8 @@
@RequestMapping(value = "/check", method = RequestMethod.POST)
@ResponseBody
public CommonResult check(@Validated @RequestBody ChechParam chechParam) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ chechParam.setCurrentUser(user.getUserId());
return CommonResult.success(iCheckHandleService.check(chechParam));
}
}
diff --git a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
index d3ffe96..96244c8 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/caseHandler/DispatchHandleController.java
@@ -52,6 +52,8 @@
@RequestMapping(value = "/dispatch", method = RequestMethod.POST)
@ResponseBody
public CommonResult<DispatchInfo> dispatch(@Validated @RequestBody DispatchInfoParam dispatchInfoParam) {
+ AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
+ dispatchInfoParam.setCreateUser(user.getUserId());
return CommonResult.success(iDispatchHandleService.dispatch(dispatchInfoParam));
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
index ceddd69..0ebaa9a 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/ChechParam.java
@@ -18,7 +18,7 @@
/**
* 妗堜欢id
*/
- @ApiModelProperty(value = "妗堜欢id")
+ @ApiModelProperty(value = "妗堜欢id", required = true)
private Long baseCaseId;
/**
* 褰撳墠澶勭悊浜�
@@ -35,4 +35,10 @@
*/
@ApiModelProperty(value = "瀹℃牳鎰忚")
private String checkOpinion;
+ /**
+ * 瀹℃牳缁撴灉
+ */
+ @ApiModelProperty(value = "瀹℃牳缁撴灉")
+ private String result;
+
}
diff --git a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
index 59c9241..fa0b0fe 100644
--- a/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
+++ b/ycl-platform/src/main/java/com/ycl/dto/caseHandler/DispatchInfoParam.java
@@ -18,8 +18,9 @@
/**
* 妗堜欢id
*/
- @ApiModelProperty(value = "妗堜欢id")
+ @ApiModelProperty(value = "妗堜欢id", required = true)
private Long baseCaseId;
+
/**
* 鎵ф硶浜哄憳
*/
@@ -61,4 +62,10 @@
@ApiModelProperty(value = "娲鹃仯鎰忚")
private String dispatchOpinion;
+ /**
+ * 褰撳墠鐧诲綍浜�
+ */
+ @ApiModelProperty(value = "娲鹃仯鎰忚")
+ private Long createUser;
+
}
diff --git a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
index 8b67f66..5a9644c 100644
--- a/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
+++ b/ycl-platform/src/main/java/com/ycl/entity/caseHandler/DisposeRecord.java
@@ -85,7 +85,7 @@
*/
@TableField("handler_id")
@ApiModelProperty(value = "瀹為檯澶勭悊浜�")
- private Integer handlerId;
+ private Long handlerId;
/**
* 鍒涘缓浜�
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 6a74ac8..62d6428 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,17 +1,23 @@
package com.ycl.service.caseHandler.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.ChechParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DisposeRecord;
+import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DisposeRecordMapper;
+import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.ICheckHandleService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
/**
* <p>
@@ -28,21 +34,62 @@
@Resource
BaseCaseMapper baseCaseMapper;
+ @Resource
+ DisposeRecordMapper disposeRecordMapper;
+ @Resource
+ WorkflowConfigStepMapper workflowConfigStepMapper;
+
@Override
public Boolean check(ChechParam chechParam) {
- //鏂板娴佺▼璁板綍淇℃伅
- DisposeRecord disposeRecord = new DisposeRecord();
- disposeRecord.setBaseCaseId(chechParam.getBaseCaseId());
- disposeRecord.setWorkflowConfigStepId(3L);
- disposeRecord.setState(chechParam.getStatus());
- disposeRecord.setCreateUser(chechParam.getCurrentUser());
- disposeRecord.setStepName("鏍告煡");
- baseMapper.insert(disposeRecord);
//淇敼妗堜欢鐘舵�佷负瀹℃牳
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);
+
+ 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);
+ QueryWrapper<WorkflowConfigStep> stepNextqurey = new QueryWrapper<>();
+ stepNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
+ stepNextqurey.eq("seq", workflowConfigStep.getSeq() + 1);
+ WorkflowConfigStep stepNext = workflowConfigStepMapper.selectOne(stepNextqurey);
+
+ //娣诲姞涓嬩竴姝ヨ褰�
+ DisposeRecord stepNextRecord = new DisposeRecord();
+ stepNextRecord.setBaseCaseId(baseCase.getId());
+ stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
+ stepNextRecord.setStepName(stepNext.getName());
+ stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
+ stepNextRecord.setHandlerId(chechParam.getCurrentUser());
+ //涓婁紶澶勭疆鏈粨鏉�
+ stepNextRecord.setState(0);
+ stepNextRecord.setStartTime(LocalDateTime.now());
+ stepNextRecord.setCreateUser(chechParam.getCurrentUser());
+ stepNextRecord.setCreateTime(LocalDateTime.now());
+
+ disposeRecordMapper.insert(stepNextRecord);
return true;
}
}
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 d5e4334..2895f7e 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
@@ -1,18 +1,26 @@
package com.ycl.service.caseHandler.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.constant.BaseCaseStatus;
+import com.ycl.common.constant.StepName;
import com.ycl.dto.caseHandler.DispatchInfoParam;
import com.ycl.entity.caseHandler.BaseCase;
import com.ycl.entity.caseHandler.DispatchInfo;
+import com.ycl.entity.caseHandler.DisposeRecord;
+import com.ycl.entity.caseHandler.WorkflowConfigStep;
+import com.ycl.exception.ApiException;
import com.ycl.mapper.caseHandler.BaseCaseMapper;
import com.ycl.mapper.caseHandler.DispatchInfoMapper;
+import com.ycl.mapper.caseHandler.DisposeRecordMapper;
+import com.ycl.mapper.caseHandler.WorkflowConfigStepMapper;
import com.ycl.service.caseHandler.IDispatchHandleService;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.Date;
/**
@@ -29,6 +37,10 @@
@Resource
BaseCaseMapper baseCaseMapper;
+ @Resource
+ DisposeRecordMapper disposeRecordMapper;
+ @Resource
+ WorkflowConfigStepMapper workflowConfigStepMapper;
@Override
public DispatchInfo dispatch(DispatchInfoParam dispatchInfoParam) {
//鏂板璋冨害淇℃伅
@@ -41,6 +53,50 @@
baseCase.setId(dispatchInfoParam.getBaseCaseId());
baseCase.setState(BaseCaseStatus.DISPATCH);
baseCaseMapper.updateById(baseCase);
+
+ QueryWrapper<WorkflowConfigStep> stepqurey = new QueryWrapper<>();
+ stepqurey.eq("name", StepName.DISPATCH.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(dispatchInfo.getCreateUser());
+ //璋冨害宸茬粨鏉�
+ disposeRecord.setState(1);
+ disposeRecord.setStartTime(LocalDateTime.now());
+ disposeRecord.setEndTime(LocalDateTime.now());
+ disposeRecord.setCreateUser(dispatchInfo.getCreateUser());
+ disposeRecord.setCreateTime(LocalDateTime.now());
+
+ disposeRecordMapper.insert(disposeRecord);
+
+ QueryWrapper<WorkflowConfigStep> stepNextqurey = new QueryWrapper<>();
+ stepNextqurey.eq("workflow_config_id", workflowConfigStep.getWorkflowConfigId());
+ stepNextqurey.eq("seq", workflowConfigStep.getSeq() + 1);
+ WorkflowConfigStep stepNext = workflowConfigStepMapper.selectOne(stepNextqurey);
+
+ //娣诲姞涓嬩竴姝ヨ褰�
+ DisposeRecord stepNextRecord = new DisposeRecord();
+ stepNextRecord.setBaseCaseId(baseCase.getId());
+ stepNextRecord.setWorkflowConfigStepId(stepNext.getId());
+ stepNextRecord.setStepName(stepNext.getName());
+ stepNextRecord.setHandlerRoleId(stepNext.getRoleId());
+ stepNextRecord.setHandlerId(dispatchInfo.getCreateUser());
+ //涓婁紶澶勭疆鏈粨鏉�
+ stepNextRecord.setState(0);
+ stepNextRecord.setStartTime(LocalDateTime.now());
+ stepNextRecord.setCreateUser(dispatchInfo.getCreateUser());
+ stepNextRecord.setCreateTime(LocalDateTime.now());
+
+ disposeRecordMapper.insert(stepNextRecord);
return dispatchInfo;
}
--
Gitblit v1.8.0