From d1fdbf459753a8e7f95c131cfa892026fb4c68bc Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Fri, 2 Jun 2023 17:18:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E7=94=B3=E8=AF=B7=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BusDeliveredApplyService.java | 56 +++++++++++++++++-- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index 4e0ca008e5..93421df529 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -656,6 +656,7 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); + //若app移动端有此功能，则传递appMap参数 + Map 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); + variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey())); + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); }else{ bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId()); } + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); @@ -1102,6 +1118,21 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); + //若app移动端有此功能，则传递appMap参数 + Map 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); + variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey())); + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); }else{ bv.setModelId(ProcDefEnum.BUSDELIVEREDAPPLY.getProDefId()); } @@ -1136,6 +1167,7 @@ public class BusDeliveredApplyService extends MybatisBaseService map = BeanUtil.beanToMap(resultBean.getData()); //更新业务中的流程相关的参数 updateFlowFiled(map); @@ -1159,6 +1190,7 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + baseMapper.updateStateBySid(1, query.getBusinessSid()); } //极光推送 UpdateFlowFieldVo ufVo = resultBean.getData(); @@ -1208,11 +1240,25 @@ public class BusDeliveredApplyService extends MybatisBaseService variables = new HashMap<>(); + //若app移动端有此功能，则传递appMap参数 + Map 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); + variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey())); + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(busDeliveredApply.getContractNo()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg("操作失败!"); } - baseMapper.updateStateBySid(1, query.getBusinessSid()); updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); busDeliveredApply = fetchBySid(query.getBusinessSid()); ResultBean> listResultBean = flowTaskFeign.getLatestTasks(busDeliveredApply.getProcInstId()); @@ -1223,6 +1269,7 @@ public class BusDeliveredApplyService extends MybatisBaseService vinSidList = busDeliveredApplyDetailsService.selectVinSidByApplySid(query.getBusinessSid()); //更新该合同的该车架号的状态为1 busDeliveredService.updateStateByContractNo(busDeliveredApply.getContractNo(), vinSidList, 1); + baseMapper.updateStateBySid(1, query.getBusinessSid()); } return rb.success().setData(resultBean.getData()); @@ -1836,6 +1883,7 @@ public class BusDeliveredApplyService extends MybatisBaseService