Merge remote-tracking branch 'origin/dev1.0' into dev1.0

src/main/java/com/sunxung/factoring/service/financing/payment/impl/ExemptionApprovalBusinessServiceImpl.java

@@ -2,6 +2,7 @@ package com.sunxung.factoring.service.financing.payment.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sunxung.factoring.component.enums.FinancingCurrentStageEnum;
 import com.sunxung.factoring.component.exception.BusinessException;
 import com.sunxung.factoring.component.exception.ValidatorException;
 import com.sunxung.factoring.component.util.CodeUtil;
@@ -94,6 +95,11 @@ public class ExemptionApprovalBusinessServiceImpl extends ServiceImpl<ExemptionA
         if (result == null || !result) {
             throw new ValidatorException(CodeUtil.FAIL, "豁免业务负责人审批提交出错啦！");
         }
+        if (ConstantConversionUtil.APPROVAL_RESULT_BACK.equals(exemptionApprovalBusiness.getApprovalConclusion())) {
+            //修改融资申请当前阶段
+            financingBasicInfo.setCurrentStage(FinancingCurrentStageEnum.PAYMENT_APPLY.getCode());
+            financingBasicInfoService.updateById(financingBasicInfo);
+        }
     }
 
     @Override

src/main/java/com/sunxung/factoring/service/financing/payment/impl/ExemptionApprovalRiskServiceImpl.java

@@ -2,6 +2,7 @@ package com.sunxung.factoring.service.financing.payment.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.sunxung.factoring.component.enums.FinancingCurrentStageEnum;
 import com.sunxung.factoring.component.exception.BusinessException;
 import com.sunxung.factoring.component.exception.ValidatorException;
 import com.sunxung.factoring.component.util.CodeUtil;
@@ -94,6 +95,11 @@ public class ExemptionApprovalRiskServiceImpl extends ServiceImpl<ExemptionAppro
         if (result == null || !result) {
             throw new ValidatorException(CodeUtil.FAIL, "豁免风控负责人审批提交出错啦！");
         }
+        if (ConstantConversionUtil.APPROVAL_RESULT_BACK.equals(exemptionApprovalRisk.getApprovalConclusion())) {
+            //修改融资申请当前阶段
+            financingBasicInfo.setCurrentStage(FinancingCurrentStageEnum.PAYMENT_APPLY.getCode());
+            financingBasicInfoService.updateById(financingBasicInfo);
+        }
     }
 
     @Override

src/main/java/com/sunxung/factoring/service/financing/payment/impl/PaymentApplyServiceImpl.java

@@ -272,6 +272,10 @@ public class PaymentApplyServiceImpl extends ServiceImpl<PaymentApplyMapper, Pay
                 result = flowableService.completeMyTask(paymentApply.getTaskId(), financingBasicInfo, procVariables,
                         "无豁免", paymentApplyHis.getId(), msgVariables, key, legalSpecialists);
             }
+            //修改融资申请当前阶段
+            financingBasicInfo.setCurrentStage(FinancingCurrentStageEnum.PAYMENT_APPROVAL.getCode());
+            financingBasicInfoService.updateById(financingBasicInfo);
+
             if (result == null || !result) {
                 throw new ValidatorException(CodeUtil.FAIL, "法务终审提交时出错啦！");
             }
@@ -409,7 +413,7 @@ public class PaymentApplyServiceImpl extends ServiceImpl<PaymentApplyMapper, Pay
             }
             if (paymentApproval.getApprovalConclusion().equals(ConstantConversionUtil.APPROVAL_RESULT_PASS)) {
                 //修改融资申请当前阶段
-                financingBasicInfo.setCurrentStage(FinancingCurrentStageEnum.PAYMENT_APPROVAL.getCode());
+                financingBasicInfo.setCurrentStage("");
                 //修改融资申请状态
                 financingBasicInfo.setFinancingStatus(ProjectInitiationStatusDict.ChildEnum.COMPLETED.getCode());
                 financingBasicInfoService.updateById(financingBasicInfo);
@@ -427,7 +431,7 @@ public class PaymentApplyServiceImpl extends ServiceImpl<PaymentApplyMapper, Pay
 
     @Override
     public List<PaymentCondition> findConditions(Long applyId) {
-        return paymentConditionService.lambdaQuery().eq(PaymentCondition::getPaymentApplyId,applyId).list();
+        return paymentConditionService.lambdaQuery().eq(PaymentCondition::getPaymentApplyId, applyId).list();
     }
 
     /**