Merge remote-tracking branch 'origin/master'

anrui-fin/anrui-fin-biz/src/main/resources/application-dev.yml

@@ -25,7 +25,7 @@ image:
   url:
     prefix: http://192.168.1.109:8111/upload/
 kingdee: #金蝶的系统的链接账号 url等信息
-  acctID: 677d1e6daf9bf4 #登录金蝶的账户信息 2023测试
+  acctID: 67d6c3b0ce380b #登录金蝶的账户信息 2023测试
   userName: 信息部 #登录金蝶的账户信息 202311测试的
   password: 123456 #登录金蝶的账户信息
   userName_administrator: administrator #登录金蝶的账户信息 202311测试

anrui-fin/anrui-fin-biz/src/main/resources/application-test.yml

@@ -25,7 +25,7 @@ image:
   url:
     prefix: http://anrui.yyundong.com/upload/
 kingdee:
-  acctID: 677d1e6daf9bf4 #登录金蝶的账户信息 2023011测试
+  acctID: 67d6c3b0ce380b #登录金蝶的账户信息 2023011测试
   userName: 信息部 #登录金蝶的账户信息 202302测试的
   password: 123456 #登录金蝶的账户信息
   userName_administrator: administrator #登录金蝶的账户信息 2023011测试

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankMapper.xml

@@ -104,7 +104,8 @@
         ON lrh.planDetailSid = lrpd.`sid`
         LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
         ON lrpd.busVinSid = bv.sid
-        WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate}
+        WHERE
+        lrpd.dueDate <= lrpd.updateTime
         and lrpd.useOrgSid = #{useOrgSid}
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)) a1
@@ -117,7 +118,7 @@
         ON s.receivablesSid = fjj.sid AND s.auditState = '3'
         JOIN loan_repayment_plan_details lrpd
         ON fjj.busSid = lrpd.sid
-        WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate}
+        WHERE  lrpd.dueDate <= lrpd.updateTime
         AND fjj.payCostTitleKey = '006'
         GROUP BY lrpd.busVinSid
         ) cte ON cte.busVinSid = a1.busVinSid

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduebank/LoanOverdueBankService.java

@@ -667,6 +667,7 @@ public class LoanOverdueBankService extends MybatisBaseService<LoanOverdueBankMa
         qw.eq("1", 1);
         qw.groupBy("a1.bankContractNo");
         qw.groupBy("a1.loanContractNo");
+        qw.having("overdueMoney>0");
         List<LoanOverdueBankDetailsDto> detailsDtoList = baseMapper.detailsList(useOrgSid, qw, stopDate);
         detailsDtoList.removeAll(Collections.singleton(null));
         if (!detailsDtoList.isEmpty()) {

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinMapper.xml

@@ -88,7 +88,7 @@
         ON lrh.planDetailSid = lrpd.`sid`
         LEFT JOIN anrui_buscenter.`bus_sales_order_vehicle` bv
         ON lrpd.busVinSid = bv.sid
-        WHERE DATE_FORMAT(lrpd.dueDate, '%Y-%m-%d') < #{stopDate}
+        WHERE lrpd.dueDate<=lrpd.updateTime
         and lrpd.useOrgSid = #{useOrgSid}
         GROUP BY lrpd.`sid`
         HAVING (yq_total > 0)) a1

anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanoverduefin/LoanOverdueFinService.java

@@ -705,6 +705,7 @@ public class LoanOverdueFinService extends MybatisBaseService<LoanOverdueFinMapp
         qw.eq("1", 1);
         qw.groupBy("a1.vinNo");
         qw.groupBy("a1.busVinSid");
+        qw.having("overdueMoney>0");
         List<LoanOverdueFinDetailsDto> detailsDtoList = baseMapper.detailsList(useOrgSid, qw, stopDate);
         detailsDtoList.removeAll(Collections.singleton(null));
         return detailsDtoList;