yxk-20260521-已办、抄送、历史任务列表,getHisProcessNodeInfo接口增加businessId和businessTableName字段
This commit is contained in:
+26
@@ -46,6 +46,11 @@ import java.util.stream.Stream;
|
|||||||
@RequestMapping("/act/process/extActProcessNode")
|
@RequestMapping("/act/process/extActProcessNode")
|
||||||
@Slf4j
|
@Slf4j
|
||||||
public class ExtActProcessNodeController {
|
public class ExtActProcessNodeController {
|
||||||
|
private static final String BUSINESS_ID = "business_id";
|
||||||
|
private static final String BUSINESS_TABLE_NAME = "business_tablename";
|
||||||
|
private static final String BUSINESS_ID_CAMEL = "businessId";
|
||||||
|
private static final String BUSINESS_TABLE_NAME_CAMEL = "businessTablename";
|
||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
private IExtActProcessNodeService extActProcessNodeService;
|
private IExtActProcessNodeService extActProcessNodeService;
|
||||||
@Autowired
|
@Autowired
|
||||||
@@ -359,9 +364,20 @@ public class ExtActProcessNodeController {
|
|||||||
String formUrlMobile = activitiService.getHisVarinst(WorkFlowGlobals.BPM_FORM_CONTENT_URL_MOBILE,procInstId);
|
String formUrlMobile = activitiService.getHisVarinst(WorkFlowGlobals.BPM_FORM_CONTENT_URL_MOBILE,procInstId);
|
||||||
String dataId = activitiService.getHisVarinst(WorkFlowGlobals.BPM_DATA_ID,procInstId);
|
String dataId = activitiService.getHisVarinst(WorkFlowGlobals.BPM_DATA_ID,procInstId);
|
||||||
String tableName = activitiService.getHisVarinst(WorkFlowGlobals.BPM_FORM_KEY,procInstId);
|
String tableName = activitiService.getHisVarinst(WorkFlowGlobals.BPM_FORM_KEY,procInstId);
|
||||||
|
// 历史/抄送查看需要真实业务表数据,补齐发起流程时写入的业务ID和业务表名变量。
|
||||||
|
String businessId = getHisVarinstByNames(procInstId, BUSINESS_ID, BUSINESS_ID_CAMEL);
|
||||||
|
String businessTableName = getHisVarinstByNames(procInstId, BUSINESS_TABLE_NAME, BUSINESS_TABLE_NAME_CAMEL);
|
||||||
Map<String,Object> variablesMap = new HashMap<String,Object>();
|
Map<String,Object> variablesMap = new HashMap<String,Object>();
|
||||||
variablesMap.put(WorkFlowGlobals.BPM_DATA_ID, dataId);
|
variablesMap.put(WorkFlowGlobals.BPM_DATA_ID, dataId);
|
||||||
variablesMap.put(WorkFlowGlobals.BPM_FORM_KEY, tableName);
|
variablesMap.put(WorkFlowGlobals.BPM_FORM_KEY, tableName);
|
||||||
|
if (oConvertUtils.isNotEmpty(businessId)) {
|
||||||
|
variablesMap.put(BUSINESS_ID, businessId);
|
||||||
|
variablesMap.put(BUSINESS_ID_CAMEL, businessId);
|
||||||
|
}
|
||||||
|
if (oConvertUtils.isNotEmpty(businessTableName)) {
|
||||||
|
variablesMap.put(BUSINESS_TABLE_NAME, businessTableName);
|
||||||
|
variablesMap.put(BUSINESS_TABLE_NAME_CAMEL, businessTableName);
|
||||||
|
}
|
||||||
Map<String,Object> map = new HashMap<String,Object>();
|
Map<String,Object> map = new HashMap<String,Object>();
|
||||||
map.put("formUrl", formUrl);
|
map.put("formUrl", formUrl);
|
||||||
map.put("formUrlMobile", formUrlMobile);
|
map.put("formUrlMobile", formUrlMobile);
|
||||||
@@ -376,6 +392,16 @@ public class ExtActProcessNodeController {
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private String getHisVarinstByNames(String procInstId, String... varNames) {
|
||||||
|
for (String varName : varNames) {
|
||||||
|
String value = activitiService.getHisVarinst(varName, procInstId);
|
||||||
|
if (oConvertUtils.isNotEmpty(value)) {
|
||||||
|
return value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据流程编码和业务key查询任务节点信息,查询我的待办任务
|
* 根据流程编码和业务key查询任务节点信息,查询我的待办任务
|
||||||
|
|||||||
Reference in New Issue
Block a user