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

src/main/java/com/sunxung/factoring/entity/financing/sop/RltRepay.java

@@ -152,6 +152,11 @@ public class RltRepay {
      */
     private Integer guaranteeClassify;
 
+    /**
+     * 联保标志 0:单人保证/多人分保,1:联保
+     **/
+    private Integer wartySign;
+
     /**
      * 相关还款责任人不动产房产
      */
@@ -191,6 +196,7 @@ public class RltRepay {
         this.guaranteeClassify = reviewRltRepay.getGuaranteeClassify();
         this.legalRepresentative = reviewRltRepay.getLegalRepresentative();
         this.arlpAmt = reviewRltRepay.getArlpAmt();
+        this.wartySign = reviewRltRepay.getWartySign();
     }
 
     public String getGuaranteeType() {
@@ -456,4 +462,12 @@ public class RltRepay {
     public void setReviewRltRepayOtherAssets(List<ReviewRltRepayOtherAssets> reviewRltRepayOtherAssets) {
         this.reviewRltRepayOtherAssets = reviewRltRepayOtherAssets;
     }
+
+    public Integer getWartySign() {
+        return wartySign;
+    }
+
+    public void setWartySign(Integer wartySign) {
+        this.wartySign = wartySign;
+    }
 }

src/main/java/com/sunxung/factoring/service/financing/contract/impl/ContractMakingServiceImpl.java

@@ -673,7 +673,7 @@ public class ContractMakingServiceImpl implements ContractMakingService {
         if (CollectionUtil.isNotEmpty(conditionSettingList)) {
             int i = 0;
             for (ContractLoanConditionSetting conditionSetting : conditionSettingList) {
-                conditionSetting.setOrderNumber(i++);
+                conditionSetting.setOrderNumber(++i);
                 conditionSetting.setContractInfoId(contractInfo.getId());
                 conditionSetting.setConditionType(ConstantConversionUtil.CONTRACT_LOAN_CONDITION_SETTING_CONDITION);
             }

src/main/java/com/sunxung/factoring/service/financing/review/impl/ReviewQuotaDisburseServiceImpl.java

@@ -995,7 +995,6 @@ public class ReviewQuotaDisburseServiceImpl extends ServiceImpl<ReviewQuotaDisbu
 
                     reviewMortgageBasicInfoService.addMortgageInfo(mortgageBasicInfo, quotaDisburse);
 
-//                    List<MultipartFile> multipartFiles = mortgageBasicInfo.getMultipartFiles();
                     List<Long> multipartFileIds = mortgageBasicInfo.getFileStorageListId();
                     if (CollectionUtil.isNotEmpty(multipartFileIds)) {
                         multipartFileIds.forEach(fileId -> {