From c864fec5f798a1aabcde877469886dd0dc90d092 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 02 Jan 2023 13:54:18 +0800
Subject: [PATCH] 申请表getAll接口可以根据通行证状态查询
---
src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 90 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java b/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java
index bdbc2dd..e4b52a2 100644
--- a/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/application/service/impl/ApplicationServiceImpl.java
@@ -25,6 +25,8 @@
import org.flowable.engine.impl.persistence.entity.ExecutionEntity;
import org.flowable.engine.runtime.ProcessInstance;
import org.flowable.task.api.Task;
+import org.springblade.common.constant.AuditStatusConstant;
+import org.springblade.common.enums.DictEnum;
import org.springblade.common.utils.CommonUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -43,6 +45,10 @@
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.modules.application.wrapper.ApplicationWrapper;
import org.springblade.modules.enterprise.wrapper.EnterpriseWrapper;
+import org.springblade.modules.evaluation.entity.EvaluationEntity;
+import org.springblade.modules.evaluation.service.IEvaluationService;
+import org.springblade.modules.pass.entity.PassEntity;
+import org.springblade.modules.pass.service.IPassService;
import org.springblade.modules.reject.entity.RejectEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -66,6 +72,8 @@
private final ISchemeService schemeService;
private final IGoodsService goodsService;
private final ICarService carService;
+ private final IPassService passService;
+ private final IEvaluationService evaluationService;
private final IFlowService flowService;
private final TaskService taskService;
@@ -118,7 +126,12 @@
applicationVO.setBasicInfoEntity(basicInfoService.getOne(Condition.getQueryWrapper(new BasicInfoEntity(applicationId))));
applicationVO.setSchemeEntity(schemeService.getOne(Condition.getQueryWrapper(new SchemeEntity(applicationId))));
applicationVO.setPlanEntity(planService.getOne(Condition.getQueryWrapper(new PlanEntity(applicationId))));
- applicationVO.setCarEntity(carService.getOne(Condition.getQueryWrapper(new CarEntity(applicationId))));
+
+ CarEntity carEntity = new CarEntity();
+ carEntity.setApplicationId(applicationId);
+ carEntity.setStatus("1");
+ applicationVO.setCarEntity(carService.getOne(Condition.getQueryWrapper(carEntity)));
+
applicationVO.setBasicInfoEntity(basicInfoService.getOne(Condition.getQueryWrapper(new BasicInfoEntity(applicationId))));
GoodsEntity goods = goodsService.getOne(Condition.getQueryWrapper(new GoodsEntity(applicationId)));
@@ -184,12 +197,11 @@
//启动流程
Kv variables = Kv.create()
- .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, basicInfoEntity.getName())
- .set("taskUser", TaskUtil.getTaskUser(application.getTaskUser()));
+ .set(ProcessConstant.TASK_VARIABLE_CREATE_USER, basicInfoEntity.getName());
BladeFlow flow = flowService.startProcessInstanceById(application.getProcessDefinitionId(), FlowUtil.getBusinessKey(businessTable, String.valueOf(application.getId())), variables);
if (Func.isNotEmpty(flow)) {
log.error("流程已启动,流程ID:" + flow.getProcessInstanceId());
- // 返回流程id写入leave
+ // 返回流程id
application.setProcessInstanceId(flow.getProcessInstanceId());
updateById(application);
} else {
@@ -203,6 +215,7 @@
}
@Override
+ @Transactional
public Boolean completeTask(BladeFlow flow, ApplicationEntity applicationEntity, RejectEntity rejectEntity) {
String taskId = flow.getTaskId();
@@ -219,8 +232,8 @@
if (!StringUtil.isBlank(applicationEntity.getSuggestion())){
entity.setSuggestion(applicationEntity.getSuggestion());
}
- if (entity.getStatus() == 1){
- entity.setStatus(2);
+ if (entity.getStatus() == AuditStatusConstant.COMMIT){
+ entity.setStatus(AuditStatusConstant.PROCESSING);
}
String processInstanceId = flow.getProcessInstanceId();
@@ -234,7 +247,7 @@
if (variables == null) {
variables = Kv.create();
}
- variables.put("suggestion",Func.toStr(applicationEntity.getSuggestion(),""));
+ variables.put(ProcessConstant.SUGGESTION_KEY,applicationEntity.getIsSuggestion());
variables.put(ProcessConstant.PASS_KEY, flow.isPass());
// 完成任务
taskService.complete(taskId, variables);
@@ -243,16 +256,67 @@
//判读是否有末尾节点
if (getEndNode(task,entity.getProcessDefinitionId())){
//判断是否pass
- if ((Boolean)variables.get(ProcessConstant.PASS_KEY)){
+ if (flow.isPass()){
//改变业务状态
- entity.setStatus(10);
+ entity.setStatus(AuditStatusConstant.PASS_DISTRIBUTE);
//生成通行证
-
+ PassEntity passEntity = new PassEntity();
+ passEntity.setNo(entity.getNo());
+ passService.save(passEntity);
+ //添加评价
+ EvaluationEntity evaluationEntity = new EvaluationEntity();
+ evaluationEntity.setNo(entity.getNo());
+ evaluationService.save(evaluationEntity);
+// //修改车辆信息状态
+// CarEntity carEntity = new CarEntity();
+// carEntity.setApplicationId(entity.getId().toString());
+// carEntity.setStatus("3");
+// CarEntity one = carService.getOne(Condition.getQueryWrapper(carEntity));
+// one.setStatus("1");
+// carService.updateById(one);
+ }else if (!applicationEntity.getIsSuggestion()&&!flow.isPass()){
+ //判断是否拒绝受理
+ entity.setStatus(AuditStatusConstant.REJECT_AUDIT);
}
}
- updateById(entity);
+ boolean update = updateById(entity);
+ return update;
+ }
+
+ @Override
+ @Transactional
+ public Boolean userCompleteTask(BladeFlow flow,ApplicationEntity applicationEntity, BasicInfoEntity basicInfoEntity, CarEntity carEntity, PlanEntity planEntity, SchemeEntity schemeEntity, GoodsEntity goodsEntity, RejectEntity rejectEntity) {
+ String taskId = flow.getTaskId();
+
+ Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+
+ String processInstanceId = flow.getProcessInstanceId();
+ String comment = Func.toStr(flow.getComment(), ProcessConstant.PASS_COMMENT);
+ // 增加评论
+ if (StringUtil.isNoneBlank(processInstanceId, comment)) {
+ taskService.addComment(taskId, processInstanceId, comment);
+ }
+ // 创建变量
+ Map<String, Object> variables = flow.getVariables();
+ if (variables == null) {
+ variables = Kv.create();
+ }
+ variables.put(ProcessConstant.SUGGESTION_KEY,applicationEntity.getIsSuggestion());
+ variables.put(ProcessConstant.PASS_KEY, flow.isPass());
+
+ if (flow.isPass()&&applicationEntity.getIsSuggestion()){
+ updateVoById(applicationEntity,basicInfoEntity,carEntity,planEntity,schemeEntity,goodsEntity);
+ }
+
+ // 完成任务
+ taskService.complete(taskId, variables);
return true;
+ }
+
+ @Override
+ public List<ApplicationVO> getAll(ApplicationVO applicationVO) {
+ return baseMapper.getAll(applicationVO);
}
/**
@@ -264,16 +328,29 @@
return baseMapper.getMaxNoEntity();
}
+ /**
+ * 判断是否包含最终节点且为倒数第二个节点
+ * @param task
+ * @param definitionId
+ * @return
+ */
public boolean getEndNode(Task task,String definitionId){
+ boolean isEnd=false;
+ boolean finalTask = false;
BpmnModel bpmnModel = repositoryService.getBpmnModel(definitionId);
FlowNode flowNode = (FlowNode) bpmnModel.getFlowElement(task.getTaskDefinitionKey());
List<SequenceFlow> outgoingFlows = flowNode.getOutgoingFlows();
for (SequenceFlow outgoingFlow : outgoingFlows) {
FlowElement targetFlowElement = outgoingFlow.getTargetFlowElement();
+ FlowElement sourceFlowElement = outgoingFlow.getSourceFlowElement();
+ if (sourceFlowElement.getId().equals("finalTask")){
+ finalTask = true;
+ }
if (targetFlowElement instanceof EndEvent){
- return true;
+ isEnd = true;
+ break;
}
}
- return false;
+ return isEnd&&finalTask;
}
}
--
Gitblit v1.9.3