出库驳回推送消息补充

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@@ -969,6 +969,15 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             if (businessTaskId.equals(query.getTaskId())) {
                 FlowTaskVo flowTaskVo = new FlowTaskVo();
                 BeanUtil.copyProperties(query, flowTaskVo);
+                Map<String,Object> variables = new HashMap<>();
+                //若app移动端有此功能，则传递appMap参数
+                Map<String, Object> appMap = new HashMap<>();
+                //需和移动端沟通业务sid保存的属性具体值：appMap中sid不是固定的。移动端提供具体字段。
+                appMap.put("outboundSid", query.getBusinessSid());
+                appMap.put("contractId", busDeliveredApply.getContractNo());
+                appMap.put("contract_id", busDeliveredApply.getContractNo());
+                variables.put("app", appMap);
+                flowTaskVo.setValues(variables);
                 ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
                 if (!resultBean.getSuccess()) {
                     return rb.setMsg(resultBean.getMsg());
@@ -976,6 +985,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 baseMapper.updateStateBySid(1, query.getBusinessSid());
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
+
                 updateFlowFiled(map);
                 busDeliveredApply = fetchBySid(query.getBusinessSid());
                 ResultBean<List<LatestTaskVo>> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId());
@@ -987,6 +997,28 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                     //更新该合同的该车架号的状态为1
                     busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1);
                 }
+                //极光推送
+                UpdateFlowFieldVo ufVo = resultBean.getData();
+                busDeliveredApply = fetchBySid(query.getBusinessSid());
+                MessageFlowableQuery messageFlowableQuery = new MessageFlowableQuery();
+                MessageFlowVo messageFlowVo = new MessageFlowVo();
+                BeanUtil.copyProperties(ufVo, messageFlowVo);
+                messageFlowVo.setProcInsId(busDeliveredApply.getProcInstId());
+                messageFlowVo.setProcDefId(busDeliveredApply.getProcDefId());
+                messageFlowableQuery.setUfVo(messageFlowVo);
+                messageFlowableQuery.setAppMap((Map<String, Object>) variables.get("app"));
+                messageFlowableQuery.setBusinessSid(query.getBusinessSid());
+                messageFlowableQuery.setModuleName("出库申请");
+                ResultBean<List<LatestTaskVo>> listResultBean2 = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId());
+                String nextNodeUserSids2 = listResultBean2.getData().get(0).getASSIGNEE_();
+                String nextName2 = listResultBean2.getData().get(0).getName_();
+                if ("发起申请".equals(nextName2)) {
+                    messageFlowableQuery.setMsgContent("您提交的" + messageFlowableQuery.getModuleName() + "已被驳回,请重新提交");
+                } else {
+                    messageFlowableQuery.setMsgContent(busDeliveredApply.getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
+                }
+                messageFlowableQuery.setMsgTitle("出库申请");
+                ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
 
                 return rb.success();
             }