担保系统状态等问题处理

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

@@ -637,11 +637,11 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
                             .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",1));
                     dgGuaranteeAssignUserMapper.update(user,new QueryWrapper<DgGuaranteeAssignUser>()
                             .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",2));
-                    //担保部经理处，驳回状态改为审核中
+                    //担保部经理处，驳回状态改为审核中（现改为所有该业务下状态均改为审核中）
                     DgGuaranteeAssignUser user2 = new DgGuaranteeAssignUser();
                     user2.setStatus(StatusCode.SP_IN_REVIEW);
                     dgGuaranteeAssignUserMapper.update(user2,new QueryWrapper<DgGuaranteeAssignUser>()
-                            .eq("business_id",dgApplyAmountList1.getBusinessId()).eq("type",3));
+                            .eq("business_id",dgApplyAmountList1.getBusinessId()));//.eq("type",3)
                 }
             }
         }else if(dgApplyAmountList.getStatus().equals(StatusCode.SP_REVIEWED) && dgApplyAmountList.getOperatingStatus().equals(StatusCode.CZ_PROCESSED)){

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

@@ -375,7 +375,7 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
                         .set(DgAssetsInvestigation::getEmpId, Integer.parseInt(dgApplyAmountInfoController.getUserId()))
                         .set(DgAssetsInvestigation::getRemark, ArraysUtil.toString(approvalAssetsRequest.getRemark()))
                         .set(DgAssetsInvestigation::getOtherRemark, approvalAssetsRequest.getOtherRemark())
-                        .set(DgAssetsInvestigation::getStatus, approvalAssetsRequest.getStatus())
+                        .set(DgAssetsInvestigation::getStatus, dgAssetsInvestigation.getStatus())//approvalAssetsRequest.getStatus()
                         .set(DgAssetsInvestigation::getOperatingStatus, StatusCode.CZ_PROCESSED)
                         .set(DgAssetsInvestigation::getAmount, approvalAssetsRequest.getAmount())
                         .set(DgAssetsInvestigation::getTerm, approvalAssetsRequest.getTerm())
@@ -436,6 +436,12 @@ public class DgAssetsInvestigationServiceImpl extends ServiceImpl<DgAssetsInvest
             Integer count = this.baseMapper.selectCount(new QueryWrapper<DgAssetsInvestigation>()
                     .eq("business_id", assetsInvestigation2.getBusinessId()).eq("type", 3));
 
+            DgAssetsInvestigation assign = new DgAssetsInvestigation();
+            assign.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+            //修改该业务下所有审批状态为审核中
+            this.baseMapper.update(assign,new QueryWrapper<DgAssetsInvestigation>()
+                    .eq("business_id",assetsInvestigation2.getBusinessId()));
+
             if(count>0){//资产领导有数据，则直接修改领导状态
                 DgAssetsInvestigation assignUser = new DgAssetsInvestigation();
                 assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中

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

@@ -633,6 +633,12 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             Integer count = this.baseMapper.selectCount(new QueryWrapper<DgGuaranteeAssignUser>()
                     .eq("business_id", guaranteeAssignUser.getBusinessId()).eq("type", 4));
 
+            DgGuaranteeAssignUser assign = new DgGuaranteeAssignUser();
+            assign.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中
+            //修改该业务下所有审批状态为审核中
+            this.baseMapper.update(assign,new QueryWrapper<DgGuaranteeAssignUser>()
+                    .eq("business_id",guaranteeAssignUser.getBusinessId()));
+
             if(count>0){//担保领导有数据，则直接修改领导状态
                 DgGuaranteeAssignUser assignUser = new DgGuaranteeAssignUser();
                 assignUser.setStatus(StatusCode.SP_IN_REVIEW);//审批状态为审核中