From f2089f07363b7e502768151bbf4f6d234837d15c Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 13 Sep 2023 13:46:22 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=94=BF=E7=AD=96=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../financialpolicymanagementAdd.vue                         | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue
index 23903748ee..5151d0df24 100644
--- a/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue
+++ b/anrui-riskcenter-ui/src/views/financialpolicymanagement/financialpolicymanagementAdd.vue
@@ -18,7 +18,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="15" style="border-right: 0px">
-            <div class="span-sty" style="border-right: 0px"><span><span class="icon">*</span>适用销售部门:</span></div>
+            <div class="span-sty" style="border-right: 0px"><span>适用销售部门:</span></div>
             <el-form-item>
               <el-select class="addinputInfo" v-model="useDept_list" placeholder="请选择" style="width: 60%" clearable filterable multiple>
                 <el-option v-for="item in orgList" :key="item.orgDeptSid" :label="item.orgDeptName" :value="item.orgDeptSid"></el-option>
@@ -588,9 +588,6 @@ export default {
               }
             }
             this.formobj.useDeptList = aa
-          } else {
-            this.$message({ showClose: true, type: 'error', message: '适用销售部门不能为空' })
-            return
           }
           if (this.formobj.vehTypeKeyList.length > 0) {
             const aa = []

From 800662f3da0447312dda530de085e3d9f0d0687a Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 13 Sep 2023 13:49:52 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=B4=B7=E5=89=8D?=
 =?UTF-8?q?=E4=BF=A1=E7=94=A8=E5=AE=A1=E6=A0=B8=E7=94=B3=E8=AF=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xinyongshensuFlow/creditauditappealDaiBan.vue    | 12 ++++++------
 .../xinyongshensuFlow/creditauditappealYiBan.vue     | 12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue
index 748f2eb2f2..a0bd4e899c 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealDaiBan.vue
@@ -64,7 +64,7 @@
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>身份证正反面</span></div>
               <el-form-item>
                 <el-form-item>
-                  <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.idCardImages" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.idCardImages"/>
+                  <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.idCardImages" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.idCardImages"/>
                 </el-form-item>
               </el-form-item>
             </el-col>
@@ -112,7 +112,7 @@
             <el-col :span="24">
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>要求附件</span></div>
               <el-form-item>
-                <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.comFkFiles" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.comFkFiles"/>
+                <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.comFkFiles" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.comFkFiles"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -120,7 +120,7 @@
             <el-col :span="24">
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>查询结果截图</span></div>
               <el-form-item>
-                <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults"/>
+                <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -155,7 +155,7 @@
             <el-col :span="24">
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>查询结果截图</span></div>
               <el-form-item>
-                <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults"/>
+                <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -215,7 +215,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item>
-                <el-image v-for="(item, index) in formobj.ssImages" :key="index" :src="item" :preview-src-list="formobj.ssImages"/>
+                <el-image style="width: 150px; height: 150px" v-for="(item, index) in formobj.ssImages" :key="index" :src="item" :preview-src-list="formobj.ssImages"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -225,7 +225,7 @@
     <salesOrder v-show="viewState == 2" ref="divSales" @doback="resetState"/>
     <!-- 身份证 -->
     <el-dialog :visible.sync="dialogVisible">
-      <el-image v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/>
+      <el-image style="width: 150px; height: 150px" v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/>
     </el-dialog>
     <!-- 选择待办人 的弹出框-->
     <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
diff --git a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue
index f5971ace08..8437bbf5cf 100644
--- a/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue
+++ b/anrui-riskcenter-ui/src/views/workFlow/xinyongshensuFlow/creditauditappealYiBan.vue
@@ -62,7 +62,7 @@
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>身份证正反面</span></div>
               <el-form-item>
                 <el-form-item>
-                  <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.idCardImages" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.idCardImages"/>
+                  <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.idCardImages" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.idCardImages"/>
                 </el-form-item>
               </el-form-item>
             </el-col>
@@ -110,7 +110,7 @@
             <el-col :span="24">
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>要求附件</span></div>
               <el-form-item>
-                <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.comFkFiles" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.comFkFiles"/>
+                <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.comFkFiles" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.comFkFiles"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -118,7 +118,7 @@
             <el-col :span="24">
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>查询结果截图</span></div>
               <el-form-item>
-                <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults"/>
+                <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.gsQueryResults"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -153,7 +153,7 @@
             <el-col :span="24">
               <div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span>查询结果截图</span></div>
               <el-form-item>
-                <el-image class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults"/>
+                <el-image style="width: 150px; height: 150px" class="addinputInfo" v-for="(item, index) in formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults" :key="index" :src="item" :preview-src-list="formobj.loanPreloanCreditApplyDetailsVo.zfQueryResults"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -213,7 +213,7 @@
           <el-row>
             <el-col :span="24">
               <el-form-item>
-                <el-image v-for="(item, index) in formobj.ssImages" :key="index" :src="item" :preview-src-list="formobj.ssImages"/>
+                <el-image style="width: 150px; height: 150px" v-for="(item, index) in formobj.ssImages" :key="index" :src="item" :preview-src-list="formobj.ssImages"/>
               </el-form-item>
             </el-col>
           </el-row>
@@ -223,7 +223,7 @@
     <salesOrder v-show="viewState == 2" ref="divSales" @doback="resetState"/>
     <!-- 身份证 -->
     <el-dialog :visible.sync="dialogVisible">
-      <el-image v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/>
+      <el-image style="width: 150px; height: 150px" v-for="(item, index) in list" :key="index" :src="item" :preview-src-list="list"/>
     </el-dialog>
   </div>
 </template>

From ce7a97c8b2bffa27fba26ca3cf04ff8f6a613608 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Sep 2023 13:51:45 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanCreditAppealApplyMapper.java             |  3 ---
 .../LoanCreditAppealApplyService.java            |  6 +++---
 .../LoanMortgageInformationTransactService.java  | 16 ++++++++--------
 .../LoanPreloanCreditApplyMapper.java            |  3 +++
 .../LoanPreloanCreditApplyService.java           |  4 ++++
 .../LoanRepaymentScheduleService.java            |  4 ++--
 6 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
index d02d3f81c6..4ae8ef43b1 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyMapper.java
@@ -69,9 +69,6 @@ public interface LoanCreditAppealApplyMapper extends BaseMapper<LoanCreditAppeal
 
 	int updateFlowFiled(Map<String, Object> map);
 
-	@Update("update loan_credit_appeal_apply set ssjg=#{ssjg} where sid=#{creditApplySid}")
-    void updateSsjgBySid(String ssjg, String creditApplySid);
-
     String selectNum(String billNo);
 
     LoanCreditAppealApply selectByApplySid(String sid);
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
index 8aa39528a7..751a2b7285 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loancreditappealapply/LoanCreditAppealApplyService.java
@@ -457,7 +457,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
             if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
-                baseMapper.updateSsjgBySid("通过", loanCreditAppealApply.getCreditApplySid());
+                loanPreloanCreditApplyService.updateSsjgBySid("通过", loanCreditAppealApply.getCreditApplySid());
             } else {
                 //极光推送
                 loanCreditAppealApply = fetchBySid(businessSid);
@@ -607,7 +607,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
                 }
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 updateFlowFiled(map);
-                baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid());
+                loanPreloanCreditApplyService.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid());
                 return rb.success().setData(resultBean.getData());
             } else {
                 if (businessTaskId.equals(query.getTaskId())) {
@@ -619,7 +619,7 @@ public class LoanCreditAppealApplyService extends MybatisBaseService<LoanCreditA
                     }
                     Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                     updateFlowFiled(map);
-                    baseMapper.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid());
+                    loanPreloanCreditApplyService.updateSsjgBySid("不通过", loanCreditAppealApply.getCreditApplySid());
                     return rb.success().setData(resultBean.getData());
                 }
             }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java
