梳理数据报表模块，并且优化部分代码

1. 优化数据报表模块，公共导出的日志提示，原先没有使用占位符，调整为通过占位符输出指定内容的形式
2. 移除梳理代码过程中的类中无用的import，保持代码简洁
3. 移除梳理代码过程中类中注释的警告

commons/src/main/java/com/jzg/commons/entity/report/po/ReportUploadExcelTask.java

@@ -15,10 +15,10 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/16 15:30
- *  @Description: 导入任务表
+ * 导入任务表
+ *
+ * @author hxl
+ * @Date 2025/9/16 15:30
  */
 @TableName(value ="report_upload_excel_task")
 @Builder

consoleStatistics/src/main/java/com/jzg/console/controller/ReportBusinessDataManageController.java

@@ -3,7 +3,6 @@ package com.jzg.console.controller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jzg.commons.core.base.BaseController;
 import com.jzg.commons.core.page.HttpResult;
-import com.jzg.commons.entity.report.dto.ReportSearchConfigurationDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.*;
 import io.swagger.v3.oas.annotations.Operation;
@@ -12,13 +11,11 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 17:56
- *  @Description: 业务数据管理
+ * 业务数据管理
+ *
+ * @author hxl
+ * @Date 2025/9/22 17:56
  */
 @Slf4j
 @Tag(name="业务数据管理")
