Browse Source

监管流程部分接口

master
dimengzhe 2 years ago
parent
commit
964db9ea8b
  1. 2
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java
  2. 8
      yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java

2
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flow2/FlowRest.java

@ -45,7 +45,7 @@ public class FlowRest implements FlowFeign {
formVariables = formVariables == null ? new HashMap<>() : formVariables; formVariables = formVariables == null ? new HashMap<>() : formVariables;
//发起人的组织全路径 //发起人的组织全路径
String orgPath = bv.getOrgSidPath(); String orgPath = bv.getOrgSidPath();
formVariables.put("createrOrgPath", orgPath); // formVariables.put("createrOrgPath", orgPath);
formVariables.put("businessSid", bv.getBusinessSid()); formVariables.put("businessSid", bv.getBusinessSid());
//获取下一环节待办人 //获取下一环节待办人
if (StringUtils.isBlank(bv.getNextNodeUserSids())) { if (StringUtils.isBlank(bv.getNextNodeUserSids())) {

8
yxt_supervise/supervise-flowable/supervise-flowable-biz/src/main/java/com/yxt/supervise/flowable/biz/flowtask/FlowTaskService.java

@ -549,7 +549,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if(sysUserVoResultBean.getData()!=null){ if(sysUserVoResultBean.getData()!=null){
flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid()); flowTask.setStartUserSid(sysUserVoResultBean.getData().getSid());
flowTask.setStartUserName(sysUserVoResultBean.getData().getName()); flowTask.setStartUserName(sysUserVoResultBean.getData().getName());
String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath",""); /*String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath","");
String ogrName=""; String ogrName="";
if(StringUtils.isNotBlank(createOrgPath)){ if(StringUtils.isNotBlank(createOrgPath)){
List<String> stringList = Arrays.asList(createOrgPath.split("/")); List<String> stringList = Arrays.asList(createOrgPath.split("/"));
@ -567,7 +567,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
} }
}else{ }else{
flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName()); flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
} }*/
} }
ResultBean<SysUserVo> sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid); ResultBean<SysUserVo> sysUserVoResultBean2 = sysUserFeign.fetchBySid(userSid);
flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName()); flowTask.setAssigneeName(sysUserVoResultBean2.getData().getName());
@ -782,7 +782,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask.setEndTime(new Date(end_time_t_l)); flowTask.setEndTime(new Date(end_time_t_l));
} }
flowTask.setProcessVariables(historicTaskInstance.getProcessVariables()); flowTask.setProcessVariables(historicTaskInstance.getProcessVariables());
String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath",""); /* String createOrgPath = ConstantUtils.getString(flowTask.getProcessVariables(),"createrOrgPath","");
String ogrName=""; String ogrName="";
if(StringUtils.isNotBlank(createOrgPath)){ if(StringUtils.isNotBlank(createOrgPath)){
List<String> stringList = Arrays.asList(createOrgPath.split("/")); List<String> stringList = Arrays.asList(createOrgPath.split("/"));
@ -811,7 +811,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}else{ }else{
flowTask.setStartDeptName(""); flowTask.setStartDeptName("");
} }
} }*/
hisTaskList.add(flowTask); hisTaskList.add(flowTask);
} }
page.setTotal(count); page.setTotal(count);

Loading…
Cancel
Save