|
|
|
@ -955,11 +955,20 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa |
|
|
|
|
|
|
|
public ResultBean shareBusVehicleApply(ShareBusVehicleApplyQuery shareQuery) { |
|
|
|
ResultBean rb = ResultBean.fireSuccess(); |
|
|
|
log.info("分享功能，厂家采购参数：{}", JSONObject.toJSONString(shareQuery)); |
|
|
|
//根据业务sid查询业务参数
|
|
|
|
BusVehicleApply busVehicleApply = fetchBySid(shareQuery.getBusinessSid()); |
|
|
|
if(busVehicleApply == null){ |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
//勾选的人员sid
|
|
|
|
List<String> memberSidList = shareQuery.getMembers(); |
|
|
|
//勾选的部门sid
|
|
|
|
List<String> orgSidList = shareQuery.getGroups(); |
|
|
|
ShareUserQuery shareUserQuery = new ShareUserQuery(); |
|
|
|
shareUserQuery.setOrgSids(orgSidList); |
|
|
|
shareUserQuery.setMemberSids(memberSidList); |
|
|
|
//查询所勾选的人员和勾选的部门下的去重后的所有人员的用户sid
|
|
|
|
ResultBean<List<String>> staffList = sysUserFeign.shareSelectUser(shareUserQuery); |
|
|
|
if(memberSidList == null && orgSidList != null && orgSidList.size()>0){ |
|
|
|
if(staffList.getData() == null || staffList.getData().size() == 0){ |
|
|
|
@ -970,43 +979,44 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa |
|
|
|
return rb.setMsg("请选择人员"); |
|
|
|
} |
|
|
|
//组装分享的消息数据
|
|
|
|
//根据业务sid查询业务参数
|
|
|
|
BusVehicleApply busVehicleApply = fetchBySid(shareQuery.getBusinessSid()); |
|
|
|
if(busVehicleApply == null){ |
|
|
|
return rb.setMsg("该申请不存在"); |
|
|
|
} |
|
|
|
String taskId = busVehicleApply.getTaskId(); |
|
|
|
//流程定义id
|
|
|
|
String modelId = busVehicleApply.getProcDefId(); |
|
|
|
//移动端的参数
|
|
|
|
String taskId = busVehicleApply.getTaskId(); |
|
|
|
String nodeState = busVehicleApply.getNodeState(); |
|
|
|
String proInstId = busVehicleApply.getProcInstId(); |
|
|
|
String taskDefKey = busVehicleApply.getNodeId(); |
|
|
|
//移动端参数
|
|
|
|
Map<String, Object> appMap = new HashMap<>(); |
|
|
|
ResultBean<Map<String,Object>> resultBean = flowableFeign.selectFlowVaributes(taskId); |
|
|
|
if(!resultBean.getData().isEmpty()){ |
|
|
|
appMap = (Map<String, Object>)resultBean.getData().get("app"); |
|
|
|
} |
|
|
|
log.info("分享方法-resultBean:{}", JSONObject.toJSONString(resultBean)); |
|
|
|
ShareUserQuery shareUserQuery1 = new ShareUserQuery(); |
|
|
|
shareUserQuery1.setMemberSids(memberSidList); |
|
|
|
shareUserQuery1.setOrgSids(orgSidList); |
|
|
|
ResultBean<List<String>> shareResultBean = sysUserFeign.shareSelectUser(shareUserQuery1); |
|
|
|
log.info("分享方法查询移动端参数-resultBean:{}", JSONObject.toJSONString(resultBean)); |
|
|
|
|
|
|
|
StringBuilder userSids = new StringBuilder(); |
|
|
|
shareResultBean.getData().forEach(f->{ |
|
|
|
staffList.getData().forEach(f->{ |
|
|
|
userSids.append(f).append(","); |
|
|
|
}); |
|
|
|
userSids.deleteCharAt(userSids.length() - 1); |
|
|
|
UpdateFlowFieldVo uff = new UpdateFlowFieldVo(); |
|
|
|
uff.setTaskDefKey(taskDefKey); |
|
|
|
uff.setTaskId(taskId); |
|
|
|
uff.setProcInsId(proInstId); |
|
|
|
uff.setProcDefId(modelId); |
|
|
|
uff.setNodeState(nodeState); |
|
|
|
MessageFlowableQueryForCC mfq = new MessageFlowableQueryForCC(); |
|
|
|
/*MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
MessageFlowVo messageFlowVo = new MessageFlowVo(); |
|
|
|
BeanUtil.copyProperties(uff, messageFlowVo); |
|
|
|
mfq.setUfVo(messageFlowVo);*/ |
|
|
|
mfq.setUfVo(messageFlowVo); |
|
|
|
mfq.setAppMap(appMap); |
|
|
|
mfq.setBusinessSid(busVehicleApply.getSid()); |
|
|
|
mfq.setMsgContent("分享的流程审批，请查看"); |
|
|
|
|
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessageCC(mfq); |
|
|
|
mfq.setUserSid(shareQuery.getUserSid()); |
|
|
|
ResultBean<String> stringResultBean = messageFeign.pushMessageShare(mfq); |
|
|
|
log.info("分享成功-resultBean:{}", resultBean); |
|
|
|
if (!resultBean.getSuccess()) { |
|
|
|
log.info("分享失败，同送消息异常！:{}", JSONObject.toJSONString(stringResultBean)); |
|
|
|
return rb.setMsg("分享失败，同送消息异常！"); |
|
|
|
log.info("分享失败，推送消息异常！:{}", JSONObject.toJSONString(stringResultBean)); |
|
|
|
return rb.setMsg("分享失败，推送消息异常！"); |
|
|
|
} |
|
|
|
return rb.success().setMsg("分享成功！"); |
|
|
|
} |
|
|
|
|
God
2 years ago