From 2d69db03bc4ba119b264abd1e67002e74178d7ba Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sun, 1 Sep 2024 16:44:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E6=8F=90=E8=B5=84=E9=87=91=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E8=B4=B95=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanMonthlyAccrualApplyMapper.xml                      | 5 +++--
 .../LoanMonthlyAccrualApplyService.java                    | 7 ++++---
 .../ScheduledRepaymentPlanDetailsService.java              | 3 ++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
index eac287c4ff..0b5ec80459 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml
@@ -53,9 +53,10 @@
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails">
         SELECT
         *
-        FROM loan_repayment_plan_details
+        FROM loan_repayment_plan_details as p
+        LEFT JOIN anrui_buscenter.bus_sales_order_vehicle as v ON p.busVinSid = v.sid
         <where>
             ${ew.sqlSegment}
         </where>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
index 716aed974b..b303f1b9da 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyService.java
@@ -157,10 +157,11 @@ public class LoanMonthlyAccrualApplyService extends MybatisBaseService<LoanMonth
         List<LoanMonthlyPlanRecord> records = new ArrayList<>();
         QueryWrapper<LoanRepaymentPlanDetails> queryWrapper = new QueryWrapper<>();
         //=======================
-        queryWrapper.like("orgSidPath", orgSidPath);
-        queryWrapper.apply(StringUtils.isNotEmpty(head), "date_format (dueDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(last), "date_format (dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
+        queryWrapper.like("p.orgSidPath", orgSidPath);
+        queryWrapper.apply(StringUtils.isNotEmpty(head), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(last), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + last + "','%Y-%m-%d')"
                 );
+        queryWrapper.ne("v.settleState",1);
         List<LoanRepaymentPlanDetails> planDetailsList = baseMapper.selRepaymentDetailsByDueDate(queryWrapper);
         if (!planDetailsList.isEmpty()) {
             for (LoanRepaymentPlanDetails details : planDetailsList) {
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
index 967611416e..aad65b6da8 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/ScheduledRepaymentPlanDetailsService.java
@@ -166,7 +166,8 @@ public class ScheduledRepaymentPlanDetailsService {
      * 月初1号计提上个月资金占用费
      * 1号1点
      */
-    @Scheduled(cron = "0 0 1 1 * ?")
+//    @Scheduled(cron = "0 0 1 1 * ?")
+    @Scheduled(cron = "0 0 17 ? * ? ") //每日下午5点
     public void pushFundVoucher() {
         List<String> useOrgSidList = loanRepaymentPlanDetailsService.selUseOrgSidListForFundVoucher();
         useOrgSidList.removeAll(Collections.singleton(null));