放开月还期数认款权限

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml

@@ -194,7 +194,7 @@
         )),
         0
         ) < p.dueMoney
-        AND p.dueDate < last_day(date_sub(now(),interval -1 month))
+--         AND p.dueDate < last_day(date_sub(now(),interval -1 month))
         AND p.useOrgSid = #{userOrgSid}
         UNION ALL
         SELECT

anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/SettleApplyAppVo.java

@@ -128,5 +128,12 @@ public class SettleApplyAppVo {
     @ApiModelProperty("截止当前资金占用费")
     private String fundAll;
 
-
+    @ApiModelProperty("资方贷款保证金")
+    private String loanDepositBank;
+    @ApiModelProperty("是否抵顶")
+    private String topping;
+    @ApiModelProperty("资方收款账号")
+    private String bankAccount;
+    @ApiModelProperty("资方收款账户")
+    private String accountName;
 }

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@@ -734,6 +734,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleApply = fetchBySid(businessSid);
                 loanSettleApply.setCloseDate(new Date());
                 loanSettleApply.setSettingDate(DateUtil.today());
+                baseMapper.updateBus(loanSettleApply.getBusVinSid(), "3");
                 if (loanSettleApply.getTrueReduction() == 1) {
                     LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
                     if (null != reduction) {
@@ -2200,15 +2201,47 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         settleApplyAppVo.setCreateTime(DateUtil.format(loanSettleApply.getCreateTime(), "yyyy-MM-dd"));
         LoanSettleBankCost loanSettleBankCost = loanSettleBankCostService.selectByMainSid(sid);
         if (loanSettleBankCost != null) {
-            settleApplyAppVo.setPrice(loanSettleBankCost.getPrice().toString());
-            settleApplyAppVo.setCurrentNotDuePriceBank(loanSettleBankCost.getCurrentNotDuePrice().toString());
-            settleApplyAppVo.setNotDuePriceBank(loanSettleBankCost.getNotDuePrice().toString());
-            settleApplyAppVo.setBankInterest(loanSettleBankCost.getBankInterest().toString());
-            settleApplyAppVo.setBankNominalPrice(loanSettleBankCost.getBankNominalPrice().toString());
-            settleApplyAppVo.setBankContractLiquidated(loanSettleBankCost.getBankContractLiquidated().toString());
-            settleApplyAppVo.setBankOtherReceivable(loanSettleBankCost.getBankOtherReceivable().toString());
-            settleApplyAppVo.setOtherReceivableRemarks(loanSettleBankCost.getOtherReceivableRemarks());
-            settleApplyAppVo.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString());
+            if (StringUtils.isNotBlank(loanSettleBankCost.getAccountName())) {
+                settleApplyAppVo.setAccountName(loanSettleBankCost.getAccountName());
+            }
+            if (StringUtils.isNotBlank(loanSettleBankCost.getBankAccount())) {
+                settleApplyAppVo.setBankAccount(loanSettleBankCost.getBankAccount());
+            }
+            if (loanSettleBankCost.getTopping() == 1) {
+                settleApplyAppVo.setTopping("是");
+            } else if (loanSettleBankCost.getTopping() == 0) {
+                settleApplyAppVo.setTopping("否");
+            }
+            if ( null != loanSettleBankCost.getLoanDeposit()){
+                settleApplyAppVo.setLoanDepositBank(loanSettleBankCost.getLoanDeposit().toString());
+            }
+            if (null != loanSettleBankCost.getPrice()) {
+                settleApplyAppVo.setPrice(loanSettleBankCost.getPrice().toString());
+            }
+            if (null != loanSettleBankCost.getCurrentNotDuePrice()) {
+                settleApplyAppVo.setCurrentNotDuePriceBank(loanSettleBankCost.getCurrentNotDuePrice().toString());
+            }
+            if (null != loanSettleBankCost.getNotDuePrice()) {
+                settleApplyAppVo.setNotDuePriceBank(loanSettleBankCost.getNotDuePrice().toString());
+            }
+            if (null != loanSettleBankCost.getBankInterest()) {
+                settleApplyAppVo.setBankInterest(loanSettleBankCost.getBankInterest().toString());
+            }
+            if (null != loanSettleBankCost.getBankNominalPrice()) {
+                settleApplyAppVo.setBankNominalPrice(loanSettleBankCost.getBankNominalPrice().toString());
+            }
+            if (null != loanSettleBankCost.getBankContractLiquidated()) {
+                settleApplyAppVo.setBankContractLiquidated(loanSettleBankCost.getBankContractLiquidated().toString());
+            }
+            if (null != loanSettleBankCost.getBankOtherReceivable()) {
+                settleApplyAppVo.setBankOtherReceivable(loanSettleBankCost.getBankOtherReceivable().toString());
+            }
+            if (StringUtils.isNotBlank(loanSettleBankCost.getOtherReceivableRemarks())) {
+                settleApplyAppVo.setOtherReceivableRemarks(loanSettleBankCost.getOtherReceivableRemarks());
+            }
+            if (null != loanSettleBankCost.getBankSettlePrice()) {
+                settleApplyAppVo.setBankSettlePrice(loanSettleBankCost.getBankSettlePrice().toString());
+            }
             if (StringUtils.isNotBlank(loanSettleBankCost.getFiles())) {
                 List<String> fileList = Arrays.asList(loanSettleBankCost.getFiles().split(",")).stream().map(c -> fileUploadComponent.getUrlPrefix() + c).collect(Collectors.toList());
                 fileList.removeAll(Collections.singleton(null));
@@ -2258,21 +2291,35 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (loanSettleCompanyCost.getFundAll() != null) {
                 settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
             }
-            settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
+            if (StringUtils.isNotBlank(loanSettleCompanyCost.getOtherCostRemarks())) {
+                settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
+            }
 
 
         }
         LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid);
         if (loanSettleCompanyReduction != null) {
             if (loanSettleApply.getTrueReduction() == 0) {//未勾选
-                settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                if (null != loanSettleCompanyReduction.getProfit()) {
+                    settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                }
                 settleApplyAppVo.setTrueReduction(false);
             } else {
-                settleApplyAppVo.setFundPenalty(loanSettleCompanyReduction.getFundPenalty().toString());
-                settleApplyAppVo.setDepositPenalty(loanSettleCompanyReduction.getDepositPenalty().toString());
-                settleApplyAppVo.setOtherCost(loanSettleCompanyReduction.getOtherCost().toString());
-                settleApplyAppVo.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
-                settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                if (null != loanSettleCompanyReduction.getFundPenalty()) {
+                    settleApplyAppVo.setFundPenalty(loanSettleCompanyReduction.getFundPenalty().toString());
+                }
+                if (null != loanSettleCompanyReduction.getDepositPenalty()) {
+                    settleApplyAppVo.setDepositPenalty(loanSettleCompanyReduction.getDepositPenalty().toString());
+                }
+                if (null != loanSettleCompanyReduction.getOtherCost()) {
+                    settleApplyAppVo.setOtherCost(loanSettleCompanyReduction.getOtherCost().toString());
+                }
+                if (null != loanSettleCompanyReduction.getAmountTo()) {
+                    settleApplyAppVo.setAmountTo(loanSettleCompanyReduction.getAmountTo().toString());
+                }
+                if (null != loanSettleCompanyReduction.getProfit()) {
+                    settleApplyAppVo.setProfit(loanSettleCompanyReduction.getProfit().toString());
+                }
                 settleApplyAppVo.setTrueReduction(true);
             }
         }
@@ -2313,7 +2360,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
                 qw.eq("bs.useOrgSid", useOrgSid);
             }
-            qw.apply("bv.settleState = '0'OR (bv.settleState = '2' AND date_format (bv.settleApplyDate,'%Y-%m-%d') < CURDATE())");
+            qw.apply("bv.settleState = '0'OR (bv.settleState = '3' AND date_format (bv.settleApplyDate,'%Y-%m-%d') < CURDATE())");
             //回购状态，回购申请
             if (StringUtils.isNotBlank(query.getType())) {
                 if (query.getType().equals("1")) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/settleapply/SettleApplyAppVos.java

@@ -130,4 +130,12 @@ public class SettleApplyAppVos {
     @ApiModelProperty("截止当前资金占用费")
     private String fundAll;
 
+    @ApiModelProperty("资方贷款保证金")
+    private String loanDepositBank;
+    @ApiModelProperty("是否抵顶")
+    private String topping;
+    @ApiModelProperty("资方收款账号")
+    private String bankAccount;
+    @ApiModelProperty("资方收款账户")
+    private String accountName;
 }