yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
dimengzhe 2 years ago
parent
3c76310875
commit
ebecfa1186
8 changed files with 53 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 11
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  2. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  3. 14
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
  4. 7
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
  5. 24
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java
  6. 26
      anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
  7. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
  8. 3
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java

11
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -4615,7 +4615,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
return rb.setMsg("当前所在的组织机构不存在");
}
if (StringUtils.isBlank(sysOrganization.getManagerSid())) {
return rb.setMsg("当前所在的组织机构未设置主管人员");
// return rb.setMsg("当前所在的组织机构未设置主管人员");
sysOrganization.setManagerSid(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId());
}
int r = submitBusinessData(dto, busSalesOrder.get());
@ -5810,7 +5811,13 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
for (AppBusSalesOrderVo record : pagging.getRecords()) {
List<String> 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())) {

2
anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
View File

@ -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"),

14
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableRest.java
View File

@ -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<UserAndOrgPath> 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();

7
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flow/FlowableService.java
View File

@ -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<FlowableMapper, Flowable
if (StringUtils.isBlank(bv.getBusinessSid())) {
return ResultBean.fireFail().setMsg("businessSid 不能为空！");
}
/*if(bv.getFormVariables()==null){
return ResultBean.fireFail().setMsg("业务参数集合 不能为空！");
}*/
if(bv.getFormVariables()==null)
bv.setFormVariables(new HashMap<String, Object>());
bv.getFormVariables().put("businessSid",bv.getBusinessSid());

24
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowdefinition/FlowDefinitionService.java
View File

@ -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<LatestTaskVo> 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<UpdateFlowFieldVo> updateFlowFieldVoResultBean = flowableRest.handleProsess(businessVariables, false);
ResultBean<FlowTask> 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<FlowTask> rb = new ResultBean<>();
FlowTask flowTask = new FlowTask();
flowTask.setTaskId(task.getId());

26
anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java
View File

@ -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<FlowTaskMapper, FlowTask
flowTaskVo.setTargetKey(item.getId());
listResultBean_2= taskReject_(flowTaskVo, true);
}else{
if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(assignee_)){
if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(assignee_)){
flowTaskVo.setUserId(flowTaskVo.getUserSid());
flowTaskVo.setTaskId(id_);
flowTaskVo.setUserSid(assignee_);
flowTaskVo.setTargetKey(item.getId());
listResultBean_2= taskReject_(flowTaskVo, true);
}else{
if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(flowTaskVo.getUserSid()) && assignee_.equals(flowTaskVo.getUserId())){
if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(flowTaskVo.getUserSid()) && assignee_.equals(flowTaskVo.getUserId())){
flowTaskVo.setTaskId(id_);
flowTaskVo.setUserSid(assignee_);
flowTaskVo.setTargetKey(item.getId());
@ -1505,25 +1506,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
String assigneeSid0 = taskUserInfo_0.getAssigneeSid();
if(!assigneeSid1.equals(assigneeSid0)){
/*if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(assignee)){
FlowTask flowTask1 = flowList.get(1);
for(int i=1;i<flowList.size();i++){
FlowTask flowTask = flowList.get(i);
List<TaskUserInfo> 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<FlowTaskMapper, FlowTask
}
public HistoricTaskInstance returnInstance(HistoricTaskInstance historicTaskInstance1){
if("427a2fb0-60c5-409f-bea4-4eb441041ae6".equals(historicTaskInstance1.getAssignee())){
if(ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId().equals(historicTaskInstance1.getAssignee())){
String taskId = getTaskId(historicTaskInstance1.getTaskDefinitionKey(), historicTaskInstance1.getProcessInstanceId(), historicTaskInstance1.getProcessDefinitionId());
historicTaskInstance1 = historyService.createHistoricTaskInstanceQuery().taskId(taskId).singleResult();
return returnInstance(historicTaskInstance1);

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDetailsVo.java
View File

@ -179,4 +179,7 @@ public class AppSolutionsDetailsVo implements Vo {
private String gcPrice;
@ApiModelProperty("上装成交价")
private String szPrice;
@ApiModelProperty("实际首付比例")
private String downPayAmountsRatio;
}

3
anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/solutions/AppSolutionsDto.java
View File

@ -143,4 +143,7 @@ public class AppSolutionsDto implements Dto {
private String vehTotalPrice;
@ApiModelProperty("名义留购价")
private String nominalPrice;
@ApiModelProperty("实际首付比例")
private String downPayAmountsRatio;
}

Write Preview
Loading…
Cancel
Save