修改回购结清中减免结清合计的赋值

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

@@ -78,4 +78,6 @@ public class LoanSettleApplyDto {
     private String bankSid;
     private String busSid;
 
+    private boolean showHg;
+
 }

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

@@ -362,6 +362,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
             }
             LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = dto.getLoanSettleCompanyReductionVo();
             if (loanSettleCompanyReductionVo != null) {
+                if(!dto.isTrueReduction()){
+                    if (dto.isShowHg()) {//回购结清
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll2());
+                    }else{
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll());
+                    }
+                }
                 loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
             }
             if (StringUtils.isNotBlank(dto.getBusSid())) {
@@ -400,6 +407,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleCompanyReductionVo.setFundPenalty("");
             }
             if (loanSettleCompanyReductionVo != null) {
+                if(!dto.isTrueReduction()){
+                    if (dto.isShowHg()) {//回购结清
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll2());
+                    }else{
+                        loanSettleCompanyReductionVo.setAmountTo(loanSettleCompanyCostVo.getSettleAll());
+                    }
+                }
                 loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
             }
             baseMapper.updateById(loanSettleApply);
@@ -938,7 +952,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 baseMapper.updateBus(loanSettleApply.getBusVinSid(), "3");
                 //获取公司减免情况
                 BigDecimal amountTo = BigDecimal.ZERO;
-                if (loanSettleApply.getTrueReduction() == 1) {
+                /*if (loanSettleApply.getTrueReduction() == 1) {
                     LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
                     if (null != reduction) {
                         if (null != reduction.getAmountTo()) {
@@ -952,6 +966,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                             amountTo = loanSettleCompanyCost.getSettleAll();
                         }
                     }
+                }*/
+                LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(businessSid);
+                if (null != reduction) {
+                    if (null != reduction.getAmountTo()) {
+                        amountTo = reduction.getAmountTo();
+                    }
                 }
                 //生成结清应收
                 pushNewUnLists(loanSettleApply);
@@ -3703,6 +3723,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 if (query.getType().equals("1")) {
                     qw.eq("bv.repoState", 0);
                 }
+            }else{
+                qw.eq("bv.repoState", 0);//0非回购
+                qw.eq("bv.riskState",0);//0正常
             }
             qw.eq("ld.repaymentState", 1);
             qw.orderBy(true, true, "ld.loanContractNo", "bv.linkNo");
@@ -3768,7 +3791,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         sumMoney = jrMoney.add(dueMoney);
         //获取公司减免情况
         BigDecimal amountTo = BigDecimal.ZERO;
-        if (loanSettleApply.getTrueReduction() == 1) {
+        /*if (loanSettleApply.getTrueReduction() == 1) {
             LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
             if (null != reduction) {
                 if (null != reduction.getAmountTo()) {
@@ -3782,6 +3805,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     amountTo = loanSettleCompanyCost.getSettleAll();
                 }
             }
+        }*/
+        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(loanSettleApply.getSid());
+        if (null != reduction) {
+            if (null != reduction.getAmountTo()) {
+                amountTo = reduction.getAmountTo();
+            }
         }
         if (sumMoney.compareTo(amountTo) < 0) {
             isSettle = true;