bug修复

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

@@ -332,6 +332,22 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         //根据业务id以及type查询对应的记录
         DgApplyAmountList dgApplyAmountList = dgApplyAmountListMapper.selectOne(new QueryWrapper<DgApplyAmountList>()
                 .eq("business_id", businessApplication.getBusinessId()).eq("type", 1));
+
+        //草稿状态下，新增业务状态到业务状态表
+        if(dgApplyAmountList.getStatus().equals(StatusCode.SP_DRAFT)){
+            DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
+            processStatus.setBusinessId(businessApplication.getBusinessId());//业务id
+            processStatus.setBusinessStatus(1);//进行中
+            dgBusinessProcessStatusMapper.insert(processStatus);
+        }
+
+        //撤销状态下,修改业务状态
+        if(dgApplyAmountList.getStatus().equals(StatusCode.SP_RESCINDED)){
+            DgBusinessProcessStatus processStatus = new DgBusinessProcessStatus();
+            processStatus.setBusinessStatus(1);//进行中
+            dgBusinessProcessStatusMapper.update(processStatus,new QueryWrapper<DgBusinessProcessStatus>()
+                    .eq("business_id",businessApplication.getBusinessId()));
+        }
         //将业务员状态改为审核中，操作状态改为已处理
         dgApplyAmountList.setId(dgApplyAmountList.getId());
         dgApplyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审核中
@@ -340,10 +356,12 @@ public class DgApplyAmountInfoServiceImpl extends ServiceImpl<DgApplyAmountInfoM
         //同时将担保部经理状态改为审核中，操作状态改为待处理
         DgApplyAmountList applyAmountList = dgApplyAmountListMapper.selectOne(new QueryWrapper<DgApplyAmountList>()
                 .eq("business_id", businessApplication.getBusinessId()).eq("type", 2));
-        applyAmountList.setId(applyAmountList.getId());
+        if(applyAmountList != null){
-        applyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审核中
+            applyAmountList.setId(applyAmountList.getId());
-        applyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
+            applyAmountList.setStatus(StatusCode.SP_IN_REVIEW);//审核中
-        dgApplyAmountListMapper.updateById(applyAmountList);
+            applyAmountList.setOperatingStatus(StatusCode.CZ_ON_HAND);//待处理
+            dgApplyAmountListMapper.updateById(applyAmountList);
+        }
         //结束---------------------------------------------
 
         //业务申请重新绑定关联人

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

@@ -554,12 +554,14 @@ public class DgGuaranteeAssignUserServiceImpl extends ServiceImpl<DgGuaranteeAss
             list.add(dgGuaranteePO2);
             //批量绑定角色关系
             hrmsFeignService.insertUsrRole(list);
+        }else{
+            if(a==0){
+                hrmsFeignService.insertUserRole(guaranteeRequest.getEmpAId().longValue(),PromptSuccess.DB_A_ID.longValue());
+            }
+            if(b==0){
+                hrmsFeignService.insertUserRole(guaranteeRequest.getEmpBId().longValue(),PromptSuccess.DB_B_ID.longValue());
+            }
         }
-
-
-
-        //hrmsFeignService.insertUserRole(guaranteeRequest.getEmpAId().longValue(),PromptSuccess.DB_A_ID.longValue());
-        //hrmsFeignService.insertUserRole(guaranteeRequest.getEmpBId().longValue(),PromptSuccess.DB_B_ID.longValue());
         return ResponseResult.SUCCESS();
     }
 

dq-govern-gateway/src/main/resources/jwt.properties

@@ -24,7 +24,8 @@ jwt.ignoreUrlList=/apiHrmsAuth/hrms/auth/userlogin/getBackPwd,\
   /api-guarantee/dg-guarantee-letter-assign-user/guaranteeLetterListExport,\
   /api-guarantee/dg-payment-confirmation-consider/paymentConfirmationListExport,\
   /api-guarantee/dg-loan-notice/loanNoticeListExport,\
-  /api-guarantee/dg-loan-notice/exportLoanNotice
+  /api-guarantee/dg-loan-notice/exportLoanNotice,\
+  /api-hrms/hrms/user/uploadFile