From cdae3aafb6d743d4b43bf972aacde66d5cf33fc3 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sun, 7 Apr 2024 09:34:07 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=BF=98=E6=AC=BE?=
 =?UTF-8?q?=E6=98=8E=E7=BB=86=E5=A2=9E=E5=8A=A0=E8=B5=84=E9=87=91=E5=8D=A0?=
 =?UTF-8?q?=E7=94=A8=E8=B4=B9=E3=80=81=E8=B5=84=E6=96=B9=E9=80=BE=E6=9C=9F?=
 =?UTF-8?q?=E5=88=A9=E6=81=AF=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RepaymentDetailsListVo.java               |  2 +
 .../LoanRepaymentHistoryMapper.xml            | 55 ++++++++++++++--
 .../LoanRepaymentHistoryService.java          | 66 +++++++++----------
 3 files changed, 84 insertions(+), 39 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListVo.java
index fe5801574f..230e362745 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListVo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/RepaymentDetailsListVo.java
@@ -57,4 +57,6 @@ public class RepaymentDetailsListVo implements Vo {
     private String closingDate;
     @ApiModelProperty("划扣状态")
     private String buckle;
+    @ApiModelProperty("款项类别")
+    private String payCostTitleValue;
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
index 92b3060e1e..d51423395f 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
@@ -341,6 +341,10 @@
     </select>
     <select id="repaymentDetailsList"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentDetailsListVo">
+        SELECT DISTINCT
+        *
+        FROM
+        (
         SELECT
         p.useOrgName,
         p.dept,
@@ -357,14 +361,53 @@
         h.actualDate,
         h.actualMoney,
         h.returnWay,
-        date_format(h.dataTime, '%Y-%m-%d') as dataTime,
-        date_format(h.updateTime, '%Y-%m-%d') as updateTime,
+        date_format( h.dataTime, '%Y-%m-%d' ) AS dataTime,
+        date_format( h.updateTime, '%Y-%m-%d' ) AS updateTime,
         h.updateState,
         h.buckle,
-        date_format(h.closingDate, '%Y-%m-%d') as closingDate,
-        h.skdBillNo as billNo
-        FROM loan_repayment_history as h
-        LEFT JOIN loan_repayment_plan_details as p ON h.planDetailSid = p.sid
+        date_format( h.closingDate, '%Y-%m-%d' ) AS closingDate,
+        h.skdBillNo AS billNo,
+        '月还' AS payCostTitleValue,
+        p.orgSidPath,
+        p.salesUserSid
+        FROM
+        loan_repayment_history AS h
+        LEFT JOIN loan_repayment_plan_details AS p ON h.planDetailSid = p.sid UNION ALL
+        SELECT
+        p.useOrgName,
+        p.dept,
+        p.staffName,
+        p.loanContractNo,
+        p.vinNo,
+        p.bankName,
+        p.bankContractNo,
+        p.customer,
+        p.borrowerName,
+        p.period,
+        '' AS dueDate,
+        j.reveivableMoney AS dueMoney,
+        s.subscriptionDate AS actualDate,
+        s.subscriptionMoney AS actualMoney,
+        '' AS returnWay,
+        '' AS dataTime,
+        '' AS updateTime,
+        '' AS updateState,
+        '' AS buckle,
+        '' AS closingDate,
+        c.billNo AS billNo,
+        s.receivablesName AS payCostTitleValue,
+        p.orgSidPath,
+        p.salesUserSid
+        FROM
+        anrui_fin.fin_selected_receivables_detailed AS s
+        LEFT JOIN anrui_fin.fin_uncollected_receivables_detailed_jr AS j ON s.receivablesSid = j.sid
+        LEFT JOIN anrui_fin.fin_collection_confirmation AS c ON s.collSid = c.sid
+        LEFT JOIN loan_repayment_plan_details AS p ON j.busSid = p.sid
+        WHERE
+        s.receivablesName = '资金占用费'
+        OR s.receivablesName = '资方逾期利息'
+        AND s.auditState = 3
+        ) AS a
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
index 39fa6258ad..eaa8ab976a 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
@@ -1364,18 +1364,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             String orgLevelKey = defaultIdReltBean.getData();
             if ("1".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i1);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("2".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i2);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("3".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i3);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("4".equals(orgLevelKey)) {
                 orgSidPath = orgSidPath.substring(0, i4);
-                qw.like("p.orgSidPath", orgSidPath);
+                qw.like("a.orgSidPath", orgSidPath);
             } else if ("5".equals(orgLevelKey)) {
-                qw.eq("p.salesUserSid", pagerQuery.getUserSid());
+                qw.eq("a.salesUserSid", pagerQuery.getUserSid());
             } else {
                 PagerVo<RepaymentDetailsListVo> p = new PagerVo<>();
                 return p;
@@ -1386,77 +1386,77 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         }
         //=======================
         if (StringUtils.isNotBlank(pagerQuery.getVinNo())) {
-            qw.like("p.vinNo", pagerQuery.getVinNo());
+            qw.like("a.vinNo", pagerQuery.getVinNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUseOrgName())) {
-            qw.like("p.useOrgName", pagerQuery.getUseOrgName());
+            qw.like("a.useOrgName", pagerQuery.getUseOrgName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getDept())) {
-            qw.like("p.dept", pagerQuery.getDept());
+            qw.like("a.dept", pagerQuery.getDept());
         }
         if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) {
-            qw.like("h.returnWayKey", pagerQuery.getReturnWayKey());
+            qw.like("a.returnWayKey", pagerQuery.getReturnWayKey());
         }
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
-            qw.like("p.staffName", pagerQuery.getStaffName());
+            qw.like("a.staffName", pagerQuery.getStaffName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBuckleKey())) {
-            qw.like("h.buckleKey", pagerQuery.getBuckleKey());
+            qw.like("a.buckleKey", pagerQuery.getBuckleKey());
         }
         if (StringUtils.isNotBlank(pagerQuery.getLoanContractNo())) {
-            qw.like("p.loanContractNo", pagerQuery.getLoanContractNo());
+            qw.like("a.loanContractNo", pagerQuery.getLoanContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getPeriod())) {
-            qw.eq("p.period", pagerQuery.getPeriod());
+            qw.eq("a.period", pagerQuery.getPeriod());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankName())) {
-            qw.like("p.bankName", pagerQuery.getBankName());
+            qw.like("a.bankName", pagerQuery.getBankName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBankContractNo())) {
-            qw.like("p.bankContractNo", pagerQuery.getBankContractNo());
+            qw.like("a.bankContractNo", pagerQuery.getBankContractNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getCustomer())) {
-            qw.like("p.customer", pagerQuery.getCustomer());
+            qw.like("a.customer", pagerQuery.getCustomer());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBorrowerName())) {
-            qw.like("p.borrowerName", pagerQuery.getBorrowerName());
+            qw.like("a.borrowerName", pagerQuery.getBorrowerName());
         }
         if (StringUtils.isNotBlank(pagerQuery.getBillNo())) {
-            qw.like("h.skdBillNo", pagerQuery.getBillNo());
+            qw.like("a.skdBillNo", pagerQuery.getBillNo());
         }
         if (StringUtils.isNotBlank(pagerQuery.getUpdateState())) {
-            qw.eq("h.updateState", pagerQuery.getUpdateState());
+            qw.eq("a.updateState", pagerQuery.getUpdateState());
         }
         String dueStartDate = pagerQuery.getDueStartDate();
         String dueEndDate = pagerQuery.getDueEndDate();
