From 50d61d0b855f5792232b8120c1b5d7aaf3132646 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 19 May 2025 11:25:11 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LoanCaseExecuteApplyRest.java | 15 +-- .../WmsInventoryAllocatebillRest.java | 4 +- .../WmsInventoryAllocateBillService.java | 94 ++++++++++++------- 3 files changed, 64 insertions(+), 49 deletions(-) diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java index f711cce277..3bf05f810f 100644 --- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java +++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancaseexecuteapply/LoanCaseExecuteApplyRest.java @@ -46,21 +46,8 @@ import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDet import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyDto; import com.yxt.anrui.riskcenter.api.loancaseexecuteapply.LoanCaseExecuteApplyFeign; -/** - * Project: anrui-riskcenter(案件执行立案申请)
- * File: LoanCaseExecuteApplyFeignFallback.java
- * Class: com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyRest
- * Description: 案件执行立案申请.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2024-02-07 10:00:57
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Api(tags = "案件执行立案申请") -@RestController("com.yxt.anrui.riskcenter.biz.loancaseexecuteapply.LoanCaseExecuteApplyRest") +@RestController @RequestMapping("v1/loancaseexecuteapply") public class LoanCaseExecuteApplyRest implements LoanCaseExecuteApplyFeign { diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java index 89d12de757..b8d2c5b2a4 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/apiadmin/inventroy/WmsInventoryAllocatebillRest.java @@ -60,9 +60,7 @@ public class WmsInventoryAllocatebillRest { @ApiOperation("新增或修改") @PostMapping("/save") public ResultBean save(@RequestBody WmsInventoryAllocateBillDtoNew dto) { - ResultBean rb = ResultBean.fireFail(); - wmsInventoryAllocateBillService.saveOrUpdateDto(dto); - return rb.success(); + return wmsInventoryAllocateBillService.saveOrUpdateDto(dto); } @ApiOperation("根据sid批量删除") diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index c49c61fd22..f1b6f2c992 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -41,6 +41,8 @@ import org.apache.tomcat.util.threads.ThreadPoolExecutor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.math.BigDecimal; +import java.math.BigInteger; import java.util.*; import java.util.concurrent.*; import java.util.stream.Collectors; @@ -171,7 +173,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService saveOrUpdateDto(WmsInventoryAllocateBillDtoNew dto) { + ResultBean rb = ResultBean.fireFail(); String dtoSid = dto.getSid(); List wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); if (StringUtils.isBlank(dtoSid)) { @@ -190,10 +193,19 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocateBillDetailNewList = dto.getWmsInventoryAllocateBillDetailNewList(); for (WmsInventoryAllocateBillDetailDtoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocateBillDetailNewList) { flowNodeQuery.setNodeNames("调出方站长审批"); - flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10")); + flowNodeQuery.setValue(zk.toString()); f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); if (f0) { break; @@ -667,7 +680,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); - List candidateGroups = voList.get(0).getCandidateGroups(); - userRoleQuery.setRoleSid(candidateGroups.get(0)); - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); } else { - userRoleQuery.setRoleSid("bdacdca7-7a62-49b1-84c6-e32a4ffab777"); userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); } List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); @@ -696,7 +705,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(businessSid); for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { flowNodeQuery.setNodeNames("调出方站长审批"); - flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10")); + flowNodeQuery.setValue(zk.toString()); f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); if (f0) { break; @@ -789,7 +799,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); - //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo - List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); - List candidateGroups = voList.get(0).getCandidateGroups(); - UserRoleQuery userRoleQuery = new UserRoleQuery(); + //特殊处理 + //获取调入方组织信息 + SysOrganizationVo drOrg = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData(); + //流程预演 + ResultBean>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + //获取下一环节审批角色 + List candidateGroups = voList.get(0).getCandidateGroups(); + UserRoleQuery userRoleQuery = new UserRoleQuery(); + if (candidateGroups != null && candidateGroups.size() > 0){ userRoleQuery.setRoleSid(candidateGroups.get(0)); - userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); + if (bv.getTaskDefKey().equals("Activity_1kuhabd")) {//调出方站长审批 + if (!f0){ + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } + } else if (bv.getTaskDefKey().equals("Activity_1ri7ft5")) {//调出方省（分）公司总经理审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder(); if (sysUserVos.size() > 0) { @@ -824,7 +848,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { flowNodeQuery.setNodeNames("调出方站长审批"); - flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10")); + flowNodeQuery.setValue(zk.toString()); f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); if (f0) { break; @@ -893,7 +918,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { flowNodeQuery.setNodeNames("调出方站长审批"); - flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10")); + flowNodeQuery.setValue(zk.toString()); f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); if (f0) { break; @@ -940,7 +967,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService wmsInventoryAllocatebillDetailDetailsVoNews = wmsInventoryAllocateBillDetailService.selByMainSid(query.getBusinessSid()); for (WmsInventoryAllocatebillDetailDetailsVoNew wmsInventoryAllocateBillDetailDtoNew : wmsInventoryAllocatebillDetailDetailsVoNews) { flowNodeQuery.setNodeNames("调出方站长审批"); - flowNodeQuery.setValue(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice().toString()); + BigDecimal zk = wmsInventoryAllocateBillDetailDtoNew.getRequAmount().divide(wmsInventoryAllocateBillDetailDtoNew.getTaxPrice()).multiply(new BigDecimal("10")); + flowNodeQuery.setValue(zk.toString()); f0 = sysFlowPowerFeign.flowPermissions(flowNodeQuery); if (f0) { break; @@ -1002,7 +1031,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService Date: Mon, 19 May 2025 11:41:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInventoryAllocateBillService.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index f1b6f2c992..2dfe09ab5c 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -819,6 +819,8 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService Date: Mon, 19 May 2025 11:47:51 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInventoryAllocateBillService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index 2dfe09ab5c..03ced52f91 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -832,7 +832,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService 0){ userRoleQuery.setRoleSid(candidateGroups.get(0)); - if (bv.getTaskDefKey().equals("Activity_1kuhabd")) {//调出方站长审批 + if (bv.getTaskDefKey().equals("Activity_1kuhabd") || bv.getTaskDefKey().equals("Activity_0nhcymu")) {//调出方站长审批 if (!f0){ userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); bv.setOrgSidPath(drOrg.getOrgSidPath()); From 619c38db4073e24ddeedc20ae3bb66289809dc0d Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 19 May 2025 12:05:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInventoryAllocateBillService.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index 03ced52f91..ff5e21a1b7 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -193,7 +193,7 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); - if (candidateGroups != null && candidateGroups.size() > 0){ + if (candidateGroups != null && candidateGroups.size() > 0) { userRoleQuery.setRoleSid(candidateGroups.get(0)); if (bv.getTaskDefKey().equals("Activity_0eb1lqn")) {//调出方配件主管审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); @@ -830,19 +830,31 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService candidateGroups = voList.get(0).getCandidateGroups(); UserRoleQuery userRoleQuery = new UserRoleQuery(); - if (candidateGroups != null && candidateGroups.size() > 0){ + if (candidateGroups != null && candidateGroups.size() > 0) { userRoleQuery.setRoleSid(candidateGroups.get(0)); if (bv.getTaskDefKey().equals("Activity_1kuhabd") || bv.getTaskDefKey().equals("Activity_0nhcymu")) {//调出方站长审批 - if (!f0){ + if (!f0) { userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); bv.setOrgSidPath(drOrg.getOrgSidPath()); - }else { + } else { userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); bv.setOrgSidPath(dcOrg.getOrgSidPath()); } + } else if (bv.getTaskDefKey().equals("Activity_0ax87n7")) {//调出方分公司总（副总）经理审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getOutPlatSid()); + bv.setOrgSidPath(dcOrg.getOrgSidPath()); } else if (bv.getTaskDefKey().equals("Activity_1ri7ft5")) {//调出方省（分）公司总经理审批 userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); bv.setOrgSidPath(drOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_0p4jq17")) {//调入方配件主管审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_0cuo7gz")) {//调入方站长审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } else if (bv.getTaskDefKey().equals("Activity_0x5oo96")) {//调入方分公司总（副总）经理审批 + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); } List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); StringBuilder nextNodeUserSids = new StringBuilder(); From a8bfb4998e5b496d9623fc259668e94f08649b37 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 19 May 2025 14:03:38 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WmsInventoryAllocateBillService.java | 68 ++++++++++++++++++- 1 file changed, 66 insertions(+), 2 deletions(-) diff --git a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java index ff5e21a1b7..e8056bc438 100644 --- a/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java +++ b/yxt-wms-biz/src/main/java/com/yxt/wms/biz/inventory/wmsinventoryallocatebill/WmsInventoryAllocateBillService.java @@ -1140,6 +1140,27 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + StringBuilder nextNodeUserSids = new StringBuilder(); + if (sysUserVos.size() > 0) { + for (SysUserVo sysUserVo : sysUserVos) { + String sid = sysUserVo.getSid(); + nextNodeUserSids.append(sid).append(","); + } + } + if (StringUtils.isBlank(nextNodeUserSids)) { + return rb.setMsg("下一环节暂无审批人员，请联系管理员"); + } else { + String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); + bv.setNextNodeUserSids(substring); + } //用户的部门全路径sid SysOrganizationVo sysOrganization = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getDeptSid()).getData(); if (sysOrganization != null) { @@ -1208,10 +1229,13 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService list = sysUserRoleFeign.getUserRoleSidByUserSid(createBySid).getData(); variables.put("iszg", list.contains("bdacdca7-7a62-49b1-84c6-e32a4ffab777")); - variables.put("ishz", true); + //是否合作二级站 + SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(wmsInventoryAllocateBill.getInPlatSid()).getData(); + Boolean f1 = "合作二级服务站".equals(sysOrganizationVo.getOrgAttributeValue()); + variables.put("ishz", f1); //超出二级配件库存累计金额 SysFlowNodeQuery flowNodeQuery = new SysFlowNodeQuery(); - flowNodeQuery.setType(0); + flowNodeQuery.setType(1); flowNodeQuery.setFlowName("调拨申请(自有、合作二级站间调拨)"); flowNodeQuery.setCreateOrgName(wmsInventoryAllocateBill.getCreateOrgName()); flowNodeQuery.setProcDefId("process_hw0a2ybh"); @@ -1227,6 +1251,46 @@ public class WmsInventoryAllocateBillService extends MybatisBaseService>> resultBean1 = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean1.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + //获取下一环节审批角色 + List candidateGroups = voList.get(0).getCandidateGroups(); + UserRoleQuery userRoleQuery = new UserRoleQuery(); + if (candidateGroups != null && candidateGroups.size() > 0) { + userRoleQuery.setRoleSid(candidateGroups.get(0)); + if (bv.getTaskDefKey().equals("Activity_0isr3wq")) {//一级配件主管审批 + if (f1){ + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } + }else if (bv.getTaskDefKey().equals("Activity_1557g51")){//合作二级站站长审批 + if (f0){ + userRoleQuery.setOrgSid(wmsInventoryAllocateBill.getInPlatSid()); + bv.setOrgSidPath(drOrg.getOrgSidPath()); + } + } + List sysUserVos = sysUserFeign.getOtherOrgRoleUser(userRoleQuery).getData(); + StringBuilder nextNodeUserSids = new StringBuilder(); + if (sysUserVos.size() > 0) { + for (SysUserVo sysUserVo : sysUserVos) { + String sid = sysUserVo.getSid(); + nextNodeUserSids.append(sid).append(","); + } + } + if (StringUtils.isBlank(nextNodeUserSids)) { + return rb.setMsg("下一环节暂无审批人员，请联系管理员"); + } else { + String substring = nextNodeUserSids.substring(0, nextNodeUserSids.lastIndexOf(",")); + bv.setNextNodeUserSids(substring); + } + } Map appMap = new HashMap<>(); appMap.put("sid", businessSid); appMap.put("type", "3");