结清

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

@@ -50,7 +50,7 @@
         <where>
             ${ew.sqlSegment}
         </where>
-        order by la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo
+        order by la.createTime desc,la.useOrgName desc, la.createTime desc, la.loanContractNo desc, la.vinNo
     </select>
 
     <select id="selectBySid" resultType="int">

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

@@ -389,8 +389,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             if (StringUtils.isNotBlank(loanSettleApply.getBusSid())) {
                 loanSettleApplyDetailsVo.setShowHg(true);
             }
-            if(loanSettleApplyDetailsVo.isShowHg()){
-                loanSettleApplyDetailsVo = getInit(loanSettleApplyDetailsVo,loanSettleApply);
+            if (loanSettleApplyDetailsVo.isShowHg()) {
+                loanSettleApplyDetailsVo = getInit(loanSettleApplyDetailsVo, loanSettleApply);
             }
         }
         return rb.success().setData(loanSettleApplyDetailsVo);
@@ -924,20 +924,48 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
         LoanSettleCompanyCost loanSettleCompanyCost = loanSettleCompanyCostService.selectByMainSid(sid);
         if (loanSettleCompanyCost != null) {
-            settleApplyAppVo.setLoanDeposit(loanSettleCompanyCost.getLoanDeposit().toString());
-            settleApplyAppVo.setOverduePrice(loanSettleCompanyCost.getOverduePrice().toString());
-            settleApplyAppVo.setPutBankInterest(loanSettleCompanyCost.getPutBankInterest().toString());
-            settleApplyAppVo.setFunfCost(loanSettleCompanyCost.getFunfCost().toString());
-            settleApplyAppVo.setBankOverInterest(loanSettleCompanyCost.getBankOverInterest().toString());
-            settleApplyAppVo.setCompanyCurrentNotPrice(loanSettleCompanyCost.getCompanyCurrentNotPrice().toString());
-            settleApplyAppVo.setBankNotPrice(loanSettleCompanyCost.getBankNotPrice().toString());
-            settleApplyAppVo.setDeductionAmount(loanSettleCompanyCost.getDeductionAmount().toString());
-            settleApplyAppVo.setCompanyNominalPrice(loanSettleCompanyCost.getCompanyNominalPrice().toString());
-            settleApplyAppVo.setContractLiquidated(loanSettleCompanyCost.getContractLiquidated().toString());
-            settleApplyAppVo.setCompanyOtherPrice(loanSettleCompanyCost.getCompanyOtherPrice().toString());
+            if (loanSettleCompanyCost.getLoanDeposit() != null) {
+                settleApplyAppVo.setLoanDeposit(loanSettleCompanyCost.getLoanDeposit().toString());
+            }
+            if (loanSettleCompanyCost.getOverduePrice() != null) {
+                settleApplyAppVo.setOverduePrice(loanSettleCompanyCost.getOverduePrice().toString());
+            }
+            if (loanSettleCompanyCost.getPutBankInterest() != null) {
+                settleApplyAppVo.setPutBankInterest(loanSettleCompanyCost.getPutBankInterest().toString());
+            }
+            if (loanSettleCompanyCost.getFunfCost() != null) {
+                settleApplyAppVo.setFunfCost(loanSettleCompanyCost.getFunfCost().toString());
+            }
+            if (loanSettleCompanyCost.getBankOverInterest() != null) {
+                settleApplyAppVo.setBankOverInterest(loanSettleCompanyCost.getBankOverInterest().toString());
+            }
+            if (loanSettleCompanyCost.getCompanyCurrentNotPrice() != null) {
+                settleApplyAppVo.setCompanyCurrentNotPrice(loanSettleCompanyCost.getCompanyCurrentNotPrice().toString());
+            }
+            if (loanSettleCompanyCost.getBankNotPrice() != null) {
+                settleApplyAppVo.setBankNotPrice(loanSettleCompanyCost.getBankNotPrice().toString());
+            }
+            if (loanSettleCompanyCost.getDeductionAmount() != null) {
+                settleApplyAppVo.setDeductionAmount(loanSettleCompanyCost.getDeductionAmount().toString());
+            }
+            if (loanSettleCompanyCost.getCompanyNominalPrice() != null) {
+                settleApplyAppVo.setCompanyNominalPrice(loanSettleCompanyCost.getCompanyNominalPrice().toString());
+            }
+            if (loanSettleCompanyCost.getContractLiquidated() != null) {
+                settleApplyAppVo.setContractLiquidated(loanSettleCompanyCost.getContractLiquidated().toString());
+            }
+            if (loanSettleCompanyCost.getCompanyOtherPrice() != null) {
+                settleApplyAppVo.setCompanyOtherPrice(loanSettleCompanyCost.getCompanyOtherPrice().toString());
+            }
+            if (loanSettleCompanyCost.getSettleAll() != null) {
+                settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
+            }
+            if (loanSettleCompanyCost.getFundAll() != null) {
+                settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
+            }
             settleApplyAppVo.setOtherCostRemarks(loanSettleCompanyCost.getOtherCostRemarks());
-            settleApplyAppVo.setSettleAll(loanSettleCompanyCost.getSettleAll().toString());
-            settleApplyAppVo.setFundAll(loanSettleCompanyCost.getFundAll().toString());
+
+
         }
         LoanSettleCompanyReduction loanSettleCompanyReduction = loanSettleCompanyReductionService.selectByMainSid(sid);
         if (loanSettleCompanyReduction != null) {