-        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (p.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (p.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dueStartDate), "date_format (a.dueDate,'%Y-%m-%d') >= date_format('" + dueStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dueEndDate), "date_format (a.dueDate,'%Y-%m-%d') <= date_format('" + dueEndDate + "','%Y-%m-%d')"
                 );
         String actualStartDate = pagerQuery.getActualStartDate();
         String actualEndDate = pagerQuery.getActualEndDate();
-        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (h.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (h.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(actualStartDate), "date_format (a.actualDate,'%Y-%m-%d') >= date_format('" + actualStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(actualEndDate), "date_format (a.actualDate,'%Y-%m-%d') <= date_format('" + actualEndDate + "','%Y-%m-%d')"
                 );
         String dataStartTime = pagerQuery.getDataStartTime();
         String dataEndTime = pagerQuery.getDataEndTime();
-        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (h.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (h.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(dataStartTime), "date_format (a.dataTime,'%Y-%m-%d') >= date_format('" + dataStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(dataEndTime), "date_format (a.dataTime,'%Y-%m-%d') <= date_format('" + dataEndTime + "','%Y-%m-%d')"
                 );
         String closingStartDate = pagerQuery.getClosingStartDate();
         String closingEndDate = pagerQuery.getClosingEndDate();
-        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (h.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (h.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(closingStartDate), "date_format (a.closingDate,'%Y-%m-%d') >= date_format('" + closingStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(closingEndDate), "date_format (a.closingDate,'%Y-%m-%d') <= date_format('" + closingEndDate + "','%Y-%m-%d')"
                 );
         String updateStartTime = pagerQuery.getUpdateStartDate();
         String updateEndTime = pagerQuery.getUpdateEndDate();
-        qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (h.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
-                apply(StringUtils.isNotEmpty(updateEndTime), "date_format (h.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
+        qw.apply(StringUtils.isNotEmpty(updateStartTime), "date_format (a.updateTime,'%Y-%m-%d') >= date_format('" + updateStartTime + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(updateEndTime), "date_format (a.updateTime,'%Y-%m-%d') <= date_format('" + updateEndTime + "','%Y-%m-%d')"
                 );
         qw.eq("1", "1");
-        qw.orderBy(true, true, "p.useOrgName")
-                .orderBy(true, true, "p.vinNo")
-                .orderBy(true, true, "p.period")
-                .orderBy(true, true, "p.loanContractNo")
+        qw.orderBy(true, true, "a.useOrgName")
+                .orderBy(true, true, "a.vinNo")
+                .orderBy(true, true, "a.period")
+                .orderBy(true, true, "a.loanContractNo")
         ;
         IPage<RepaymentDetailsListVo> pagging = baseMapper.repaymentDetailsList(page, qw);
         PagerVo<RepaymentDetailsListVo> p = PagerUtil.pageToVo(pagging, null);

From 2231110ae24f63689ec53e3758d43dbd7ec5506d Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Sun, 7 Apr 2024 10:07:45 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=87=BA=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmCustomerTempExportVo.java              |  8 ++---
 .../crmcustomertemp/CrmCustomerTempMapper.xml | 32 ++++++++++++++-----
 .../CrmCustomerTempService.java               | 30 ++++++++---------
 3 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java
index 530eb0d402..ab1ecc4663 100644
--- a/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java
+++ b/anrui-crm/anrui-crm-api/src/main/java/com/yxt/anrui/crm/api/crmcustomertemp/CrmCustomerTempExportVo.java
@@ -36,8 +36,8 @@ public class CrmCustomerTempExportVo {
     private String level;
     @ExportEntityMap(CnName = "提醒日期", EnName = "remind_day")
     private String remind_day;
-    @ExportEntityMap(CnName = "意向车型", EnName = "yxcounts")
-    private String yxcounts;
-    @ExportEntityMap(CnName = "跟进记录", EnName = "gjcounts")
-    private String gjcounts;
+//    @ExportEntityMap(CnName = "意向车型", EnName = "yxcounts")
+//    private String yxcounts;
+//    @ExportEntityMap(CnName = "跟进记录", EnName = "gjcounts")
+//    private String gjcounts;
 }
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
index c8ef529172..b60c7bedaa 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempMapper.xml
@@ -251,8 +251,10 @@
     </select>
     <select id="exportExcel" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo">
         SELECT
-        @row_number:=@row_number + 1 AS rankNo
-        ,a.* FROM (
+        @row_number := @row_number + 1 AS rankNo,
+        a.*
+        FROM
+        (
         SELECT
         DATE_FORMAT( cct.createTime, '%Y-%m-%d' ) AS createTime,
         cct.customerNo,
@@ -261,7 +263,6 @@
         cct.staffSid,
         cct.`name`,
         cct.customerType,
---         org.orgName AS deptName,
         cct.mobile,
         cct.weixin,
         cct.`level`,
@@ -269,15 +270,30 @@
         cct.createOrgSid,
         so.orgSidPath,
         cct.levelKey,
-        DATE_FORMAT( cct.remind_day, '%Y-%m-%d' ) AS remind_day,
-        ( SELECT COUNT(*) FROM crm_vehicledemand cv WHERE cct.sid = cv.customerSid AND states = 1 ) yxcounts,
-        ( SELECT COUNT(*) FROM crm_visit cvi WHERE cct.sid = cvi.customerSid ) gjcounts
+        DATE_FORMAT( cct.remind_day, '%Y-%m-%d' ) AS remind_day
+        -- 		,
+        -- 		( SELECT COUNT(*) FROM crm_vehicledemand cv WHERE cct.sid = cv.customerSid AND states = 1 ) yxcounts,
+        -- 		( SELECT COUNT(*) FROM crm_visit cvi WHERE cct.sid = cvi.customerSid ) gjcounts
+        ,
+        (
+        SELECT
+        sso.orgName
+        FROM
+        anrui_portal.sys_staff_org AS sso
+        LEFT JOIN anrui_portal.sys_organization AS soz ON sso.orgSid = soz.sid
+        WHERE
+        sso.staffSid = cct.staffSid
+        AND soz.psid = cct.createOrgSid
+        LIMIT 1
+        ) as deptName
         FROM
         crm_customer_temp cct
         LEFT JOIN anrui_portal.sys_organization so ON cct.createOrgSid = so.sid
         LEFT JOIN anrui_portal.sys_staffinfo st ON cct.staffSid = st.sid
---         LEFT JOIN anrui_portal.sys_staff_org AS org ON org.staffSid = st.sid and so.psid = org.orgSid
-        ) as a,(SELECT @row_number:=0) AS t
+        ) AS a,(
+        SELECT
+        @row_number := 0
+        ) AS t
         <where>
             ${ew.sqlSegment}
         </where>
diff --git a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
index 8625998c5e..1ccfe2207d 100644
--- a/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
+++ b/anrui-crm/anrui-crm-biz/src/main/java/com/yxt/anrui/crm/biz/crmcustomertemp/CrmCustomerTempService.java
@@ -1290,21 +1290,21 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 apply(StringUtils.isNotBlank(createEndDate), "date_format (a.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
                 );
         List<CrmCustomerTempExportVo> records = baseMapper.exportExcel(qw);
-        if (!records.isEmpty()) {
-            records.stream().forEach(r -> {
-                String createOrgSid = r.getCreateOrgSid();
-                String staffSid = r.getStaffSid();
-                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
-                sysStaffOrgVos.stream().forEach(s -> {
-                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s.getOrgSid()).getData();
-                    String psid = sysOrganizationVo.getPsid();
-                    if (psid.equals(createOrgSid)) {
-                        String orgName = s.getOrgName();
-                        r.setDeptName(orgName);
-                    }
-                });
-            });
-        }
+//        if (!records.isEmpty()) {
+//            records.stream().forEach(r -> {
+//                String createOrgSid = r.getCreateOrgSid();
+//                String staffSid = r.getStaffSid();
+//                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
+//                sysStaffOrgVos.stream().forEach(s -> {
+//                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(s.getOrgSid()).getData();
+//                    String psid = sysOrganizationVo.getPsid();
+//                    if (psid.equals(createOrgSid)) {
+//                        String orgName = s.getOrgName();
+//                        r.setDeptName(orgName);
+//                    }
+//                });
+//            });
+//        }
         return records;
     }
 

From 2252199a6de5e13afce89578e11fbe6e30092fae Mon Sep 17 00:00:00 2001
From: God <10745413@qq.com>
Date: Sun, 7 Apr 2024 10:46:44 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/busbillapplication/BusBillApplicationDto.java      | 4 ++--
 .../fin/api/finbillapplication/FinBillApplicationDto.java  | 4 ++--
 .../java/com/yxt/anrui/portal/biz/index/AppIndexRest.java  | 5 +++++
 .../terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java  | 2 ++
 .../biz/risk/baseinfo/AppAutoRiskBaseInfoService.java      | 7 +++++++
 5 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java
index 2815f149ce..ea39c0b5a0 100644
--- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java
+++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busbillapplication/BusBillApplicationDto.java
@@ -130,9 +130,9 @@ public class BusBillApplicationDto implements Dto {
     private String ckSid;
 
     @ApiModelProperty("开票车辆信息")
-    private List<BusBillVehicleDto> finBillVehicles;
+    private List<BusBillVehicleDto> finBillVehicles = new ArrayList<>();
     @ApiModelProperty("开票挂车信息")
-    private List<BusBillTrailerDto> finBillTrailers;
+    private List<BusBillTrailerDto> finBillTrailers = new ArrayList<>();
     @ApiModelProperty("车辆买卖合同附件信息")
     private List<BusBillFileDto> carBuyContractImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书附件信息")
diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
index a32ce975f2..66c53ad780 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationDto.java
@@ -152,9 +152,9 @@ public class FinBillApplicationDto implements Dto {
     private String showBtnStr;
 
     @ApiModelProperty("开票车辆信息")
-    private List<FinBillVehicleDto> finBillVehicles;
+    private List<FinBillVehicleDto> finBillVehicles = new ArrayList<>();
     @ApiModelProperty("开票挂车信息")
-    private List<FinBillTrailerDto> finBillTrailers;
+    private List<FinBillTrailerDto> finBillTrailers = new ArrayList<>();
     @ApiModelProperty("车辆买卖合同附件信息")
     private List<FinBillFileDto> carBuyContractImages = new ArrayList<>();
     @ApiModelProperty("客户开票申请书附件信息")
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
index c091509dc4..8c83cd2e9f 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/index/AppIndexRest.java
@@ -240,6 +240,11 @@ public class AppIndexRest implements AppIndexFeign {
                             count = count + Integer.valueOf(appAutoRiskBaseInfoVo.getFkzlscNum()).intValue();
                         }
                     }
+                    if (stringList.contains(AppIndexEnum.AppMenu.DYBL.getRemarks())) {
+                        if (StringUtils.isNotBlank(appAutoRiskBaseInfoVo.getDyblNum())) {
+                            count = count + Integer.valueOf(appAutoRiskBaseInfoVo.getDyblNum()).intValue();
+                        }
+                    }
                 }
                 item.setCornerNum(String.valueOf(count));
             } else {
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java
index 3c16bab037..952e11d556 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/risk/baseInfo/AppAutoRiskBaseInfoVo.java
@@ -15,4 +15,6 @@ public class AppAutoRiskBaseInfoVo implements Vo {
     private String jfkcNum;
     //放款资料上传代办
     private String fkzlscNum;
+    //抵押办理代办
+    private String dyblNum;
 }
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoService.java
index b4fd5f3168..d89926d888 100644
--- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoService.java
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/risk/baseinfo/AppAutoRiskBaseInfoService.java
@@ -5,6 +5,7 @@ import com.yxt.anrui.base.api.commoncontract.CommonToDoNumQuery;
 import com.yxt.anrui.riskcenter.api.loanfileexamine.LoanFileexamineFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.LoanHomevisitInvestigateFeign;
 import com.yxt.anrui.riskcenter.api.loanhomevisitinvestigate.RiskToDoNumQuery;
+import com.yxt.anrui.riskcenter.api.loanmortgageinformationtransact.LoanMortgageInformationTransactFeign;
 import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoQuery;
 import com.yxt.anrui.terminal.api.autoservice.baseInfo.AppAutoServiceBaseInfoVo;
 import com.yxt.anrui.terminal.api.risk.baseInfo.AppAutoRiskBaseInfoQuery;
@@ -27,6 +28,8 @@ public class AppAutoRiskBaseInfoService {
     private LoanHomevisitInvestigateFeign loanHomevisitInvestigateFeign;
     @Autowired
     private LoanFileexamineFeign loanFileexamineFeign;
+    @Autowired
+    private LoanMortgageInformationTransactFeign loanMortgageInformationTransactFeign;
 
     public ResultBean<AppAutoRiskBaseInfoVo> getToDoNum(AppAutoRiskBaseInfoQuery baseInfoQuery) {
         String orgPath = baseInfoQuery.getOrgPath();
@@ -35,6 +38,7 @@ public class AppAutoRiskBaseInfoService {
         AppAutoRiskBaseInfoVo appAutoRiskBaseInfoVo = new AppAutoRiskBaseInfoVo();
         String jfkcNum = "";
         String fkzlscNum = "";
+        String dyblNum = "";
         if(StringUtils.isNotBlank(orgPath)){
             //切换机构
             RiskToDoNumQuery appToDoNumQuery = new RiskToDoNumQuery();
@@ -44,9 +48,12 @@ public class AppAutoRiskBaseInfoService {
             jfkcNum = loanHomevisitInvestigateFeign.getToDoNum(appToDoNumQuery).getData();
             //放款资料上传代办数量
             fkzlscNum = loanFileexamineFeign.getToDoNum(appToDoNumQuery).getData();
+            //抵押办理代办数量
+            dyblNum = loanMortgageInformationTransactFeign.getToDoNum(appToDoNumQuery).getData();
         }
         appAutoRiskBaseInfoVo.setJfkcNum(jfkcNum);
         appAutoRiskBaseInfoVo.setFkzlscNum(fkzlscNum);
+        appAutoRiskBaseInfoVo.setDyblNum(dyblNum);
         return rb.success().setData(appAutoRiskBaseInfoVo);
     }
 }