2024-05-01-2 报表修改

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/controller/admin/CustomerAnalysisControl.java

 package cn.iocoder.yudao.module.delivery.controller.admin;
 
+import cn.iocoder.yudao.framework.apollo.core.event.export.ReportCustomerAnalysisExcelExportEvent;
 import cn.iocoder.yudao.framework.common.exception.ErrorCode;
 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
 import cn.iocoder.yudao.framework.dict.core.dto.DictDataRespDTO;
 import cn.iocoder.yudao.framework.excel.util.ExcelUtils;
 import cn.iocoder.yudao.framework.i18n.core.I18nMessage;
@@ -29,6 +31,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -86,6 +89,9 @@ public class CustomerAnalysisControl {
     @Resource
     private FileMakeApi fileMakeApi;
 
+    @Resource
+    private ApplicationContext applicationContext;
+
 
     /*
      客户分析列表lanbm 2024-04-02 add
@@ -122,7 +128,6 @@ public class CustomerAnalysisControl {
                 CustomerAnalysisReq.class);
 
 
-
         PageResult<CustomerAnalysisResp> pageResult =
                 customerAnalysisService.GetDataResult(query);
 
@@ -137,7 +142,24 @@ public class CustomerAnalysisControl {
         query = customerAnalysisService.getDataWhere(query);
         System.out.println("处理后的查询条件：" + query);
 
-        /*
+        List<CustomerAnalysisResp> list =
+                customerAnalysisService.GetDataListResult(query);
+        List<CustomerAnalysisExcelResp> listExel =
+                CustomerAnalysis.INSTANCE.convertList(list);
+        // 导出 Excel
+        ExcelUtils.write(response, "客户分析报表.xls", "客户分析报表",
+                CustomerAnalysisExcelResp.class, listExel);
+    }
+
+    @GetMapping("/exportExcel2")
+    @ApiOperation("导出客户分析数据")
+    @OperateLog(type = EXPORT)
+    public CommonResult<Boolean> export2(HttpServletResponse response,
+                                         @Valid CustomerAnalysisReq query) throws IOException {
+        query = customerAnalysisService.getReq(query);
+        query = customerAnalysisService.getDataWhere(query);
+        System.out.println("处理后的查询条件：" + query);
+
         FileMakeReqDTO reqDTO = new FileMakeReqDTO();
         reqDTO.setType(DownloadTypeEnum.REPORT_CSSTOMER_ANALYSIS.getType());
         reqDTO.setName("客户分析报表");
@@ -149,16 +171,6 @@ public class CustomerAnalysisControl {
         fileMakeApi.sendFileMake(reqDTO);
         return CommonResult.success(true);
 
-         */
-        List<CustomerAnalysisResp> list =
-                customerAnalysisService.GetDataListResult(query);
-        List<CustomerAnalysisExcelResp> listExel =
-                CustomerAnalysis.INSTANCE.convertList(list);
-        // 导出 Excel
-        ExcelUtils.write(response, "客户分析报表.xls", "客户分析报表",
-                CustomerAnalysisExcelResp.class, listExel);
-
-
     }
 
 

yudao-module-delivery/yudao-module-delivery-rest/src/main/java/cn/iocoder/yudao/module/delivery/listener/CustomerAnalysisExcelExportListener.java

@@ -20,7 +20,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.time.LocalDateTime;
@@ -49,6 +48,7 @@ public class CustomerAnalysisExcelExportListener {
     @EventListener(ReportCustomerAnalysisExcelExportEvent.class)
     public void CustomerAnalysisExcelExportPushEvent(
             ReportCustomerAnalysisExcelExportEvent event) {
+
         if (StringUtils.isNotBlank(event.getRequestParams())) {
             try {