From dfc4956cb80cd41a54e6f22dfc3beeb1165c42e6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 17 Jul 2024 09:17:51 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicinformation/maintenanceitem/maintenanceitemAdd.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
index 4fd17125f8..01b7fe942b 100644
--- a/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
+++ b/yxt-as-ui/src/views/basicinformation/maintenanceitem/maintenanceitemAdd.vue
@@ -57,7 +57,7 @@
           <el-row>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时单价</div>
-              <el-form-item prop="hourPrice"><el-input class="addinputInfo addinputw" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
+              <el-form-item prop="hourPrice"><el-input @input="priceInput(formobj)" class="addinputInfo addinputw" @keyup.native="formobj.hourPrice = getNumber(formobj.hourPrice, 2)" v-model="formobj.hourPrice" clearable placeholder="" /></el-form-item>
             </el-col>
             <el-col :span="8">
               <div class="span-sty"><span class="icon">*</span>工时数</div>

From 650630a2f96d19a1d55a5a210bf50b6ee6635445 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 17 Jul 2024 10:01:16 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E9=A2=84=E7=BA=A6=E5=8D=95=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AsBusreserveBillMapper.xml                 | 18 +++++++++++++++++-
 .../AsBusreserveBillService.java               |  2 +-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
index 1b43dede5c..4ab99b702d 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillMapper.xml
@@ -4,7 +4,23 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.as.api.asbusreservebill.AsBusreserveBillVo">
-		SELECT a.* FROM as_busreserve_bill as a
+		SELECT a.sid,
+		       a.billNo,
+		       a.state,
+		       a.useOrgName,
+		       a.deptName as createDept,
+		       a.createByName,
+		       a.createTime,
+		       a.customerName,
+		       a.vehMark,
+		       a.vinNo,
+		       a.mobile,
+		       a.reserveStart,
+		       a.reserveEnd,
+		       a.waitorName,
+		       a.reserveEquip,
+		       a.remarks
+		FROM as_busreserve_bill as a
 		left join anrui_portal.sys_organization as s on a.deptSid = s.sid
 		 <where>
 		    ${ew.sqlSegment}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
index afdacd81f7..3bc14c960f 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusreservebill/AsBusreserveBillService.java
@@ -164,7 +164,7 @@ public class AsBusreserveBillService extends MybatisBaseService<AsBusreserveBill
             qw.like("a.waitorName", query.getWaitorName());
         }
         if (StringUtils.isNotBlank(query.getCreateDept())) {
-            qw.like("a.createDept", query.getCreateDept());
+            qw.like("a.deptName", query.getCreateDept());
         }
         if (StringUtils.isNotBlank(query.getCreateByName())) {
             qw.like("a.createByName", query.getCreateByName());

From 3f4dc58c519457cd2c8493adec1b203d78766ef0 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 17 Jul 2024 10:25:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=8C=E5=96=84=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/views/purchase/procurement/procurement.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yxt-as-ui/src/views/purchase/procurement/procurement.vue b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
index d4d51ac57a..be7bd310c8 100644
--- a/yxt-as-ui/src/views/purchase/procurement/procurement.vue
+++ b/yxt-as-ui/src/views/purchase/procurement/procurement.vue
@@ -421,7 +421,7 @@ export default {
           userSid: ''
         }
       }
-      this.init()
+      this.getList()
     },
     toAdd() {
       this.viewState = 2

From 3818c9a601d9844eae1b4189f2e84a1f70f24c82 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 17 Jul 2024 13:38:32 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=B7=E5=90=8E?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E8=BF=98=E6=AC=BE=E8=AE=A1=E5=88=92=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentScheduleService.java                      | 7 +++++++
 1 file changed, 7 insertions(+)

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 53bce3fe9b..099171bfb3 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
@@ -5680,6 +5680,10 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                         if (StringUtils.isNotBlank(mainSchedule.getBankContractNo())) {
                             importSleepData.setBankContractNo(mainSchedule.getBankContractNo());
                         }
+                        importSleepData.setSalesOrderSid(mainSchedule.getSalesOrderSid());
+                        if (StringUtils.isNotBlank(mainSchedule.getBankName())) {
+                            importSleepData.setBankName(mainSchedule.getBankName());
+                        }
                     } else {
                         LoanRepaymentSchedule otherSchedule = baseMapper.selByOtherBankContractNoForSleepData(bankContractNo, vinNo);
                         if (null != otherSchedule) {
@@ -5721,6 +5725,7 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
                             if (StringUtils.isNotBlank(otherSchedule.getOtherBankNo())) {
                                 importSleepData.setBankContractNo(otherSchedule.getOtherBankNo());
                             }
+                            importSleepData.setSalesOrderSid(otherSchedule.getSalesOrderSid());
                         } else {
                             setMsg.add("资方合同号" + bankContractNo + ",车架号" + vinNo + "不存在，请先导入还款计划主表");
                         }
@@ -5883,6 +5888,8 @@ public class LoanRepaymentScheduleService extends MybatisBaseService<LoanRepayme
             }
             BigDecimal Q1 = Q; //Q的剩余金额 初始值Q1 = Q
             BigDecimal T1 = T; //T的剩余金额 初始值T1 = T
+            BigDecimal TempL = L;//临时垫资方逾期利息
+            BigDecimal TempB = B;//临时资金占用费
             boolean isOther = false; //资方是否相同 0否 1是
             int md = 0; //主产品估算期数
             int od = 0; //其他融估算期数