@@ -52,10 +49,10 @@ public class ReportBusinessDataManageController extends BaseController {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-保险公司-列表
+     * 业务数据-保险公司-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-保险公司-列表查询", description = "业务数据-保险公司-列表查询")
     @PostMapping(value = "/companyDataManagePageList")
@@ -64,14 +61,15 @@ public class ReportBusinessDataManageController extends BaseController {
             IPage<?> pageList = reportCompanyDataManageService.getPageListByParams(reportSearchCommonVo);
             return HttpResult.ok(pageList);
         }catch (Exception e){
+            log.error("业务数据-保险公司-列表查询", e);
             return HttpResult.error(e.getMessage());
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-保险公司-列表导出
+     * 业务数据-保险公司-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-保险公司-列表导出", description = "业务数据-保险公司-列表导出")
     @PostMapping(value = "/companyDataManageToTask")
@@ -84,10 +82,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-保险公司-明细查询", description = "业务数据-保险公司-明细查询")
     @PostMapping(value = "/companyDataManageDetailPageList")
@@ -100,10 +98,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细导出
+     * 业务数据-保险公司-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-保险公司-明细导出", description = "业务数据-保险公司-明细导出")
     @PostMapping(value = "/companyDataManageDetailToTask")
@@ -117,10 +115,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-险种报表-列表
+     * 业务数据-险种报表-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-险种报表-列表查询", description = "业务数据-险种报表-列表查询")
     @PostMapping(value = "/riskDataManagePageList")
@@ -133,10 +131,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-险种报表-列表导出
+     * 业务数据-险种报表-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-险种报表-列表导出", description = "业务数据-险种报表-列表导出")
     @PostMapping(value = "/riskDataManageToTask")
@@ -149,10 +147,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-险种报表-明细查询", description = "业务数据-险种报表-明细查询")
     @PostMapping(value = "/riskDataManageDetailPageList")
@@ -165,10 +163,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细导出
+     * 业务数据-保险公司-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-险种报表-明细导出", description = "业务数据-险种报表-明细导出")
     @PostMapping(value = "/riskDataManageDetailToPage")
@@ -182,10 +180,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-对接人-列表
+     * 业务数据-对接人-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-对接人-列表查询", description = "业务数据-对接人-列表查询")
     @PostMapping(value = "/contactPersonDataManagePageList")
@@ -198,10 +196,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-对接人-列表导出
+     * 业务数据-对接人-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-对接人-列表导出", description = "业务数据-对接人-列表导出")
     @PostMapping(value = "/contactPersonDataManageToTask")
@@ -214,10 +212,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-对接人-明细查询
+     * 业务数据-对接人-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-对接人-明细查询", description = "业务数据-对接人-明细查询")
     @PostMapping(value = "/contactPersonDataManageDetailPageList")
@@ -230,10 +228,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-对接人-明细导出
+     * 业务数据-对接人-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-对接人-明细导出", description = "业务数据-对接人-明细导出")
     @PostMapping(value = "/contactPersonDataManageDetailToTask")
@@ -247,10 +245,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-业务员-列表
+     * 业务数据-业务员-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-业务员-列表查询", description = "业务数据-业务员-列表查询")
     @PostMapping(value = "/salesmanDataManagePageList")
@@ -263,10 +261,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-业务员-列表导出
+     * 业务数据-业务员-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-业务员-列表导出", description = "业务数据-业务员-列表导出")
     @PostMapping(value = "/salesmanDataManageToTask")
@@ -279,10 +277,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-业务员-明细查询", description = "业务数据-业务员-明细查询")
     @PostMapping(value = "/salesmanDataManageDetailPageList")
@@ -295,10 +293,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-业务员-明细导出
+     * 业务数据-业务员-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-业务员-明细导出", description = "业务数据-业务员-明细导出")
     @PostMapping(value = "/salesmanDataManageDetailToTask")
@@ -312,10 +310,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-渠道-列表
+     * 业务数据-渠道-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-渠道-列表查询", description = "业务数据-渠道-列表查询")
     @PostMapping(value = "/channelDataManagePageList")
@@ -329,10 +327,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-渠道-列表导出
+     * 业务数据-渠道-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-渠道-列表导出", description = "业务数据-渠道-列表导出")
     @PostMapping(value = "/channelDataManageToTask")
@@ -345,10 +343,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-渠道-明细查询
+     * 业务数据-渠道-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-渠道-明细查询", description = "业务数据-渠道-明细查询")
     @PostMapping(value = "/channelDataManageDetailPageList")
@@ -361,10 +359,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-渠道-明细导出
+     * 业务数据-渠道-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-渠道-明细导出", description = "业务数据-渠道-明细导出")
     @PostMapping(value = "/channelDataManageDetailToTask")
@@ -378,10 +376,10 @@ public class ReportBusinessDataManageController extends BaseController {
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-电销-列表
+     * 业务数据-电销-列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:08
      */
     @Operation(summary = "业务数据-电销-列表查询", description = "业务数据-电销-列表查询")
     @PostMapping(value = "/telemarketingDataManagePageList")
@@ -394,10 +392,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:09
-     *  @Description: 业务数据-电销-列表导出
+     * 业务数据-电销-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:09
      */
     @Operation(summary = "业务数据-电销-列表导出", description = "业务数据-电销-列表导出")
     @PostMapping(value = "/telemarketingDataManageToTask")
@@ -410,10 +408,10 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-电销-明细查询
+     * 业务数据-电销-明细查询
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-电销-明细查询", description = "业务数据-电销-明细查询")
     @PostMapping(value = "/telemarketingDataManageDetailPageList")
@@ -426,10 +424,9 @@ public class ReportBusinessDataManageController extends BaseController {
         }
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-电销-明细导出
+     * 业务数据-电销-明细导出
+     * @author hxl
+     * @Date 2025/9/22 17:11
      */
     @Operation(summary = "业务数据-电销-明细导出", description = "业务数据-电销-明细导出")
     @PostMapping(value = "/telemarketingDataManageDetailToTask")

consoleStatistics/src/main/java/com/jzg/console/mapper/ReportCompanyDataManageMapper.java

@@ -1,37 +1,33 @@
 package com.jzg.console.mapper;
 
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.report.dto.ReportCompanyDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportUploadExcelTaskDto;
-import com.jzg.commons.entity.report.po.ReportUploadExcelTask;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
-import com.jzg.commons.entity.report.vo.ReportUploadExcelTaskVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/23 15:35
- *  @Description: 业务数据-保险公司
- */ 
+ * 业务数据-保险公司
+ *
+ *  @author hxl
+ *  @Date 2025/9/23 15:35
+ */
 public interface ReportCompanyDataManageMapper  {
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 15:37
-     *  @Description:  业务数据-保险公司-列表查询
+     * 业务数据-保险公司-列表查询
+     *
+     *  @author hxl
+     *  @Date 2025/9/23 15:37
      */
     IPage<ReportCompanyDataManageDto> getReportCompanyDataManagePageListByParams(@Param("page") Page<ReportCompanyDataManageDto> page, @Param("vo") ReportSearchCommonVo reportSearchCommonVo);
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 15:37
-     *  @Description:  业务数据-保险公司-导出查询
+     * 业务数据-保险公司-导出查询
+     *
+     *  @author hxl
+     *  @Date 2025/9/23 15:37
      */
     List<ReportCompanyDataManageDto> getReportCompanyDataManageAllListByParams(@Param("vo") ReportSearchCommonVo reportSearchCommonVo);
 }

consoleStatistics/src/main/java/com/jzg/console/service/ReportBaseService.java

@@ -4,43 +4,43 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  基础的实现类
- */ 
+ * 基础的实现类
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportBaseService {
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  查询列表
+     *  业务数据-保险公司-列表
+     *
+     *  @author hxl
+     *  @Date 2025/9/22 17:02
      */
     IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo);
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  导出列表
+     * 导出列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:02
      */
     void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo);
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  查询详情列表
+     * 查询详情列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:02
      */
     IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:02
-     *  @Description:  导出详情列表
+     * 导出详情列表
+     *
+     * @author hxl
+     * @Date 2025/9/22 17:02
      */
     void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 

consoleStatistics/src/main/java/com/jzg/console/service/ReportCompanyDataManageService.java

@@ -1,11 +1,11 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  业务数据-保险公司
- */ 
+ * 业务数据-保险公司
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportCompanyDataManageService extends  ReportBaseService{
 
 }

consoleStatistics/src/main/java/com/jzg/console/service/ReportContactPersonDataManageService.java

@@ -1,11 +1,10 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  业务数据-对接人
- */ 
+ * 业务数据-对接人
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportContactPersonDataManageService extends  ReportBaseService{
 
 }

consoleStatistics/src/main/java/com/jzg/console/service/ReportRiskDataManageService.java

@@ -1,11 +1,11 @@
 package com.jzg.console.service;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  业务数据-险种报表
- */ 
+ * 业务数据-险种报表
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
+ */
 public interface ReportRiskDataManageService extends  ReportBaseService{
 
 }

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportBaseServiceImpl.java

@@ -1,13 +1,10 @@
 package com.jzg.console.service.impl;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.jzg.commons.entity.report.dto.ReportCompanyDataManageDto;
 import com.jzg.commons.entity.report.po.ReportUploadExcelTask;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.commons.util.MinioUtils;
 import com.jzg.console.service.ReportUploadExcelTaskService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -16,10 +13,10 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version 
- *  @author: hxl
- *  @Date: 2025/9/22 16:43
- *  @Description:  基础的实现类处理导出excel逻辑
+ * 基础的实现类处理导出excel逻辑
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:43
  */
 @Slf4j
 @Service
@@ -34,11 +31,11 @@ public class ReportBaseServiceImpl {
     // 从配置文件获取存储桶名称
     @Value("${minio.bucket-name:excel-files}")
     private String bucketName;
+
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:28
-     *  @Description:  通用上传文件
+     * 通用上传文件
+     * @author hxl
+     * @Date 2025/9/24 10:28
      */
     public <T> void upLoadFile(ReportSearchCommonVo reportSearchCommonVo, Class<T> clazz, List<T> list, String upLoadName) {
         //打印导入数据的时间
@@ -53,14 +50,14 @@ public class ReportBaseServiceImpl {
                 .readStatus(0)
                 .build();
         reportUploadExcelTaskService.save(reportUploadExcelTask);
-        long endTime = System.currentTimeMillis();
+        long endTime;
         try{
             String fileName = MinioUtils.exportAndUploadToMinIO(upLoadName, clazz, list,bucketName,minioUrl);
             endTime = System.currentTimeMillis();
             long duration = endTime - startTime;
             double minutes = (double) duration / (1000 * 60);
-            log.info("方法执行时间: " + minutes + " 分钟");
-            log.debug("方法执行时间: " + minutes + " 分钟");
+            log.info("MinioUtils.exportAndUploadToMinIO方法执行时间:[{}]分钟", minutes);
+            log.debug("MinioUtils.exportAndUploadToMinIO方法执行时间[{}]分钟", minutes);
             reportUploadExcelTask.setTaskStatus(2);
             reportUploadExcelTask.setUploadMinutes(minutes);
             reportUploadExcelTask.setFilePath(fileName);
@@ -68,8 +65,8 @@ public class ReportBaseServiceImpl {
             endTime = System.currentTimeMillis();
             long duration = endTime - startTime;
             double minutes = (double) duration / (1000 * 60);
-            log.info("方法执行时间: " + minutes + " 分钟");
-            log.debug("方法执行时间: " + minutes + " 分钟");
+            log.info("MinioUtils.exportAndUploadToMinIO方法执行异常，方法执行时间[{}]分钟 ", minutes);
+            log.debug("MinioUtils.exportAndUploadToMinIO方法执行异常方法执行时间[{}]分钟",minutes);
             reportUploadExcelTask.setTaskStatus(0);
             reportUploadExcelTask.setUploadMinutes(minutes);
             reportUploadExcelTask.setUploadMsg(e.getMessage());

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportCompanyDataManageServiceImpl.java

@@ -18,10 +18,10 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  业务数据-保险公司
+ * 业务数据-保险公司
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:45
  */
 @Slf4j
 @Service
@@ -32,22 +32,21 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 11:49
-     *  @Description:  业务数据-保险公司-列表查询
+     * 业务数据-保险公司-列表查询
+     *
+     * @author hxl
+     * @Date 2025/9/23 11:49
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
         Page<ReportCompanyDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportCompanyDataManageDto> orderList = reportCompanyDataManageMapper.getReportCompanyDataManagePageListByParams(page, reportSearchCommonVo);
-        return orderList;
+        return reportCompanyDataManageMapper.getReportCompanyDataManagePageListByParams(page, reportSearchCommonVo);
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:21
-     *  @Description: 列表导出
+     * 列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 10:21
      */
     @Async
     @Override
@@ -56,10 +55,10 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
         upLoadFile(reportSearchCommonVo, ReportCompanyDataManageDto.class,list,"业务数据-保险公司-列表查询-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/23 11:49
-     *  @Description:  业务数据-保险公司-明细查询
+     * 业务数据-保险公司-明细查询
+     *
+     *  @author hxl
+     *  @Date 2025/9/23 11:49
      */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -67,17 +66,17 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
         IPage<ReportCompanyDataManageDetailDto> detailPageList = new Page<ReportCompanyDataManageDetailDto>();
         List<ReportCompanyDataManageDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(1L);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:39
-     *  @Description:  业务数据-保险公司-明细导出
+     * 业务数据-保险公司-明细导出
+     *
+     *  @author hxl
+     *  @Date 2025/9/24 10:39
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -85,10 +84,10 @@ public class ReportCompanyDataManageServiceImpl extends ReportBaseServiceImpl im
         upLoadFile(reportSearchCommonVo, ReportCompanyDataManageDetailDto.class,detailList,"业务数据-保险公司-明细导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     *
+     *  @author hxl
+     *  @Date 2025/9/24 10:42
      */
     public List<ReportCompanyDataManageDetailDto>  getDetailList(){
          List<ReportCompanyDataManageDetailDto> list =new ArrayList<>();

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportContactPersonDataManageServiceImpl.java

@@ -1,20 +1,12 @@
 package com.jzg.console.service.impl;
 
 
-import com.alibaba.excel.annotation.ExcelIgnore;
-import com.alibaba.excel.annotation.ExcelProperty;
-import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.jzg.commons.entity.report.dto.ReportContactPersonDataManageDetailDto;
 import com.jzg.commons.entity.report.dto.ReportContactPersonDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportContactPersonDataManageService;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -23,20 +15,20 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  业务数据-对接人
+ * 业务数据-对接人
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:45
  */
 @Service
 public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceImpl  implements ReportContactPersonDataManageService {
 
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:12
-     *  @Description: 业务数据-对接人-列表查询
+     * 业务数据-对接人-列表查询
+     *
+     * @author hxl
+     * @Date 2025/9/24 14:12
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -44,17 +36,17 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
         IPage<ReportContactPersonDataManageDto> pageList = new Page<ReportContactPersonDataManageDto>();
         List<ReportContactPersonDataManageDto> list = getList();
         pageList.setRecords(list);
-        pageList.setTotal(1l);
+        pageList.setTotal(1L);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:13
-     *  @Description:  业务数据-对接人-列表导出
+     * 业务数据-对接人-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 14:13
      */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -62,10 +54,10 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
         upLoadFile(reportSearchCommonVo, ReportContactPersonDataManageDto.class,list,"业务数据-对接人-列表导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:13
-     *  @Description: 业务数据-对接人-明细列表
+     * 业务数据-对接人-明细列表
+     *
+     * @author hxl
+     * @Date 2025/9/24 14:13
      */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -73,17 +65,17 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
         IPage<ReportContactPersonDataManageDetailDto> detailPageList = new Page<ReportContactPersonDataManageDetailDto>();
         List<ReportContactPersonDataManageDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(1L);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 14:13
-     *  @Description: 业务数据-对接人-明细导出
+     *  
+     * @author hxl
+     * @Date 2025/9/24 14:13
+     *   业务数据-对接人-明细导出
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -92,10 +84,11 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     *  TODO 这里使用的也是假数据
+     * @author hxl
+     * @Date 2025/9/24 10:42
+     *
      */
     public List<ReportContactPersonDataManageDto>  getList(){
         List<ReportContactPersonDataManageDto> list =new ArrayList<>();
@@ -109,10 +102,10 @@ public class ReportContactPersonDataManageServiceImpl extends ReportBaseServiceI
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     *
+     * @author hxl
+     * @Date 2025/9/24 10:42
      */
     public List<ReportContactPersonDataManageDetailDto>  getDetailList(){
         List<ReportContactPersonDataManageDetailDto> list =new ArrayList<>();

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportRiskDataManageServiceImpl.java

@@ -1,11 +1,14 @@
 package com.jzg.console.service.impl;
 
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
 import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportRiskDataManageService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -13,19 +16,20 @@ import java.util.Date;
 import java.util.List;
 
 /**
- *  @version
- *  @author: hxl
- *  @Date: 2025/9/22 16:45
- *  @Description:  业务数据-险种报表
+ * 业务数据-险种报表
+ *
+ * @author hxl
+ * @Date 2025/9/22 16:45
  */
 @Service
 public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  implements ReportRiskDataManageService {
 
+    private static final Logger log = LoggerFactory.getLogger(ReportRiskDataManageServiceImpl.class);
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:26
-     *  @Description:  业务数据-险种报表-列表查詢
+     * 业务数据-险种报表-列表查詢
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:26
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -33,17 +37,17 @@ public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  impl
         IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
         List<ReportRiskDataManageDto> list = getList();
         pageList.setRecords(list);
-        pageList.setTotal(1l);
+        pageList.setTotal(1L);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageNo());
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:27
-     *  @Description:  业务数据-险种报表-列表导出
+     * 业务数据-险种报表-列表导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:27
      */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -51,10 +55,10 @@ public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  impl
         upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:27
-     *  @Description:  业务数据-险种报表-明细
+     * 业务数据-险种报表-明细
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:27
      */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
@@ -62,45 +66,45 @@ public class ReportRiskDataManageServiceImpl extends ReportBaseServiceImpl  impl
         IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
         List<ReportRiskDataManageDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
+        detailPageList.setTotal(1L);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageNo());
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 11:27
-     *  @Description:  业务数据-险种报表-明细导出
+     * 业务数据-险种报表-明细导出
+     *
+     * @author hxl
+     * @Date 2025/9/24 11:27
      */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
+        log.info("业务数据-险种报表-明细导出, 导出条件reportSearchCommonVo=[{}]", JSONUtil.toJsonStr(reportSearchCommonVo));
         List<ReportRiskDataManageDetailDto> detailList = getDetailList();
         upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     * TODO 这里使用的是假数据，没有从数据库里面获取数据
+     * @author hxl
+     * @Date 2025/9/24 10:42
      */
     public List<ReportRiskDataManageDto>  getList(){
         List<ReportRiskDataManageDto> list =new ArrayList<>();
         ReportRiskDataManageDto reportRiskDataManageDto = ReportRiskDataManageDto.builder()
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
-                .riskName("单交").quoteCountNum(1000l).quoteOrderNum(500l).underwriteOrderNum(300l).underwritePremium(new BigDecimal(456))
+                .riskName("单交").quoteCountNum(1000L).quoteOrderNum(500L).underwriteOrderNum(300L).underwritePremium(new BigDecimal(456))
                 .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
         list.add(reportRiskDataManageDto);
         return list;
     }
 
     /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/24 10:42
-     *  @Description:  模拟数据
+     * 模拟数据
+     * @author hxl
+     * @Date 2025/9/24 10:42
      */
     public List<ReportRiskDataManageDetailDto>  getDetailList(){
         List<ReportRiskDataManageDetailDto> list =new ArrayList<>();