From add329ebdf1b3f44f0614d7357d8c2f754d7aba5 Mon Sep 17 00:00:00 2001 From: chen <1251790704@qq.com> Date: Tue, 23 Mar 2021 12:00:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=9A=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...gGuaranteeLetterAssignUserServiceImpl.java | 46 ++++++++++++++----- ...aymentConfirmationConsiderServiceImpl.java | 8 ++-- 2 files changed, 38 insertions(+), 16 deletions(-) diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java index ff9d8c9c..691ded26 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java @@ -831,39 +831,61 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl queryWrapperOne = new QueryWrapper<>(); queryWrapperOne.eq("business_id",businessId).eq("role_id",PromptSuccess.FG_JL_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserOne = baseMapper.selectOne(queryWrapperOne); - Integer userId = guaranteeLetterAssignUserOne.getUserId(); - //没有操作过则法规部经理操作 - if (ObjectUtil.isNull(userId)){ + Integer operatingStatus = guaranteeLetterAssignUserOne.getOperatingStatus(); + //待处理则法规部经理操作 + if (operatingStatus.equals(1)){ return this.regulatoryDepartmentManagerOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有a角，则a角操作 + //已处理，拥有a角，则a角操作 if (roleIdList.contains(String.valueOf(PromptSuccess.DB_A_ID))){ //a角数据是否被操作过 QueryWrapper queryWrapperTwo = new QueryWrapper<>(); queryWrapperTwo.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_A_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserTwo = baseMapper.selectOne(queryWrapperTwo); - Integer userIdA = guaranteeLetterAssignUserTwo.getUserId(); - //没有操作过则a角操作 - if (ObjectUtil.isNull(userIdA)){ + Integer operatingStatusA = guaranteeLetterAssignUserTwo.getOperatingStatus(); + //待处理则a角操作 + if (operatingStatusA.equals(1)){ return this.aRoleOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有b角，则b角操作 + //已处理，拥有b角，则b角操作 if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){ //b角数据是否被操作过 QueryWrapper queryWrapperThree = new QueryWrapper<>(); queryWrapperThree.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); DgGuaranteeLetterAssignUser guaranteeLetterAssignUserThree = baseMapper.selectOne(queryWrapperThree); - Integer userIdB = guaranteeLetterAssignUserThree.getUserId(); - //没有操作过则b角操作 - if (ObjectUtil.isNull(userIdB)){ + Integer operatingStatusB = guaranteeLetterAssignUserThree.getOperatingStatus(); + //待处理则b角操作 + if (operatingStatusB.equals(1)){ return this.bRoleOperating(businessId,currentUser,auditOpinion,status); } - //操作过，拥有资产部经理，则资产部经理操作 + //已处理，拥有资产部经理，则资产部经理操作 if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); } } } + + //已处理，拥有b角，则b角操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.DB_B_ID))){ + //b角数据是否被操作过 + QueryWrapper queryWrapperThree = new QueryWrapper<>(); + queryWrapperThree.eq("business_id",businessId).eq("role_id",PromptSuccess.DB_B_ID); + DgGuaranteeLetterAssignUser guaranteeLetterAssignUserThree = baseMapper.selectOne(queryWrapperThree); + Integer operatingStatusB = guaranteeLetterAssignUserThree.getOperatingStatus(); + //待处理则b角操作 + if (operatingStatusB.equals(1)){ + return this.bRoleOperating(businessId,currentUser,auditOpinion,status); + } + //已处理，拥有资产部经理，则资产部经理操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ + return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); + } + } + + //已处理，拥有资产部经理，则资产部经理操作 + if (roleIdList.contains(String.valueOf(PromptSuccess.ZC_JL_ID))){ + return this.assetManagerOperating(businessId,currentUser,auditOpinion,status); + } } //角色为资产部经理则确认担保函操作和驳回操作 diff --git a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java index 5e92ab90..d417791c 100644 --- a/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java +++ b/dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java @@ -397,12 +397,12 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl queryWrapperOne = new QueryWrapper<>(); queryWrapperOne.eq("business_id",businessId).eq("role_id", PromptSuccess.CWB_ID); DgPaymentConfirmationConsider paymentConfirmationConsiderOne = baseMapper.selectOne(queryWrapperOne); - Integer userId = paymentConfirmationConsiderOne.getConsiderId(); - //没有操作过则财务部经理操作 - if (ObjectUtil.isNull(userId)){ + Integer operatingStatus = paymentConfirmationConsiderOne.getOperatingStatus(); + //待处理则财务部经理操作 + if (operatingStatus.equals(1)){ return this.financeDepartmentOperating(businessId,currentUser,auditOpinion,status,imgFile); } - //操作过，拥有法规部经理，则法规部经理操作 + //已处理，拥有法规部经理，则法规部经理操作 if (roleIdList.contains(String.valueOf(PromptSuccess.FG_JL_ID))){ return this.regulationDepartmentOperating(businessId,currentUser,auditOpinion,status,imgFile); }