|
|
|
@ -2097,18 +2097,24 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr |
|
|
|
UserRoleQuery userRoleQuery = new UserRoleQuery(); |
|
|
|
userRoleQuery.setRoleSid(candidateGroups.get(0)); |
|
|
|
List<SysUserVo> sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); |
|
|
|
StringBuilder nextNodeUserSids = new StringBuilder(); |
|
|
|
sysUserVos.removeAll(Collections.singleton(null)); |
|
|
|
String nextNodeUserSids = ""; |
|
|
|
if(sysUserVos.size()>0){ |
|
|
|
nextNodeUserSids = String.join(",",sysUserVos.stream().map(v->v.getSid()).collect(Collectors.toList())); |
|
|
|
} |
|
|
|
/* StringBuilder nextNodeUserSids = new StringBuilder(); |
|
|
|
if (sysUserVos.size() > 0) { |
|
|
|
for (SysUserVo sysUserVo : sysUserVos) { |
|
|
|
String sid = sysUserVo.getSid(); |
|
|
|
nextNodeUserSids.append(sid).append(","); |
|
|
|
} |
|
|
|
} |
|
|
|
}*/ |
|
|
|
if (StringUtils.isBlank(nextNodeUserSids)) { |
|
|
|
return rb.setMsg("下一环节暂无操作人员"); |
|
|
|
// return rb.setMsg("下一环节暂无操作人员");
|
|
|
|
nextNodeUserSids = ProcDefEnum.DEFAUL_TADMIN_SID.getProDefId(); |
|
|
|
} |
|
|
|
String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); |
|
|
|
bv.setNextNodeUserSids(substring); |
|
|
|
// String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(","));
|
|
|
|
bv.setNextNodeUserSids(nextNodeUserSids); |
|
|
|
if (bv.getTaskId().equals(busArrearsCarryVehicleApply.getTaskId())) { |
|
|
|
ResultBean<UpdateFlowFieldVo> resultBean1 = flowableFeign.handleProsess(bv); |
|
|
|
if (!resultBean1.getSuccess()) { |
|
|
|
@ -2116,21 +2122,33 @@ public class BusArrearsCarryVehicleApplyService extends MybatisBaseService<BusAr |
|
|
|
} |
|
|
|
UpdateFlowFieldVo ufVos = resultBean1.getData(); |
|
|
|
updateFlowFiled(BeanUtil.beanToMap(resultBean1.getData())); |
|
|
|
busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid()); |
|
|
|
if (!"Event_end".equals(ufVos.getTaskDefKey())) { |
|
|
|
try { |
|
|
|
ThreadFactory namedThreadFactory = new ThreadFactoryBuilder() |
|
|
|
.setNameFormat("demo-pool-%d").build(); |
|
|
|
ExecutorService pool = new ThreadPoolExecutor(2, 100, |
|
|
|
0L, TimeUnit.MILLISECONDS, |
|
|
|
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy()); |
|
|
|
BusArrearsCarryVehicleApply finalBusArrearsCarryVehicleApply1 = busArrearsCarryVehicleApply; |
|
|
|
Future future1 = pool.submit(() -> { |
|
|
|
//极光推送
|
|
|
|
busArrearsCarryVehicleApply = fetchBySid(bv.getBusinessSid()); |
|
|
|
ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId()); |
|
|
|
ufVos.setProcInsId(finalBusArrearsCarryVehicleApply1.getProcInstId()); |
|
|
|
MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(ufVos, messageFlowVo); |
|
|
|
ufVos.setProcInsId(busArrearsCarryVehicleApply.getProcInstId()); |
|
|
|
ufVos.setProcInsId(finalBusArrearsCarryVehicleApply1.getProcInstId()); |
|
|
|
messageFlowableQuery.setUfVo(messageFlowVo); |
|
|
|
messageFlowableQuery.setAppMap(appMap); |
|
|
|
messageFlowableQuery.setBusinessSid(bv.getBusinessSid()); |
|
|
|
messageFlowableQuery.setModuleName("欠款提车申请"); |
|
|
|
messageFlowableQuery.setMsgContent(busArrearsCarryVehicleApply.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgContent(finalBusArrearsCarryVehicleApply1.getApplyName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批"); |
|
|
|
messageFlowableQuery.setMsgTitle("欠款提车申请"); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery); |
|
|
|
}); |
|
|
|
} catch (Exception e) { |
|
|
|
e.printStackTrace(); |
|
|
|
} |
|
|
|
} else { |
|
|
|
List<BusArrearsCarryVehicleDetails> carList = busArrearsCarryVehicleDetailsService.selectDetailsByApplySid(bv.getBusinessSid()); |
|
|
|
for (BusArrearsCarryVehicleDetails adCarListDto : carList) { |
|
|
|
|
dimengzhe
2 years ago