Merge remote-tracking branch 'origin/master'

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgGuaranteeLetterAssignUserServiceImpl.java

@@ -831,39 +831,61 @@ public class DgGuaranteeLetterAssignUserServiceImpl extends ServiceImpl<DgGuaran
                 QueryWrapper<DgGuaranteeLetterAssignUser> 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<DgGuaranteeLetterAssignUser> 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<DgGuaranteeLetterAssignUser> 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<DgGuaranteeLetterAssignUser> 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);
+                }
             }
 
             //角色为资产部经理则确认担保函操作和驳回操作

dq-financial-guarantee/src/main/java/com/daqing/financial/guarantee/service/impl/DgPaymentConfirmationConsiderServiceImpl.java

@@ -397,12 +397,12 @@ public class DgPaymentConfirmationConsiderServiceImpl extends ServiceImpl<DgPaym
                 QueryWrapper<DgPaymentConfirmationConsider> 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);
                 }