计提资金占用费5点

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanmonthlyaccrualapply/LoanMonthlyAccrualApplyMapper.xml

@@ -53,7 +53,8 @@
             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>

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.like("p.orgSidPath", orgSidPath);
-        queryWrapper.apply(StringUtils.isNotEmpty(head), "date_format (dueDate,'%Y-%m-%d') >= date_format('" + head + "','%Y-%m-%d')").
+        queryWrapper.apply(StringUtils.isNotEmpty(head), "date_format (p.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')"
+                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) {

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));