贷审会跨级驳回

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

@@ -249,6 +249,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
         //根据主键id查询业务id
         DgGuaranteeAssignUser guaranteeAssignUser = this.getBaseMapper().selectById(investigateGuaranteeRequest.getId());
 
+        Integer count = 0;
+        Integer count1 = 0;
         //如果是属于被驳回的数据，并且调查通过（同意）
         if (guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT) && investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)) {
 
@@ -295,11 +297,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             dgGuaranteeAssignUser.setApplyContent(investigateGuaranteeRequest.getApplyContent());//审核意见
 
             //查询合规调查C角驳回记录
-            Integer count = dgComplianceInvestigationMapper.selectCount(new QueryWrapper<DgComplianceInvestigation>()
+            count = dgComplianceInvestigationMapper.selectCount(new QueryWrapper<DgComplianceInvestigation>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId())
                     .eq("role_id", PromptSuccess.FG_C_ID).eq("audit_status", StatusCode.SP_REJECT));
             //查询贷审会驳回记录
-            Integer count1 = dgLoanCommitteeConsiderMapper.selectCount(new QueryWrapper<DgLoanCommitteeConsider>()
+            count1 = dgLoanCommitteeConsiderMapper.selectCount(new QueryWrapper<DgLoanCommitteeConsider>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId())
                     .eq("role_id", PromptSuccess.DSH_ID).eq("status", 4));
             if(count>0 || count1>0){//说明数据是C角或者贷审会驳回回来的
@@ -462,6 +464,8 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                     .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type",2));
         }
 
+        //如果非合规调查和贷审会跨级驳回情况
+//        if(count<1 && count1<1){
             //判断A角和B角是否都调查通过，如果都审核通过，修改担保部经理操作状态为待处理
             int a = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>().eq("business_id", guaranteeAssignUser.getBusinessId())
                     .eq("type", 1).eq("status", StatusCode.SP_IN_REVIEW).eq("operating_status", StatusCode.CZ_PROCESSED));
@@ -501,8 +505,11 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                         this.baseMapper.update(assignUser, new QueryWrapper<DgGuaranteeAssignUser>()
                                 .eq("business_id", guaranteeAssignUser.getBusinessId()));
                     }
-            } else if (consider != null && consider.getStatus().equals(StatusCode.SP_REJECT) && consider.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)
-                    && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)) {//贷审会业务流程驳回情况处理
+                }else if (consider != null && consider.getStatus().equals(StatusCode.SP_IN_REVIEW) && consider.getOperatingStatus().equals(StatusCode.CZ_ON_HAND)
+                        && guaranteeAssignUser.getStatus().equals(StatusCode.SP_IN_REVIEW) || (consider != null && consider.getStatus().equals(StatusCode.SP_REJECT) && consider.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)
+                        && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT))) {//贷审会业务流程驳回情况处理
+                /*else if (consider != null && consider.getStatus().equals(StatusCode.SP_REJECT) && consider.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)
+                        && guaranteeAssignUser.getStatus().equals(StatusCode.SP_REJECT)) {//贷审会业务流程驳回情况处理*/
 
                     //调查通过，修改贷审会操作状态为待处理，其他子业务为审核中
                     if (investigateGuaranteeRequest.getStatus().equals(StatusCode.SP_IN_REVIEW)) {//如果调查通过
@@ -530,6 +537,7 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
                     this.baseMapper.update(assignUser, new QueryWrapper<DgGuaranteeAssignUser>().eq("business_id", guaranteeAssignUser.getBusinessId())
                             .eq("type", 3));
                 }
+//            }
 
         }