@ -742,7 +742,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
userName . append ( data . getName ( ) ) . append ( "," ) ;
}
String userName_str = "" ;
userName_str = userName . substring ( 0 , userName . length ( ) - 1 ) ;
if ( StringUtils . isNotBlank ( userName ) ) {
userName_str = userName . substring ( 0 , userName . length ( ) - 1 ) ;
}
flowTask . setAssigneeName ( userName_str ) ;
}
flowTask . setPreviousPersonSid ( histTask . get ( "previousPersonSid" ) = = null ? "" : histTask . get ( "previousPersonSid" ) . toString ( ) ) ;
@ -750,42 +753,22 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
flowTask . setProcDefId ( histTask . get ( "PROC_DEF_ID_" ) = = null ? "" : histTask . get ( "PROC_DEF_ID_" ) . toString ( ) ) ;
flowTask . setTaskDefKey ( histTask . get ( "taskDefKey" ) = = null ? "" : histTask . get ( "taskDefKey" ) . toString ( ) ) ;
flowTask . setTaskName ( histTask . get ( "NAME_" ) = = null ? "" : histTask . get ( "NAME_" ) . toString ( ) ) ;
// 判断是否办结
/ * Object end_act_id_ = histTask . get ( "END_ACT_ID_" ) ;
if ( end_act_id_ ! = null ) {
flowTask . setTaskName ( ProcessStateEnum . FINISHED . getStateName ( ) ) ;
} * /
// 流程定义信息
// ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
// .processDefinitionId(histTask.get("PROC_DEF_ID_").toString())
// .singleResult();
flowTask . setDeployId ( histTask . get ( "DEPLOYMENT_ID_" ) = = null ? "" : histTask . get ( "DEPLOYMENT_ID_" ) . toString ( ) ) ;
flowTask . setProcDefName ( histTask . get ( "PROC_DEF_NAME_" ) = = null ? "" : histTask . get ( "PROC_DEF_NAME_" ) . toString ( ) ) ;
flowTask . setProcDefVersion ( histTask . get ( "PROC_DEF_VERSION_" ) = = null ? 0 : Integer . parseInt ( histTask . get ( "PROC_DEF_VERSION_" ) . toString ( ) ) ) ;
flowTask . setProcInsId ( histTask . get ( "PROC_INST_ID_" ) . toString ( ) ) ;
flowTask . setHisProcInsId ( histTask . get ( "PROC_INST_ID_" ) . toString ( ) ) ;
// 流程发起人信息
// HistoricProcessInstance hi = historyService.createHistoricProcessInstanceQuery()
// .processInstanceId(histTask.get("PROC_INST_ID_").toString())
// .singleResult();
ResultBean < SysUserVo > sysUserVoResultBean = sysUserFeign . fetchBySid ( histTask . get ( "START_USER_ID_" ) . toString ( ) ) ;
if ( ! sysUserVoResultBean . getSuccess ( ) ) {
continue ;
}
flowTask . setStartUserSid ( sysUserVoResultBean . getData ( ) . getSid ( ) ) ;
flowTask . setStartUserName ( sysUserVoResultBean . getData ( ) . getName ( ) ) ;
// ResultBean<SysUserVo> sysUserVoResultBean = sysUserFeign.fetchBySid(historicProcessInstance.getStartUserId());
if ( sysUserVoResultBean . getData ( ) ! = null ) {
flowTask . setStartUserSid ( sysUserVoResultBean . getData ( ) . getSid ( ) ) ;
flowTask . setStartUserName ( sysUserVoResultBean . getData ( ) . getName ( ) ) ;
/ * ResultBean < String > pathSidByUserSid = sysStaffOrgFeign . getPathSidByUserSid ( sysUserVoResultBean . getData ( ) . getSid ( ) ) ;
String ogrName = "" ;
if ( pathSidByUserSid . getData ( ) ! = null ) {
ResultBean < SysOrganizationVo > sysOrganizationVoResultBean = sysOrganizationFeign . fetchBySid ( pathSidByUserSid . getData ( ) ) ;
ogrName = sysOrganizationVoResultBean . getData ( ) . getName ( ) ;
}
flowTask . setStartDeptName ( ogrName + "-" + sysUserVoResultBean . getData ( ) . getOrganizationName ( ) ) ; * /
}
// flowTask.setStartDeptName(sysUserVoResultBean.getData().getOrganizationName());
HistoricTaskInstance historicTaskInstance = historyService . createHistoricTaskInstanceQuery ( ) . includeProcessVariables ( ) . taskId ( flowTask . getTaskId ( ) ) . singleResult ( ) ;
flowTask . setProcessVariables ( historicTaskInstance . getProcessVariables ( ) ) ;
Object end_act_id = histTask . get ( "end_act_id_" ) ;
@ -2101,20 +2084,21 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
if ( o = = null ) {
return rb . setMsg ( "流程设计问题" ) ;
}
String projectSid = dto . getProjectSid ( ) ;
//log.info("getNextNodeUserSidsOfCreate3:{}",JSONObject.toJSONString(o));
return getNextUserSidsNoOrgPath ( rb , o ) ;
return getNextUserSidsNoOrgPath ( rb , o , projectSid ) ;
}
public ResultBean < UserAndOrgPath > getNextUserSidsNoOrgPath ( ResultBean rb , Object o ) {
public ResultBean < UserAndOrgPath > getNextUserSidsNoOrgPath ( ResultBean rb , Object o , String projectSid ) {
UserAndOrgPath mapParam = new UserAndOrgPath ( ) ;
JSONArray jsonArray = JSONArray . parseArray ( JSON . toJSONString ( o ) ) ;
String roleSid = jsonArray . get ( 0 ) . toString ( ) ;
//根据组织架构、角色两个参数取相关符合条件的用户信息
UserQuery userQuery = new UserQuery ( ) ;
userQuery . setRoleSid ( roleSid ) ;
//log.info("getNextUserSids0:{}",JSONObject.toJSONString(userQuery));
List < SysUserVo > sysUserVos = sysUserFeign . getUserByRoleNoOrgPath ( userQuery ) . getData ( ) ;
//log.info("getNextUserSids1:{}",JSONObject.toJSONString(sysUserVos));
userQuery . setProjectSid ( projectSid ) ;
// List<SysUserVo> sysUserVos = sysUserFeign.getUserByRoleNoOrgPath(userQuery).getData();
List < SysUserVo > sysUserVos = sysUserFeign . getUserByRoleAndProject ( userQuery ) . getData ( ) ;
if ( sysUserVos = = null | | sysUserVos . size ( ) < 1 ) {
return rb . fail ( ) . setMsg ( "环节没有用户" ) ;
}
@ -2127,12 +2111,10 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
}
//符合条件的用户的sid,拼接的字符串
String nextNodeUserSids_ = nextNodeUserSids . toString ( ) ;
//log.info("getNextUserSids2:{}",nextNodeUserSids_);
if ( StringUtils . isBlank ( nextNodeUserSids_ ) )
return rb . fail ( ) . setMsg ( "环节没有用户" ) ;
nextNodeUserSids_ = nextNodeUserSids_ . substring ( 0 , nextNodeUserSids_ . length ( ) - 1 ) ;
mapParam . setUserSid ( nextNodeUserSids_ ) ;
//log.info("getNextUserSids3:{}",JSONObject.toJSONString(mapParam));
return rb . success ( ) . setData ( mapParam ) ;
}
}