From 106f5303a5b4474f23cfa54cdbdfb064539644f1 Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Tue, 24 Sep 2024 09:43:59 +0800 Subject: [PATCH] 1 --- .../anrui/flowable/api/utils/ProcDefEnum.java | 2 +- .../AsArrearsoutApplyService.java | 39 +++++++++++++++-- .../AsBusclaimCheckApplyService.java | 35 +++++++++++++++ .../AsBusclaimInvoiceBillService.java | 36 +++++++++++++++- .../AsBusrepairBillReverseSettleService.java | 41 +++++++++++++++++- .../asbwdiffapply/AsBwdiffapplyService.java | 33 ++++++++++++++ .../AsBwinvoiceapplyService.java | 35 +++++++++++++++ .../AsHoseSuppApplyService.java | 34 +++++++++++++++ .../AsTechTitleApplyService.java | 35 +++++++++++++++ .../as/feign/flowable/flow/ProcDefEnum.java | 24 ++++++----- .../portal/sysuserrole/SysUserRoleFeign.java | 22 ++++++++++ .../PmsPurchasebackBillService.java | 39 +++++++++++++++-- .../PmsPurchaseBillService.java | 43 ++++++++++++++++--- .../flowable/flow/FlowProcessMapQuery.java | 7 --- .../pms/feign/flowable/flow/ProcDefEnum.java | 4 +- .../portal/sysuserrole/SysUserRoleFeign.java | 21 +++++++++ .../SmsPricestrategyBillService.java | 39 ++++++++++++++++- .../smssalesreturn/SmsSalesReturnService.java | 40 ++++++++++++++++- .../sms/feign/flowable/flow/ProcDefEnum.java | 4 +- .../portal/sysuserrole/SysUserRoleFeign.java | 22 ++++++++++ .../wmsinventory/WmsInventoryMapper.xml | 4 +- .../WmsInventoryCheckbillService.java | 35 +++++++++++++++ .../WmsInventoryProfitinService.java | 34 +++++++++++++++ .../WmsInventoryProfitoutService.java | 34 +++++++++++++++ .../wms/feign/flowable/flow/ProcDefEnum.java | 9 ++-- .../portal/sysuserrole/SysUserRoleFeign.java | 22 ++++++++++ 26 files changed, 646 insertions(+), 47 deletions(-) create mode 100644 yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuserrole/SysUserRoleFeign.java create mode 100644 yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysuserrole/SysUserRoleFeign.java create mode 100644 yxt-sms-biz/src/main/java/com/yxt/sms/feign/portal/sysuserrole/SysUserRoleFeign.java create mode 100644 yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index d78af0f31d..332350d68e 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -82,7 +82,7 @@ public enum ProcDefEnum { LOANCASECLOSEAPPLY("案件结案申请", "process_llaxpwkd:1:8220008"), LOANLAWSUITAPPLY("诉讼申请", "process_xc4lp97d:1:8380004"), LOANCASEENTRUSTLAWYERAPPLY("案件委托律师", "process_oe3nvzgn:1:8525004"), - ENTERPRISEAPPLY("定点企业备案", ""), + ENTERPRISEAPPLY("定点企业备案", "process_tvywp9ri:2:14197516"), /******************************测试流程id*********************************************/ diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java index 8b7c0ea98e..8e63d63cfe 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asarrearsoutapply/AsArrearsoutApplyService.java @@ -53,6 +53,7 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -89,7 +90,7 @@ public class AsArrearsoutApplyService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //流程定义id bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId()); bv.setFormVariables(variables); @@ -357,6 +362,10 @@ public class AsArrearsoutApplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asArrearsoutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -408,7 +417,17 @@ public class AsArrearsoutApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + AsArrearsoutApply asArrearsoutApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asArrearsoutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + bv.setModelId(asArrearsoutApply.getProcDefId()); + 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), AsArrearsoutApplyNodeVo.class)).collect(Collectors.toList()); @@ -419,7 +438,17 @@ public class AsArrearsoutApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.ASARREARSOUTAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + AsArrearsoutApply asArrearsoutApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asArrearsoutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + bv.setModelId(asArrearsoutApply.getProcDefId()); + 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), AsArrearsoutApplyNodeVo.class)).collect(Collectors.toList()); @@ -448,6 +477,10 @@ public class AsArrearsoutApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asArrearsoutApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java index 875b5ab54c..e286975863 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaimcheckapply/AsBusclaimCheckApplyService.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill; import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckVo; import com.yxt.anrui.as.api.asbusclaimcheckapply.*; @@ -36,6 +37,7 @@ import com.yxt.anrui.as.feign.portal.privilege.PrivilegeQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -82,6 +84,8 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService listPage(PagerQuery pagerQuery) { @@ -317,6 +321,10 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBusclaimCheckApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimCheckApply.getDeptSid()).getData(); if (sysOrganization != null) { @@ -407,6 +415,10 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asBusclaimCheckApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -453,8 +465,17 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBusclaimCheckApply asBusclaimCheckApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBusclaimCheckApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBusclaimCheckApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusclaimCheckApplyNodeVo.class)).collect(Collectors.toList()); @@ -465,8 +486,17 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBusclaimCheckApply asBusclaimCheckApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBusclaimCheckApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBusclaimCheckApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusclaimCheckApplyNodeVo.class)).collect(Collectors.toList()); @@ -495,6 +525,11 @@ public class AsBusclaimCheckApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBusclaimCheckApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java index 3a19536ef6..7040fe4fd3 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusclaiminvoicebill/AsBusclaimInvoiceBillService.java @@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; import com.yxt.anrui.as.api.asbusclaimbill.AsBusclaimBill; import com.yxt.anrui.as.api.asbusclaimcheck.AsBusclaimCheckDto; import com.yxt.anrui.as.api.asbusclaiminvoicebill.*; @@ -34,6 +35,7 @@ import com.yxt.anrui.as.feign.message.MessageFlowVo; import com.yxt.anrui.as.feign.message.MessageFlowableQuery; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -88,7 +90,8 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBusclaimInvoiceBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBusclaimInvoiceBill.getDeptSid()).getData(); if (sysOrganization != null) { @@ -357,6 +364,10 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asBusclaimInvoiceBill.getCreateBySid(); + List list1 = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list1.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -421,8 +432,17 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBusclaimInvoiceBill asBusclaimInvoiceBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBusclaimInvoiceBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBusclaimInvoiceBill.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusclaimInvoiceNodeVo.class)).collect(Collectors.toList()); @@ -433,8 +453,17 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBusclaimInvoiceBill asBusclaimInvoiceBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBusclaimInvoiceBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBusclaimInvoiceBill.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BusclaimInvoiceNodeVo.class)).collect(Collectors.toList()); @@ -463,6 +492,11 @@ public class AsBusclaimInvoiceBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBusclaimInvoiceBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java index 00e7a6eae5..51285344d1 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbillreversesettle/AsBusrepairBillReverseSettleService.java @@ -36,6 +36,7 @@ import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleDelegateQuery; import com.yxt.anrui.as.api.asbillsettelapply.flow.app.AppSettleTaskQuery; import com.yxt.anrui.as.api.asbillsettelapply.flow.app.CompleteSettleDto; import com.yxt.anrui.as.api.asbillsettelapply.flow.app.SettleFlowableQuery; +import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApply; import com.yxt.anrui.as.api.asbusrepairbill.*; import com.yxt.anrui.as.api.asbusrepairbillnode.AsBusrepairBillNode; import com.yxt.anrui.as.api.asbusrepairbillreversesettle.*; @@ -61,6 +62,7 @@ import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrg; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserVo; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -107,6 +109,9 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService createQueryWrapper(AsBusrepairBillReverseSettleQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -499,6 +504,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //流程定义id bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId()); bv.setFormVariables(variables); @@ -565,6 +574,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = reverseSettle.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -635,7 +648,17 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + AsBusrepairBillReverseSettle asBusrepairBillReverseSettle = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBusrepairBillReverseSettle.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + bv.setModelId(asBusrepairBillReverseSettle.getProcDefId()); + 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), ReverseSettleNodeVo.class)).collect(Collectors.toList()); @@ -646,7 +669,17 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.REVERSESETTLEAPPLY.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + AsBusrepairBillReverseSettle asBusrepairBillReverseSettle = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBusrepairBillReverseSettle.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + bv.setModelId(asBusrepairBillReverseSettle.getProcDefId()); + 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), ReverseSettleNodeVo.class)).collect(Collectors.toList()); @@ -675,6 +708,10 @@ public class AsBusrepairBillReverseSettleService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = reverseSettle.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java index fda184edbd..fc55350977 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwdiffapply/AsBwdiffapplyService.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.as.api.asappendix.AsAppendix; +import com.yxt.anrui.as.api.asarrearsoutapply.AsArrearsoutApply; import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApply; import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*; import com.yxt.anrui.as.api.asbwdiffapply.*; @@ -60,6 +61,7 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -112,6 +114,8 @@ public class AsBwdiffapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsBwdiffapplyQuery query = pq.getParams(); @@ -337,6 +341,10 @@ public class AsBwdiffapplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBwdiffapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBwdiffapply.getDeptSid()).getData(); if (sysOrganization != null) { @@ -427,6 +435,10 @@ public class AsBwdiffapplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asBwdiffapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -471,8 +483,17 @@ public class AsBwdiffapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBwdiffapply asBwdiffapply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBwdiffapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBwdiffapply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BwdiffApplyNodeVo.class)).collect(Collectors.toList()); @@ -483,7 +504,14 @@ public class AsBwdiffapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBwdiffapply asBwdiffapply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBwdiffapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBwdiffapply.getProcDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo @@ -513,6 +541,11 @@ public class AsBwdiffapplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBwdiffapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyService.java index d78beaa7f6..673eaa5e76 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbwinvoiceapply/AsBwinvoiceapplyService.java @@ -34,6 +34,7 @@ import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.as.api.asappendix.AsAppendix; import com.yxt.anrui.as.api.asbusclaimcheckapply.AsBusclaimCheckApply; import com.yxt.anrui.as.api.asbusclaimcheckapply.flowable.*; +import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapply; import com.yxt.anrui.as.api.asbwinvoiceapply.*; import com.yxt.anrui.as.api.asbwinvoiceapply.flowable.*; import com.yxt.anrui.as.api.asbwinvoiceapplydetail.AsBwinvoiceapplyDetailDetailsVo; @@ -59,6 +60,7 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -111,6 +113,8 @@ public class AsBwinvoiceapplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsBwinvoiceapplyQuery query = pq.getParams(); @@ -324,6 +328,10 @@ public class AsBwinvoiceapplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBwinvoiceapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asBwinvoiceapply.getDeptSid()).getData(); if (sysOrganization != null) { @@ -414,6 +422,10 @@ public class AsBwinvoiceapplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asBwinvoiceapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -458,8 +470,17 @@ public class AsBwinvoiceapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBwinvoiceapply asBwinvoiceapply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBwinvoiceapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBwinvoiceapply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BwinvoiceApplyNodeVo.class)).collect(Collectors.toList()); @@ -470,8 +491,17 @@ public class AsBwinvoiceapplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsBwinvoiceapply asBwinvoiceapply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asBwinvoiceapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asBwinvoiceapply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), BwinvoiceApplyNodeVo.class)).collect(Collectors.toList()); @@ -500,6 +530,11 @@ public class AsBwinvoiceapplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asBwinvoiceapply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyService.java index c1035ad311..b6fb0d00b4 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/ashosesuppapply/AsHoseSuppApplyService.java @@ -61,6 +61,7 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -118,6 +119,8 @@ public class AsHoseSuppApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsHoseSuppApplyQuery query = pq.getParams(); @@ -303,6 +306,10 @@ public class AsHoseSuppApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asHoseSuppApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asHoseSuppApply.getDeptSid()).getData(); if (sysOrganization != null) { @@ -393,6 +400,10 @@ public class AsHoseSuppApplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asHoseSuppApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -437,8 +448,17 @@ public class AsHoseSuppApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsHoseSuppApply asHoseSuppApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asHoseSuppApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asHoseSuppApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), HoseSuppApplyNodeVo.class)).collect(Collectors.toList()); @@ -449,8 +469,17 @@ public class AsHoseSuppApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsHoseSuppApply asHoseSuppApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asHoseSuppApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asHoseSuppApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), HoseSuppApplyNodeVo.class)).collect(Collectors.toList()); @@ -479,6 +508,11 @@ public class AsHoseSuppApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asHoseSuppApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java index 87b1bf5400..10ce542761 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/astechtitleapply/AsTechTitleApplyService.java @@ -32,6 +32,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.google.common.util.concurrent.ThreadFactoryBuilder; import com.yxt.anrui.as.api.asappendix.AsAppendix; +import com.yxt.anrui.as.api.asbwdiffapply.AsBwdiffapply; import com.yxt.anrui.as.api.astechtitle.AsTechTitle; import com.yxt.anrui.as.api.astechtitleapply.*; import com.yxt.anrui.as.api.astechtitleapply.flowable.*; @@ -60,6 +61,7 @@ import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.anrui.as.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.anrui.as.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.as.feign.portal.sysuser.SysUserFeign; +import com.yxt.anrui.as.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.core.result.ResultBean; import org.apache.commons.lang3.StringUtils; @@ -114,6 +116,8 @@ public class AsTechTitleApplyService extends MybatisBaseService listPageVo(PagerQuery pq) { AsTechTitleApplyQuery query = pq.getParams(); @@ -342,6 +346,10 @@ public class AsTechTitleApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asTechTitleApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(asTechTitleApply.getDeptSid()).getData(); if (sysOrganization != null) { @@ -437,6 +445,10 @@ public class AsTechTitleApplyService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为前台主管 + String createBySid = asTechTitleApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -485,8 +497,17 @@ public class AsTechTitleApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsTechTitleApply asTechTitleApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asTechTitleApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asTechTitleApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), TechTitleApplyNodeVo.class)).collect(Collectors.toList()); @@ -497,8 +518,17 @@ public class AsTechTitleApplyService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 AsTechTitleApply asTechTitleApply = fetchBySid(query.getBusinessSid()); + //判断发起人是否为前台主管 + String createBySid = asTechTitleApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); bv.setModelId(asTechTitleApply.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), TechTitleApplyNodeVo.class)).collect(Collectors.toList()); @@ -527,6 +557,11 @@ public class AsTechTitleApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为前台主管 + String createBySid = asTechTitleApply.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("f00a7338-a6a4-4712-ab85-ca211d56fb1f")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java index 70e88bb4d7..31827cbf4d 100644 --- a/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/flowable/flow/ProcDefEnum.java @@ -7,17 +7,19 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - ASARREARSOUTAPPLY("欠款出厂申请", "process_u14c671d:1:10442504"), - ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_6de5c2r8:1:10640004"), - ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_sshks74p:1:10887504"), - REVERSESETTLEAPPLY("工单反结算申请", "process_g3r02po8:1:10975004"), - ASBUSCLAIMINVOICEBILL("索赔单开票申请", "process_33p7rz6h:1:11297504"), - ASBUSCLAIMCHECKAPPLY("索赔单调整申请", "process_7icw4lhq:1:11310004"), - ASBWDIFFAPPLY("工单应收调差申请", "process_zcxxb6de:1:12097508"), - ASBWINVOICEAPPLY("工单开票申请", "process_j8zlnkl1:1:12097504"), - ASTECHTITLEAPPLY("维修技师职称备案申请", ""), - BILLSETTLEAPPLY("结算申请", "process_g3r02po8:1:10975004"), - ASHOSESUPPAPPLY("工时提成抵顶配件费用申请", ""), + ASARREARSOUTAPPLY("欠款出厂申请", "process_d0eyl7ep:2:14197520"), + ASOLDPARTRETURNAPPLY("旧件返厂申请", "process_9ijbdmdb:1:14177556"), + ASOLDPARTHANDLEAPPLY("旧件处理申请", "process_hxr0wezs:1:14177560"), + REVERSESETTLEAPPLY("工单反结算申请", "process_g3r02po8:3:14197552"), + ASBUSCLAIMINVOICEBILL("索赔单开票申请", "process_czty2ysj:2:14197524"), + ASBUSCLAIMCHECKAPPLY("索赔单调整申请", "process_i6ln3qcd:2:14197528"), + ASBWDIFFAPPLY("工单应收调差申请", "process_b1thoh6n:2:14197532"), + ASBWINVOICEAPPLY("工单开票申请", "process_ldw1bs5t:1:14197536"), + ASTECHTITLEAPPLY("维修技师职称备案申请", "process_kl8rqdjf:1:14197604"), + BILLSETTLEAPPLY("工单结算申请", "process_q2p7s99n:1:14197580"), + ASHOSESUPPAPPLY("工时提成抵顶配件费用申请", "process_z2d1n43e:1:14197592"), + ASSERVICEITEMAPPLY("维修项目备案申请", "process_mbiz75zg:1:14197572"), + ASSERVICEACCOMMAPPLY("配件销售提成备案申请", "process_89i56wrn:1:14197576"), ; diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuserrole/SysUserRoleFeign.java b/yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuserrole/SysUserRoleFeign.java new file mode 100644 index 0000000000..773fa9b350 --- /dev/null +++ b/yxt-as/src/main/java/com/yxt/anrui/as/feign/portal/sysuserrole/SysUserRoleFeign.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.as.feign.portal.sysuserrole; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +@Api(tags = "用户与角色关联表") +@FeignClient( + contextId = "anrui-portal-SysUserRole", + name = "anrui-portal", + path = "v1/sysuserrole") +public interface SysUserRoleFeign { + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid); +} \ No newline at end of file diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java index 908c103468..86702cb2ac 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebackbill/PmsPurchasebackBillService.java @@ -52,6 +52,7 @@ import com.yxt.pms.feign.message.MessageFlowableQuery; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.pms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.pms.feign.privilege.PrivilegeQuery; import com.yxt.pms.feign.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; @@ -87,7 +88,7 @@ public class PmsPurchasebackBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //流程定义id bv.setModelId(ProcDefEnum.PMSPURCHASEBACKBILL.getProDefId()); bv.setFormVariables(variables); @@ -354,6 +359,10 @@ public class PmsPurchasebackBillService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = pmsPurchasebackBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -404,7 +413,17 @@ public class PmsPurchasebackBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.PMSPURCHASEBACKBILL.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + PmsPurchasebackBill pmsPurchasebackBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = pmsPurchasebackBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(pmsPurchasebackBill.getProcDefId()); + 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), PmsPurchasebackBillNodeVo.class)).collect(Collectors.toList()); @@ -415,7 +434,17 @@ public class PmsPurchasebackBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.PMSPURCHASEBACKBILL.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + PmsPurchasebackBill pmsPurchasebackBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = pmsPurchasebackBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(pmsPurchasebackBill.getProcDefId()); + 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), PmsPurchasebackBillNodeVo.class)).collect(Collectors.toList()); @@ -444,6 +473,10 @@ public class PmsPurchasebackBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = pmsPurchasebackBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java index b2aa829fde..864c8ce153 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/biz/pms/pmspurchasebill/PmsPurchaseBillService.java @@ -60,6 +60,7 @@ import com.yxt.pms.feign.message.MessageFlowableQuery; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.pms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.pms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.pms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.pms.feign.privilege.PrivilegeQuery; import com.yxt.pms.feign.sysuser.SysUserFeign; import com.yxt.pms.feign.wms.wmsansbill.WmsAnsBillDetailDto; @@ -96,10 +97,6 @@ import java.util.stream.Collectors; @Service public class PmsPurchaseBillService extends MybatisBaseService { - @Autowired - private PmsPurchasebackBillService pmsPurchasebackBillService; - @Autowired - private PmsPurchasebackDetailService pmsPurchasebackDetailService; @Autowired private PmsPurchaseBillDetailService pmsPurchaseBillDetailService; @Autowired @@ -124,6 +121,8 @@ public class PmsPurchaseBillService extends MybatisBaseService listPageVo(PagerQuery pq) { @@ -342,6 +341,10 @@ public class PmsPurchaseBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //流程定义id bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId()); bv.setFormVariables(variables); @@ -423,6 +426,10 @@ public class PmsPurchaseBillService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = pmsPurchaseBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -548,7 +555,17 @@ public class PmsPurchaseBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + PmsPurchaseBill purchaseBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = purchaseBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(purchaseBill.getProcDefId()); + 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), PmsPurchaseBillNodeVo.class)).collect(Collectors.toList()); @@ -559,7 +576,17 @@ public class PmsPurchaseBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.PMSPURCHASEBILL.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + PmsPurchaseBill purchaseBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = purchaseBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(purchaseBill.getProcDefId()); + 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), PmsPurchaseBillNodeVo.class)).collect(Collectors.toList()); @@ -588,6 +615,10 @@ public class PmsPurchaseBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = pmsPurchaseBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/FlowProcessMapQuery.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/FlowProcessMapQuery.java index c37e6abc2d..16894c5bfe 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/FlowProcessMapQuery.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/FlowProcessMapQuery.java @@ -13,15 +13,8 @@ import java.util.Map; @Data public class FlowProcessMapQuery { - @ApiModelProperty("合同编号") - private String contractNo; @ApiModelProperty("变量") private Map variables; @ApiModelProperty("流程id") private String proDefKey; - - @ApiModelProperty("是否领票（欠款开票使用）") - private String isLP; - @ApiModelProperty("贷款人姓名") - private String dkrName; } diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java index e79d2ccdd9..b9a909c897 100644 --- a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/flowable/flow/ProcDefEnum.java @@ -7,8 +7,8 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - PMSPURCHASEBILL("采购单申请", "process_cx2htjth:1:11280004"), - PMSPURCHASEBACKBILL("采购退货单申请", "process_00x6bf4z:1:11305004"), + PMSPURCHASEBILL("采购申请", "process_cx2htjth:2:14197504"), + PMSPURCHASEBACKBILL("采购退货申请", "process_00x6bf4z:3:14197512"), ; diff --git a/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysuserrole/SysUserRoleFeign.java b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysuserrole/SysUserRoleFeign.java new file mode 100644 index 0000000000..8e9e892c59 --- /dev/null +++ b/yxt-pms-biz/src/main/java/com/yxt/pms/feign/portal/sysuserrole/SysUserRoleFeign.java @@ -0,0 +1,21 @@ +package com.yxt.pms.feign.portal.sysuserrole; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@Api(tags = "用户与角色关联表") +@FeignClient( + contextId = "anrui-portal-SysUserRole", + name = "anrui-portal", + path = "v1/sysuserrole") +public interface SysUserRoleFeign { + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid); +} \ No newline at end of file diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java index 1a0eada6e6..c394b4a049 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smspricestrategybill/SmsPricestrategyBillService.java @@ -52,6 +52,7 @@ import com.yxt.sms.feign.message.MessageFlowableQuery; import com.yxt.sms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.sms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.sms.feign.portal.sysstafforg.SysStaffOrgFeign; +import com.yxt.sms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.sms.feign.privilege.PrivilegeQuery; import com.yxt.sms.feign.sysuser.SysUserFeign; import org.apache.commons.lang3.StringUtils; @@ -102,6 +103,8 @@ public class SmsPricestrategyBillService extends MybatisBaseService listPageVo(PagerQuery pq) { SmsPricestrategyBillQuery query = pq.getParams(); @@ -322,6 +325,10 @@ public class SmsPricestrategyBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //流程定义id bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId()); bv.setFormVariables(variables); @@ -403,6 +410,10 @@ public class SmsPricestrategyBillService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = smsPricestrategyBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -468,7 +479,17 @@ public class SmsPricestrategyBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + SmsPricestrategyBill smsPricestrategyBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = smsPricestrategyBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(smsPricestrategyBill.getProcDefId()); + 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), SmsPricestrategyBillNodeVo.class)).collect(Collectors.toList()); @@ -479,7 +500,17 @@ public class SmsPricestrategyBillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SMSPRICESTRATEGYBILL.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + SmsPricestrategyBill smsPricestrategyBill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = smsPricestrategyBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(smsPricestrategyBill.getProcDefId()); + 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), SmsPricestrategyBillNodeVo.class)).collect(Collectors.toList()); @@ -508,6 +539,10 @@ public class SmsPricestrategyBillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = smsPricestrategyBill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java index ffea9d3106..03bee3fbe6 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/biz/smssalesreturn/SmsSalesReturnService.java @@ -63,6 +63,7 @@ import com.yxt.sms.feign.message.MessageFlowVo; import com.yxt.sms.feign.message.MessageFlowableQuery; import com.yxt.sms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.sms.feign.portal.sysorganization.SysOrganizationVo; +import com.yxt.sms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.sms.feign.privilege.PrivilegeQuery; import com.yxt.sms.feign.sysuser.SysUserFeign; import com.yxt.sms.feign.wms.wmsinventory.WmsInventoryFeign; @@ -139,6 +140,9 @@ public class SmsSalesReturnService extends MybatisBaseService createQueryWrapper(SmsSalesReturnQuery query) { // todo: 这里根据具体业务调整查询条件 // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); @@ -1098,6 +1102,10 @@ public class SmsSalesReturnService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //流程定义id bv.setModelId(ProcDefEnum.SMSSALESRETURN.getProDefId()); bv.setFormVariables(variables); @@ -1164,6 +1172,10 @@ public class SmsSalesReturnService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = smsSalesReturn.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -1220,7 +1232,17 @@ public class SmsSalesReturnService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SMSSALESRETURN.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + SmsSalesReturn smsSalesReturn = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = smsSalesReturn.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(smsSalesReturn.getProcDefId()); + 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), SmsGoodsReturnNodeVo.class)).collect(Collectors.toList()); @@ -1231,7 +1253,17 @@ public class SmsSalesReturnService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); - bv.setModelId(ProcDefEnum.SMSSALESRETURN.getProDefId()); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 + SmsSalesReturn smsSalesReturn = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = smsSalesReturn.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + bv.setModelId(smsSalesReturn.getProcDefId()); + 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), SmsGoodsReturnNodeVo.class)).collect(Collectors.toList()); @@ -1260,6 +1292,10 @@ public class SmsSalesReturnService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = reverseSettle.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/flowable/flow/ProcDefEnum.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/flowable/flow/ProcDefEnum.java index ebe7a2dc52..075061c47a 100644 --- a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/flowable/flow/ProcDefEnum.java @@ -7,8 +7,8 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - SMSPRICESTRATEGYBILL("价格策略申请审批", "process_jogsdsgk:1:11807504"), - SMSSALESRETURN("商品退货申请", "process_bucc4eii:1:12245004"), + SMSPRICESTRATEGYBILL("价格策略申请审批", "process_ydonyc8b:2:14197544"), + SMSSALESRETURN("商品退货申请", "process_sp50i8u9:2:14197548"), ; diff --git a/yxt-sms-biz/src/main/java/com/yxt/sms/feign/portal/sysuserrole/SysUserRoleFeign.java b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/portal/sysuserrole/SysUserRoleFeign.java new file mode 100644 index 0000000000..b381463cbc --- /dev/null +++ b/yxt-sms-biz/src/main/java/com/yxt/sms/feign/portal/sysuserrole/SysUserRoleFeign.java @@ -0,0 +1,22 @@ +package com.yxt.sms.feign.portal.sysuserrole; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +@Api(tags = "用户与角色关联表") +@FeignClient( + contextId = "anrui-portal-SysUserRole", + name = "anrui-portal", + path = "v1/sysuserrole") +public interface SysUserRoleFeign { + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid); +} \ No newline at end of file diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml index 26580d3083..945746f09a 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventory/WmsInventoryMapper.xml @@ -398,8 +398,8 @@ resultType="com.yxt.wms.biz.inventory.wmsinventory.WmsInventoryBillUseOrgSidVo"> SELECT w.*, - w.billObjSid AS supplierSid, - w.billObjName AS supplierName, + w.supplierSid, + w.supplierName, wa.sid AS warehouseAreaSid, wa.`areaName` AS warehouseArea, p.sid AS manufactorBillSid diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java index 55db81c966..66e325e1b8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventorycheckbill/WmsInventoryCheckbillService.java @@ -48,6 +48,7 @@ import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbilldetail.app.*; import com.yxt.wms.biz.inventory.wmsinventorycheckbillreport.*; import com.yxt.wms.biz.inventory.wmsinventoryprofitin.InventoryBillVo; +import com.yxt.wms.biz.inventory.wmsinventoryprofitin.WmsInventoryProfitin; import com.yxt.wms.biz.inventory.wmsinventoryrecord.WmsInventoryRecordService; import com.yxt.wms.feign.flowable.flow.BusinessVariables; import com.yxt.wms.feign.flowable.flow.FlowableFeign; @@ -66,6 +67,7 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.wms.utils.Rule; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -131,6 +133,8 @@ public class WmsInventoryCheckbillService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryCheckbillQuery query = pq.getParams(); @@ -538,6 +542,10 @@ public class WmsInventoryCheckbillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryCheckbill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryCheckbill.getDeptSid()).getData(); if (sysOrganization != null) { @@ -628,6 +636,10 @@ public class WmsInventoryCheckbillService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryCheckbill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -672,8 +684,17 @@ public class WmsInventoryCheckbillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 WmsInventoryCheckbill wmsInventoryCheckbill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryCheckbill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); bv.setModelId(wmsInventoryCheckbill.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryCheckNodeVo.class)).collect(Collectors.toList()); @@ -684,8 +705,17 @@ public class WmsInventoryCheckbillService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 WmsInventoryCheckbill wmsInventoryCheckbill = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryCheckbill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); bv.setModelId(wmsInventoryCheckbill.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryCheckNodeVo.class)).collect(Collectors.toList()); @@ -714,6 +744,11 @@ public class WmsInventoryCheckbillService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryCheckbill.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java index 0565f88d18..b350a46b0f 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitin/WmsInventoryProfitinService.java @@ -62,6 +62,7 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.wms.utils.Rule; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -117,6 +118,8 @@ public class WmsInventoryProfitinService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryProfitinQuery query = pq.getParams(); @@ -293,6 +296,10 @@ public class WmsInventoryProfitinService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitin.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryProfitin.getDeptSid()).getData(); if (sysOrganization != null) { @@ -383,6 +390,10 @@ public class WmsInventoryProfitinService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitin.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -467,8 +478,17 @@ public class WmsInventoryProfitinService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitin.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); bv.setModelId(wmsInventoryProfitin.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitinNodeVo.class)).collect(Collectors.toList()); @@ -479,8 +499,17 @@ public class WmsInventoryProfitinService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 WmsInventoryProfitin wmsInventoryProfitin = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitin.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); bv.setModelId(wmsInventoryProfitin.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitinNodeVo.class)).collect(Collectors.toList()); @@ -509,6 +538,11 @@ public class WmsInventoryProfitinService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitin.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java index 088c5cbd96..21b78aeb18 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryprofitout/WmsInventoryProfitoutService.java @@ -61,6 +61,7 @@ import com.yxt.wms.feign.portal.sysorganization.SysOrganizationFeign; import com.yxt.wms.feign.portal.sysorganization.SysOrganizationVo; import com.yxt.wms.feign.portal.sysstafforg.SysStaffOrgFeign; import com.yxt.wms.feign.portal.sysuser.SysUserFeign; +import com.yxt.wms.feign.portal.sysuserrole.SysUserRoleFeign; import com.yxt.wms.utils.Rule; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -99,6 +100,8 @@ public class WmsInventoryProfitoutService extends MybatisBaseService listPageVo(PagerQuery pq) { WmsInventoryProfitoutQuery query = pq.getParams(); @@ -275,6 +278,10 @@ public class WmsInventoryProfitoutService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitout.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryProfitout.getDeptSid()).getData(); if (sysOrganization != null) { @@ -365,6 +372,10 @@ public class WmsInventoryProfitoutService extends MybatisBaseService variables = new HashMap<>(); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitout.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); Map appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); @@ -409,8 +420,17 @@ public class WmsInventoryProfitoutService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 WmsInventoryProfitout wmsInventoryProfitout = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitout.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); bv.setModelId(wmsInventoryProfitout.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitoutNodeVo.class)).collect(Collectors.toList()); @@ -421,8 +441,17 @@ public class WmsInventoryProfitoutService extends MybatisBaseService> rb = ResultBean.fireFail(); BusinessVariables bv = new BusinessVariables(); BeanUtil.copyProperties(query, bv); + //流程中的参数赋值、若有网关，则赋值网关中判断的字段。 + Map variables = new HashMap<>(); + //查询业务信息 WmsInventoryProfitout wmsInventoryProfitout = fetchBySid(query.getBusinessSid()); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitout.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); bv.setModelId(wmsInventoryProfitout.getProcDefId()); + bv.setFormVariables(variables); + //======================================= ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给TemplateApplyNodeVo List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), InventoryProfitoutNodeVo.class)).collect(Collectors.toList()); @@ -451,6 +480,11 @@ public class WmsInventoryProfitoutService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + //判断发起人是否为配件主管 + String createBySid = wmsInventoryProfitout.getCreateBySid(); + List list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); + variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); + flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java index d618e44928..31d8e268d8 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/flowable/flow/ProcDefEnum.java @@ -7,9 +7,12 @@ public enum ProcDefEnum { /***************************正式流程id***********************************/ - WMSINVENCHECKREPORT("盘点报告审批", ""), - WMSINVENTORYPROFITIN("盘盈入库申请", ""), - WMSINVENTORYPROFITOUT("盘亏出库申请", ""), + WMSINVENCHECKREPORT("盘点报告审批", "process_wtab67fj:1:14197600"), + WMSINVENTORYPROFITIN("盘盈入库申请", "process_kwd3cagu:1:14197564"), + WMSINVENTORYPROFITOUT("盘亏出库申请", "process_gmjrjghm:1:14197568"), + WMSINVENTORYALLOCATEBILLONE("调拨申请(自有、合作二级站间调拨)", "process_hw0a2ybh:3:14242504"), + WMSINVENTORYALLOCATEBILLTWO("调拨申请(集团内不同分公司两一级站间调拨)", "process_9pm5umo8:2:14242508"), + WMSINVENTORYALLOCATEBILLTHREE("调拨申请(集团内同一分公司两一级站间调拨)", "process_6clsvwsg:1:14177512"), ; diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java new file mode 100644 index 0000000000..32ec59f47b --- /dev/null +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/feign/portal/sysuserrole/SysUserRoleFeign.java @@ -0,0 +1,22 @@ +package com.yxt.wms.feign.portal.sysuserrole; + +import com.yxt.common.core.result.ResultBean; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; + +import java.util.List; + +@Api(tags = "用户与角色关联表") +@FeignClient( + contextId = "anrui-portal-SysUserRole", + name = "anrui-portal", + path = "v1/sysuserrole") +public interface SysUserRoleFeign { + + @ApiOperation("根据用户sid查询用户角色sid列表") + @GetMapping("/getUserRoleSidByUserSid/{userSid}") + public ResultBean> getUserRoleSidByUserSid(@PathVariable("userSid") String userSid); +} \ No newline at end of file