From 330839a85de4b5b2cb6dcba25572201775ba5b1b Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Mon, 8 Jan 2024 17:06:41 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CrmCustomerTempExportVo.java              |  4 +-
 .../crmcustomertemp/CrmCustomerTempMapper.xml | 14 ++++-
 .../CrmCustomerTempService.java               | 54 +++++++++----------
 3 files changed, 42 insertions(+), 30 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..721d8d98c6 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
@@ -10,8 +10,8 @@ import lombok.Data;
  */
 @Data
 public class CrmCustomerTempExportVo {
-    private String staffSid;
-    private String createOrgSid;
+//    private String staffSid;
+//    private String createOrgSid;
     @ExportEntityMap(CnName = "序号", EnName = "rankNo")
     private Integer rankNo;
     @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
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 6dd8a4ec66..e3cbfa7aeb 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
@@ -250,8 +250,19 @@
         </where>
     </select>
     <select id="exportExcel" resultType="com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempExportVo">
-        SELECT cct.*,
+        SELECT
+        row_number() over(order by cct.id) as rankNo,
+        DATE_FORMAT(cct.createTime, '%Y-%m-%d') AS createTime,
+        cct.customerNo,
+        so.`name` as createOrgName,
         st.name as staffName,
+        org.orgName as deptName,
+        cct.`name`,
+        cct.customerType,
+        cct.mobile,
+        cct.weixin,
+        cct.`level`,
+        DATE_FORMAT(cct.remind_day, '%Y-%m-%d') AS remind_day,
         (SELECT COUNT(*)
         FROM crm_vehicledemand cv
         WHERE cct.sid = cv.customerSid
@@ -262,6 +273,7 @@
         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
         <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 895b9a2de4..dc3d261383 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
@@ -1289,33 +1289,33 @@ public class CrmCustomerTempService extends MybatisBaseService<CrmCustomerTempMa
                 apply(StringUtils.isNotBlank(createEndDate), "date_format (cct.createTime,'%Y-%m-%d') <= date_format('" + createEndDate + "','%Y-%m-%d')"
                 );
         List<CrmCustomerTempExportVo> records = baseMapper.exportExcel(qw);
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-        int id = 1;
-        if (!records.isEmpty()) {
-            for (CrmCustomerTempExportVo record : records) {
-                try {
-                    Date date = sdf.parse(record.getCreateTime());
-                    record.setCreateTime(sdf.format(date));
-                } catch (ParseException e) {
-                    e.printStackTrace();
-                }
-                String createOrgSid = record.getCreateOrgSid();
-                String staffSid = record.getStaffSid();
-                String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
-                record.setCreateOrgName(createOrgName);
-                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
-                for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
-                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
-                    String psid = sysOrganizationVo.getPsid();
-                    if (psid.equals(createOrgSid)) {
-                        String orgName = sysStaffOrgVo.getOrgName();
-                        record.setDeptName(orgName);
-                    }
-                }
-                record.setRankNo(id);
-                id = id + 1;
-            }
-        }
+//        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+//        int id = 1;
+//        if (!records.isEmpty()) {
+//            for (CrmCustomerTempExportVo record : records) {
+//                try {
+//                    Date date = sdf.parse(record.getCreateTime());
+//                    record.setCreateTime(sdf.format(date));
+//                } catch (ParseException e) {
+//                    e.printStackTrace();
+//                }
+//                String createOrgSid = record.getCreateOrgSid();
+//                String staffSid = record.getStaffSid();
+//                String createOrgName = sysOrganizationFeign.fetchBySid(createOrgSid).getData().getName();
+//                record.setCreateOrgName(createOrgName);
+//                List<SysStaffOrgVo> sysStaffOrgVos = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(staffSid).getData();
+//                for (SysStaffOrgVo sysStaffOrgVo : sysStaffOrgVos) {
+//                    SysOrganizationVo sysOrganizationVo = sysOrganizationFeign.fetchBySid(sysStaffOrgVo.getOrgSid()).getData();
+//                    String psid = sysOrganizationVo.getPsid();
+//                    if (psid.equals(createOrgSid)) {
+//                        String orgName = sysStaffOrgVo.getOrgName();
+//                        record.setDeptName(orgName);
+//                    }
+//                }
+//                record.setRankNo(id);
+//                id = id + 1;
+//            }
+//        }
         return records;
     }
 }
\ No newline at end of file