From f08ef13be751a757d7830a5b46a66820143403c8 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 3 Apr 2024 17:48:56 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E3=80=81=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E8=AE=A4=E6=AC=BE=E5=88=97=E8=A1=A8=E9=99=90=E5=88=B6=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=BA=E4=B8=8B=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...UncollectedReceivablesDetailedJRMapper.xml |  4 +-
 .../LoanRepaymentHistoryService.java          | 44 ++++++++++++++-----
 2 files changed, 34 insertions(+), 14 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
index e5b9b950f5..4727f77f39 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finuncollectedreceivablesdetailedjr/FinUncollectedReceivablesDetailedJRMapper.xml
@@ -184,7 +184,7 @@
         )),
         0
         ) &lt; p.dueMoney
-        AND p.dueDate &lt; last_day(curdate())
+        AND p.dueDate &lt; last_day(date_sub(now(),interval -1 month))
         AND s.purchaseSystemSid = #{purchaseSystemSid}
         AND s.useOrgSid = #{userOrgSid}
         UNION ALL
@@ -319,7 +319,7 @@
         )),
         0
         ) &lt; p.dueMoney
-        AND p.dueDate &lt; last_day(curdate())
+        AND p.dueDate &lt; last_day(date_sub(now(),interval -1 month))
         AND s.purchaseSystemSid = #{purchaseSystemSid}
         AND s.useOrgSid = #{userOrgSid}
         UNION ALL
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 59e88a886f..39fa6258ad 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
@@ -168,8 +168,16 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             int size = resultList.size();
             if (StringUtils.isNotBlank(importReturn.getCheckInfo2())) {
                 return rb.success().setData(resultList).setMsg(importReturn.getCheckInfo2());
+            } else if (StringUtils.isNotBlank(importReturn.getCheckInfo3())) {
+                String checkInfo3 = importReturn.getCheckInfo3();
+                String[] split = checkInfo3.split("-");
+                Integer i = Integer.valueOf(split[0]);
+                int i1 = i.intValue();
+                int i2 = size - i1;
+                String sBankNo = split[1];
+                return rb.success().setData(resultList).setMsg("共" + size + "条记录，成功导入" + i2 + "条，导入未成功的资方合同号为：" + sBankNo + "。导入点击“确定”，不导入点击”取消“。");
             } else {
-                return rb.success().setData(resultList).setMsg("数据校验成功，请点击“确定”按钮，导入数据。");
+                return rb.success().setData(resultList).setMsg("数据校验成功共" + size + "条记录，导入点击“确定”，不导入点击”取消“。");
             }
         } else {
             String checkResult = importReturn.getCheckInfo();
@@ -185,6 +193,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         int[] resultIndex = new int[resultCell.length];
         Set<String> checkWord = new HashSet<>();
         Set<String> checkWord2 = new HashSet<>();
+        Set<String> checkWord3 = new HashSet<>();
         for (int r = 1; r <= sheet.getLastRowNum(); r++) {
             Row row = sheet.getRow(r);
             if (row == null) {
@@ -253,7 +262,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             importVoList.add(importVo);
         }
         StringBuffer sbBankCNo = new StringBuffer();
-
+        int i = 0;
         if (!importVoList.isEmpty()) {
             for (RepaymentExcelInfo excelInfo : importVoList) {
                 if (StringUtils.isBlank(excelInfo.getRealReturnTime()) ||
@@ -286,6 +295,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     List<LoanRepaymentPlanDetails> planDetails = loanRepaymentPlanDetailsService.selPlanByNoAndPeriod(bankContractNo, period);
                     if (planDetails.isEmpty() || planDetails == null) {
                         sbBankCNo.append(bankContractNo).append("、");
+                        i++;
                     }
                 }
                 if (StringUtils.isNotBlank(excelInfo.getBankContractNo()) && StringUtils.isNotBlank(excelInfo.getRealReturnTime())) {
@@ -294,18 +304,18 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
                     if (!realReturnTime.equals("error")) {
                         List<LoanRepaymentHistory> histories = baseMapper.selByBankNoAndActDate(bankContractNo, realReturnTime);
                         if (!histories.isEmpty() || histories.size() > 0) {
-                            checkWord2.add("实还日期:" + realReturnTime + "、资方合同编号:" + bankContractNo);
+                            checkWord2.add(bankContractNo + "(" + realReturnTime + ")");
                         }
                     }
                 }
             }
         }
-        String bankCo = "";
-        if (sbBankCNo.length() > 0) {
-            sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
-            bankCo = "资方合同号" + sbBankCNo + "不存在";
-        }
-        checkWord.add(bankCo);
+//        String bankCo = "";
+//        if (sbBankCNo.length() > 0) {
+//            sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
+//            bankCo = "资方合同号" + sbBankCNo + "不存在";
+//        }
+//        checkWord.add(bankCo);
         StringBuffer sbcheck1 = new StringBuffer();
         if (!checkWord.isEmpty()) {
             for (String s : checkWord) {
@@ -332,10 +342,20 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             }
         }
         if (sbcheck2.length() > 0) {
-            sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
-            importReturn.setCheckInfo2("已存在" + sbcheck2.toString() + "的记录，是否继续导入，导入点击“确定”，不导入点击”取消“。");
+            if (sbBankCNo.length() > 0) {
+                sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
+                sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
+                importReturn.setCheckInfo2("1.平台中不存在的资方编号：" + sbBankCNo + "。2.平台中已存在资方实还日期记录：" + sbcheck2 + "。是否继续导入，导入点击“确定”，不导入点击”取消“。导入时只有系统中存在的资方合同号的记录才导入系统。");
+            } else {
+                sbcheck2.delete(sbcheck2.length() - 1, sbcheck2.length());
+                importReturn.setCheckInfo2("平台中已存在资方实还日期记录：" + sbcheck2 + "。是否继续导入，导入点击“确定”，不导入点击”取消“。");
+            }
             return importReturn;
         }
+        if (sbBankCNo.length() > 0) {
+            sbBankCNo.delete(sbBankCNo.length() - 1, sbBankCNo.length());
+            importReturn.setCheckInfo3(i + "-" + sbBankCNo);
+        }
         return importReturn;
     }
 
@@ -806,7 +826,7 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
         //直还+转付余额为零的设置默认划扣状态已通过
         List<String> hisSidsForBuckle = baseMapper.selSidsForBuckle(pushUseOrgSid);
         if (!hisSidsForBuckle.isEmpty()) {
-               int i = baseMapper.setBuckleState(hisSidsForBuckle,"003","审核通过");
+            int i = baseMapper.setBuckleState(hisSidsForBuckle, "003", "审核通过");
         }
         if (histories.isEmpty() && hisSidsForBuckle.isEmpty()) {
             return rb.setMsg("暂无可更新的数据");

From 32b2058e36f077abf65ebaf30b91c450aa426ecb Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 3 Apr 2024 17:49:08 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=80=BB=E8=BE=91=E3=80=81=E9=87=91=E8=9E=8D?=
 =?UTF-8?q?=E8=AE=A4=E6=AC=BE=E5=88=97=E8=A1=A8=E9=99=90=E5=88=B6=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=BA=E4=B8=8B=E4=B8=AA=E6=9C=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../riskcenter/api/loanrepaymenthistory/ReturnExcelInfo.java     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/ReturnExcelInfo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/ReturnExcelInfo.java
index 814cd051be..03d443dc8a 100644
--- a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/ReturnExcelInfo.java
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loanrepaymenthistory/ReturnExcelInfo.java
@@ -14,5 +14,6 @@ import java.util.List;
 public class ReturnExcelInfo {
     private String checkInfo;
     private String checkInfo2;
+    private String checkInfo3;
     private List<RepaymentExcelInfo> infos = new ArrayList<>();
 }

From 23c6106da86e841930d3bf55550326306d0ba8b6 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Sun, 7 Apr 2024 08:56:51 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E8=BF=98=E6=AC=BE=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2--?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=AC=BE=E9=A1=B9=E7=B1=BB?=
 =?UTF-8?q?=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/customerrepayment/customerrepaymentdetails.vue     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue
index 3b3290b9b2..77ce4b9634 100644
--- a/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue
+++ b/anrui-riskcenter-ui/src/views/customerrepayment/customerrepaymentdetails.vue
@@ -109,6 +109,7 @@
             <el-table-column prop="customer" label="客户名称" align="center" width="100" />
             <el-table-column prop="borrowerName" label="贷款人" align="center" width="100" />
             <el-table-column prop="period" label="期数" align="center" min-width="100" />
+            <el-table-column prop="payCostTitleValue" label="款项类别" align="center" width="120" />
             <el-table-column prop="dueDate" label="应还日期" align="center" width="100" />
             <el-table-column prop="dueMoney" label="应还金额" align="center" width="100" />
             <el-table-column prop="actualDate" label="实还日期" align="center" width="100" />

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 4/5] =?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 5/5] =?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;
     }