index 9f88da5254..b58fd95a5a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmortgageinformationtransact/LoanMortgageInformationTransactService.java
@@ -154,8 +154,8 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
                         BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
                         if (null != loancontract) {
                             //消贷合同编号
-                            if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) {
-                                vo.setContractId(loancontract.getLoanCotractNo());
+                            if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                                vo.setContractId(loancontract.getLoanContractNo());
                             }
                             //贷款人
                             if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
@@ -302,8 +302,8 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
                     BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
                     if (null != loancontract) {
                         //消贷合同编号
-                        if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) {
-                            vo.setContractId(loancontract.getLoanCotractNo());
+                        if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                            vo.setContractId(loancontract.getLoanContractNo());
                         }
                         //贷款人
                         if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
@@ -542,8 +542,8 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
                     BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
                     if (null != loancontract) {
                         //消贷合同编号
-                        if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) {
-                            warrantInformation.setContractNo(loancontract.getLoanCotractNo());
+                        if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                            warrantInformation.setContractNo(loancontract.getLoanContractNo());
                         }
                         //贷款人
                         if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
@@ -578,8 +578,8 @@ public class LoanMortgageInformationTransactService extends MybatisBaseService<L
             BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
             if (null != loancontract) {
                 //消贷合同编号
-                if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) {
-                    vo.setContractId(loancontract.getLoanCotractNo());
+                if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                    vo.setContractId(loancontract.getLoanContractNo());
                 }
                 //贷款人
                 if (StringUtils.isNotBlank(loancontract.getBorrowerName())) {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
index 6976bf54e0..b9c61cf228 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyMapper.java
@@ -67,4 +67,7 @@ public interface LoanPreloanCreditApplyMapper extends BaseMapper<LoanPreloanCred
     LoanOrderPreloanVo judgeIsLoan2(String sid);
 
     List<String> selectBySid(String orderSid);
+
+    @Update("update loan_preloan_credit_apply set ssjg=#{ssjg} where sid=#{creditApplySid}")
+    void updateSsjgBySid(@Param("ssjg") String ssjg,@Param("creditApplySid") String creditApplySid);
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
index fd4c467f48..978831f9ae 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanpreloancreditapply/LoanPreloanCreditApplyService.java
@@ -625,4 +625,8 @@ public class LoanPreloanCreditApplyService extends MybatisBaseService<LoanPreloa
             }
         }
     }
