From 910e80814b921778325b3792147607f0e48c9cf0 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Sat, 17 Feb 2024 17:33:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=B8=85=E7=94=B3=E8=AF=B7=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8=E7=AB=AF=E5=8F=8A=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/flowable/api/utils/ProcDefEnum.java    | 2 +-
 .../biz/loansettleapply/LoanSettleApplyService.java      | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
index c051fa38f4..dc097ca83e 100644
--- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
+++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
@@ -75,7 +75,7 @@ public enum ProcDefEnum {
     LOANSUBLETAPPLY("交回车辆二次转租申请", "process_lu7pdwzs:1:7940004"),
     LOANOUTBOUNDVEHAPPLY("交回车辆出库申请", "process_14spbdx8:1:7982504"),
     LOANSECONDSALEAPPLY("交车车辆二次销售申请", "process_6kb1z0pe:4:8110004"),
-    LOANSETTLEAPPLY("结清申请", ""),
+    LOANSETTLEAPPLY("结清申请", "process_ob34xgz2:1:8222504"),
     LOANREPURCHASEAPPLY("回购申请", "process_1ozjarxl:1:8207504"),
     LOANCASEAPPEALAPPLY("案件上诉申请", "process_0r2ruoxm:1:8215004"),
     LOANCASEEXECUTEAPPLY("案件执行立案申请", "process_aeho48ap:1:8220004"),
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index b11b1b5c14..4ecf8113c1 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -251,6 +251,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleApply.setTypeState("01");
                 loanSettleApply.setTypeStateValue("正常结清");
             }
+            loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
             baseMapper.insert(loanSettleApply);
         } else {//修改
             LoanSettleApply loanSettleApply = fetchBySid(sid);
@@ -267,10 +268,16 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                 loanSettleCompanyCostService.saveCost(sid, loanSettleCompanyCostVo);
             }
             LoanSettleCompanyReductionVo loanSettleCompanyReductionVo = dto.getLoanSettleCompanyReductionVo();
+            loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
+            if (!dto.isTrueReduction()) {
+                loanSettleCompanyReductionVo.setAmountTo("");
+                loanSettleCompanyReductionVo.setDepositPenalty("");
+                loanSettleCompanyReductionVo.setOtherCost("");
+                loanSettleCompanyReductionVo.setFundPenalty("");
+            }
             if (loanSettleCompanyReductionVo != null) {
                 loanSettleCompanyReductionService.saveReduction(sid, loanSettleCompanyReductionVo);
             }
-            loanSettleApply.setTrueReduction(dto.isTrueReduction() ? 1 : 0);
             baseMapper.updateById(loanSettleApply);
         }
         return rb.success().setData(sid);