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] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AE=A2=E6=88=B7=E4=BF=A1?=
 =?UTF-8?q?=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;
     }