+
+    public void updateSsjgBySid(String ssjg, String creditApplySid) {
+        baseMapper.updateSsjgBySid(ssjg,creditApplySid);
+    }
 }
\ No newline at end of file
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
index d672bd6dce..66e2aac8a6 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/LoanRepaymentScheduleService.java
@@ -87,8 +87,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
         BusSalesOrderLoancontract loancontract = busSalesOrderLoancontractFeign.fetchDetailsByOrderSid(salesOrderSid).getData();
         if (null != loancontract) {
             // 消贷合同编号
-            if (StringUtils.isNotBlank(loancontract.getLoanCotractNo())) {
-                vo.setLoanContractNo(loancontract.getLoanCotractNo());
+            if (StringUtils.isNotBlank(loancontract.getLoanContractNo())) {
+                vo.setLoanContractNo(loancontract.getLoanContractNo());
             }
             // 贷款人车辆台数
             if (null != (loancontract.getVehCount())) {

From dd25b465473e313bf6587fd99e573ee961a3e932 Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Wed, 13 Sep 2023 14:07:50 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../金融报价单打印模板/jrbjd.ftl     | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl b/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl
index 90823c64f0..0cc2a6b84c 100644
--- a/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl
+++ b/工作内容需要的文档/单据模板/金融报价单打印模板/jrbjd.ftl
@@ -2251,7 +2251,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${fin</w:t></w:r><w:bookmarkStart w:id="0" w:name="_GoBack"/><w:bookmarkEnd w:id="0"/><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>ancProject!}</w:t>
+                                        <w:t>${financProject!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2428,7 +2428,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>sfbl</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${sfbl!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2496,7 +2496,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>sfje</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${sfje!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2564,7 +2564,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>cpdkje</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${cpdkje!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2631,7 +2631,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>cpqs</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${cpqs!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2719,7 +2719,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>dkbzjbl</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${dkbzjbl!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2787,7 +2787,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>dkbzj</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${dkbzj!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2855,7 +2855,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>cjtx</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${cjtx!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -2922,7 +2922,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>txyt</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${txyt!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3010,7 +3010,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>nll</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${nll!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3078,7 +3078,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>yhje</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${yhje!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3146,7 +3146,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>lxze</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${lxze!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3213,7 +3213,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>txdck</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${txdck!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3432,7 +3432,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>qtrdkje</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${qtrdkje!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3499,7 +3499,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>qtrqs</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${qtrqs!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3586,7 +3586,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>qtrnll</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${qtrnll!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>
@@ -3654,7 +3654,7 @@
                                             <w:vertAlign w:val="baseline"/>
                                             <w:lang w:val="en-US" w:eastAsia="zh-CN"/>
                                         </w:rPr>
-                                        <w:t>${</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>qtryhje</w:t></w:r><w:r><w:rPr><w:rFonts w:hint="eastAsia" w:ascii="宋体" w:hAnsi="宋体" w:eastAsia="宋体" w:cs="宋体"/><w:b w:val="0"/><w:bCs w:val="0"/><w:sz w:val="18"/><w:szCs w:val="18"/><w:vertAlign w:val="baseline"/><w:lang w:val="en-US" w:eastAsia="zh-CN"/></w:rPr><w:t>!}</w:t>
+                                        <w:t>${qtryhje!}</w:t>
                                     </w:r>
                                 </w:p>
                             </w:tc>