From 8abb88f2600b1b81de72979dab124e6657aae7c1 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 10 Jan 2025 11:27:42 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyService.java | 17 ++++- .../ScmSpecialrebateCheckapplyRest.java | 2 +- .../ScmSpecialrebateCheckapplyService.java | 52 +++++++++++++- .../ScmSpecialrebatedistributeRest.java | 2 +- .../ScmSpecialrebatedistributeService.java | 67 +++++++++++++++++-- .../ScmSpecialRebateWithApplyRest.java | 2 +- .../ScmSpecialRebateWithApplyService.java | 53 ++++++++++++++- .../ScmVehrebateCheckapplyRest.java | 2 +- .../ScmVehrebateCheckapplyService.java | 53 ++++++++++++++- .../ScmVehRebateWithApplyRest.java | 2 +- .../ScmVehRebateWithApplyService.java | 54 +++++++++++++-- 11 files changed, 282 insertions(+), 24 deletions(-) diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java index 5173c0a2ee..8548cf0212 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java @@ -902,15 +902,28 @@ public class FinPaymentapplyService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); } - updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); return rb.success().setData(resultBean.getData()); + } else { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 3587982c56..2b8f9def1c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -147,7 +147,7 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl public ResultBean complete(ScmSpecialRebateCheckApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + bv.setModelId(""); return scmSpecialrebateCheckapplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 4f1f8a1684..1474d1ad35 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -38,6 +38,7 @@ import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -371,9 +372,16 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService scmSpecialrebateCheckapplydetailVos = scmSpecialrebateCheckapplydetailService.selByMainSid(dto.getSid()); if (r == 1) { @@ -881,6 +889,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); if (bv.getTaskId().equals(scmSpecialrebateCheckapply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -943,6 +960,15 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -1017,7 +1043,17 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(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()); @@ -1029,7 +1065,17 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); 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()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java index 5e2bd785ba..df0a16e028 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeRest.java @@ -106,7 +106,7 @@ public class ScmSpecialrebatedistributeRest implements ScmSpecialrebatedistribut public ResultBean complete(ScmSpecialRebatedistributeCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + bv.setModelId(""); return scmSpecialrebatedistributeService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java index db1a26e60c..2f02309c05 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatedistribute/ScmSpecialrebatedistributeService.java @@ -31,6 +31,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.common.utils.Rule; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -53,6 +54,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatedistribute.flow.SubmitScmSpecialReb import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetail; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailDto; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatedistributedetail.ScmSpecialrebatedistributedetailService; import com.yxt.anrui.scm.biz.scmspecialrebatevehs.ScmSpecialrebateVehsService; @@ -332,9 +334,16 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService voResultBean = flowableFeign.startProcess(bv); UpdateFlowFieldVo ufVo = voResultBean.getData(); @@ -391,6 +400,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); if (bv.getTaskId().equals(scmSpecialrebatedistribute.getTaskId())) { ResultBean resultBean = flowableFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -441,6 +459,15 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebatedistribute.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -465,7 +492,7 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); @@ -475,6 +502,18 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + scmSpecialRebateService.updateState(query.getBusinessSid(), 4); + return rb.success().setData(resultBean.getData()); + } } } return rb.setMsg("操作失败!提交的数据不一致!"); @@ -488,7 +527,17 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebatedistribute.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebatedistribute.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(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()); @@ -500,7 +549,17 @@ public class ScmSpecialrebatedistributeService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATECHEDISTRIBUTE.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialrebatedistribute scmSpecialrebatedistribute = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialrebatedistribute.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialrebatedistribute.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialrebatedistribute.getTitle()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); 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()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java index c9cd67f7c6..26d651a1c9 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java @@ -121,7 +121,7 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF public ResultBean complete(ScmSpecialRebateWithApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + bv.setModelId(""); return scmSpecialRebateWithApplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java index 4a7635caeb..fa4771966d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java @@ -38,6 +38,7 @@ import com.yxt.anrui.base.common.utils.Rule; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -63,6 +64,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailssVo; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; @@ -366,9 +368,16 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService scmSpecialRebateWiths = dto.getScmSpecialRebateWiths(); for (ScmSpecialRebateWithDto scmSpecialRebateWith : scmSpecialRebateWiths) { @@ -555,6 +564,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); List specialRebateSids = scmSpecialRebateWithService.fetchSpecialReBateSidByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(scmSpecialRebateWithApply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); @@ -610,6 +628,15 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -676,7 +703,17 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(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()); @@ -688,7 +725,17 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMSPECIALREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmSpecialRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmSpecialRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmSpecialRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); 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()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index f9ebf1209f..f370b539e5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -157,7 +157,7 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { public ResultBean complete(ScmVehRebateCheckApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId()); + bv.setModelId(""); return scmVehrebateCheckapplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index 46e3b61a83..e4b64902a5 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -42,6 +42,7 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -67,6 +68,7 @@ import com.yxt.anrui.scm.api.scmvehrebatecheckapply.flow.SubmitScmVehRebateCheck import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApply; import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; @@ -389,9 +391,16 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService scmVehrebateCheckapplydetailVos = scmVehrebateCheckapplydetailService.selByMainSid(dto.getSid()); if (r == 1) { @@ -459,6 +468,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); if (bv.getTaskId().equals(scmVehrebateCheckapply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); if (!resultBean.getSuccess()) { @@ -856,6 +874,15 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -931,7 +958,17 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(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()); @@ -943,7 +980,17 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATECHECKAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehrebateCheckapply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehrebateCheckapply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehrebateCheckapply.getCheckApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); 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()); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java index 8e64c65242..6091f64996 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java @@ -120,7 +120,7 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign { public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) { BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(dto, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + bv.setModelId(""); return scmVehRebateWithApplyService.complete(bv); } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index 34844f33cf..b68e6fc05a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -38,10 +38,12 @@ import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusOrderAndVehInfo; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTemp; import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign; +import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign; import com.yxt.anrui.fin.api.kingdee.costadjustmentsbill.CostAdjustmentsBill; import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher; +import com.yxt.anrui.flowable.api.flow.FlowProcessMapQuery; import com.yxt.anrui.flowable.api.flow.FlowableFeign; import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery; @@ -371,9 +373,16 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService scmVehRebateWiths = dto.getScmVehRebateWiths(); for (ScmVehRebateWithDto scmVehRebateWith : scmVehRebateWiths) { @@ -632,6 +641,15 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(bv.getModelId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); List vehRebateSids = scmVehRebateWithService.fetchVehReBateSidByMainSid(bv.getBusinessSid()); if (bv.getTaskId().equals(scmVehRebateWithApply.getTaskId())) { ResultBean resultBean = flowFeign.handleProsess(bv); @@ -646,7 +664,6 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService variables = new HashMap<>(); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + //======================================= + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); @@ -755,7 +781,17 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(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()); @@ -767,7 +803,17 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SCMVEHREBATEWITHAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(bv.getBusinessSid()); + bv.setModelId(scmVehRebateWithApply.getProcDefId()); + //======================================== + FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery(); + flowProcessMapQuery.setProDefKey(scmVehRebateWithApply.getProcDefId()); + flowProcessMapQuery.setVariables(variables); + flowProcessMapQuery.setContractNo(scmVehRebateWithApply.getWithApply()); + variables = flowableFeign.getMap(flowProcessMapQuery).getData(); + bv.setFormVariables(variables); 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());