diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index 3be08d8c81..bedeca5102 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -4615,7 +4615,8 @@ public class BusSalesOrderService extends MybatisBaseService pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState); for (AppBusSalesOrderVo record : pagging.getRecords()) { List vinList = busSalesOrderVehicleService.selectList(record.getSaleOrderSid()); - record.setVinNo(String.join(",",vinList)); + vinList.removeAll(Collections.singleton(null)); + if(!vinList.isEmpty()){ + record.setVinNo(String.join(",",vinList)); + }else{ + record.setVinNo("暂无"); + } + record.setShowStopBtn(false); record.setShowContractBtn(false); if (StringUtils.isNotBlank(record.getCustomerImage())) { diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index e8ef40aaee..e04ba6c2fb 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -8,6 +8,8 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ + DEFAUL_TADMIN_SID("默认的管理员sid","427a2fb0-60c5-409f-bea4-4eb441041ae6"), + ORDERDEPOSITAPPROVE("简易订单-订金收取", "process_60lvxwuh:1:960004"), ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java index 0438d86063..044badd58f 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java @@ -34,6 +34,7 @@ import com.yxt.anrui.flowable.api.flow.*; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService; import com.yxt.anrui.flowable.biz.process.ProcessService; import com.yxt.anrui.flowable.biz.processcomment.ProcessCommentService; @@ -52,7 +53,6 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import io.swagger.annotations.Api; import io.swagger.annotations.ApiParam; -import liquibase.pro.packaged.S; import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.flowable.bpmn.model.FlowElement; import org.flowable.bpmn.model.UserTask; @@ -295,7 +295,6 @@ public class FlowableRest implements FlowableFeign { if (StringUtils.isNotBlank(dto.getOrgSidPath())) { String orgPath = dto.getOrgSidPath(); formVariables.put("createrOrgPath", orgPath);//发起人的组织结构sid - //dto.setFormVariables(formVariables); } dto.getFormVariables().put("businessSid", dto.getBusinessSid()); @@ -304,10 +303,13 @@ public class FlowableRest implements FlowableFeign { ResultBean nextNodeUserSidsOfCreate = getNextNodeUserSidsOfCreate(dto); boolean success = nextNodeUserSidsOfCreate.getSuccess(); if (!success) { - return rb.setMsg(nextNodeUserSidsOfCreate.getMsg()); +// return rb.setMsg(nextNodeUserSidsOfCreate.getMsg()); + nextNodeUserSids_ = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); + }else{ + nextNodeUserSids_ = nextNodeUserSidsOfCreate.getData().getUserSid(); + dto.getFormVariables().put(BusinessVariables.ORGPATH, nextNodeUserSidsOfCreate.getData().getOrgPath()); } - nextNodeUserSids_ = nextNodeUserSidsOfCreate.getData().getUserSid(); - dto.getFormVariables().put(BusinessVariables.ORGPATH, nextNodeUserSidsOfCreate.getData().getOrgPath()); + } dto.setNextNodeUserSids(nextNodeUserSids_); ResultBean resultBean1 = flowableService.businessStart(dto); @@ -392,7 +394,7 @@ public class FlowableRest implements FlowableFeign { if (!nextNodeUserSidsOfSubmit.getSuccess()) { // return rb.setMsg("nextUserSid 不能为空！"); //=================================添加系统个管理员自动审批 - nextUserSid = "427a2fb0-60c5-409f-bea4-4eb441041ae6"; + nextUserSid = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); adminContains = true; }else{ nextUserSid = nextNodeUserSidsOfSubmit.getData().getUserSid(); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java index 6dcae95c0e..4d718a082a 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java @@ -15,13 +15,9 @@ import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.StringUtils; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; -import io.swagger.annotations.ApiParam; import org.flowable.engine.TaskService; -import org.flowable.task.api.history.HistoricTaskInstance; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.HashMap; @@ -49,9 +45,6 @@ public class FlowableService extends MybatisBaseService()); bv.getFormVariables().put("businessSid",bv.getBusinessSid()); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java index d56cd4c6f3..8387b6d5c0 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java @@ -7,12 +7,14 @@ package com.yxt.anrui.flowable.biz.flowdefinition; */ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flowcomment.FlowComment; import com.yxt.anrui.flowable.api.flowdefinition.FlowDefinitionVo; import com.yxt.anrui.flowable.api.flowtask.FlowTask; import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo; import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto; import com.yxt.anrui.flowable.api.sysform.SysForm; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.biz.flow.FlowableRest; import com.yxt.anrui.flowable.biz.flow.FlowableService; import com.yxt.anrui.flowable.biz.flowtask.FlowTaskService; @@ -254,6 +256,28 @@ public class FlowDefinitionService extends FlowServiceFactory { processCommentService.saveOrUpdateDto(processCommentDto); } taskService.setAssignee(id_,nextNodeUserSids); + if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(nextNodeUserSids)){ + List list = flowTaskService.getLatestTasks(task.getProcessInstanceId()); + String nodeState = list.get(0).getName_(); + String task_def_key_ = list.get(0).getTask_def_key_(); + BusinessVariables businessVariables = new BusinessVariables(); + businessVariables.setModelId(procDefId); + businessVariables.setInstanceId(task.getProcessInstanceId()); + businessVariables.setTaskId(list.get(0).getId_()); + businessVariables.setUserSid(nextNodeUserSids); + businessVariables.setBusinessSid(variables.get("businessSid").toString()); + businessVariables.setTaskDefKey(task_def_key_); + businessVariables.setFormVariables(variables); + businessVariables.setOrgSidPath(variables.get("createrOrgPath").toString()); + businessVariables.setComment("系统自动跳过！"); + ResultBean updateFlowFieldVoResultBean = flowableRest.handleProsess(businessVariables, false); + ResultBean rb = new ResultBean<>(); + FlowTask flowTask = new FlowTask(); + flowTask.setTaskId(updateFlowFieldVoResultBean.getData().getTaskId()); + flowTask.setTaskName(updateFlowFieldVoResultBean.getData().getNodeState()); + flowTask.setProcInsId(updateFlowFieldVoResultBean.getData().getProcInsId()); + return rb.success().setData(flowTask).setMsg("流程启动成功"); + } ResultBean rb = new ResultBean<>(); FlowTask flowTask = new FlowTask(); flowTask.setTaskId(task.getId()); diff --git a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java index f980867cfd..9d901f8ce4 100644 --- a/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java +++ b/anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java @@ -12,6 +12,7 @@ import com.yxt.anrui.flowable.api.flowcomment.FlowCommentDto; import com.yxt.anrui.flowable.api.flowtask.*; import com.yxt.anrui.flowable.api.sysform.SysForm; import com.yxt.anrui.flowable.api.sysprourl.SysProUrlVo; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; import com.yxt.anrui.flowable.biz.flow.FlowableService; import com.yxt.anrui.flowable.biz.process.ProcessService; import com.yxt.anrui.flowable.biz.sysdeployform.SysDeployFormService; @@ -1342,14 +1343,14 @@ public class FlowTaskService extends MybatisBaseService taskUserInfos = flowTask.getTaskUserInfos(); - TaskUserInfo taskUserInfo = taskUserInfos.get(0); - if(assigneeSid0.equals(taskUserInfo.getAssigneeSid())){ - if(!FlowComment.RECALL.getType().equals( flowTask1.getComment().getType())){ - ii++; - } - continue; - }else{ - ybrsid=flowList.get(i).getTaskUserInfos().get(0).getAssigneeSid(); - break; - } - } - }else{ - ybrsid=assignee; - }*/ ybrsid=assignee; }else{ FlowTask flowTask1 = flowList.get(1); @@ -1558,7 +1540,7 @@ public class FlowTaskService extends MybatisBaseService