Просмотр исходного кода

1.使用模拟数据提交人员数据接口
2.使用模拟数据提交任务数据接口

hxl13994548489 1 год назад
Родитель
Сommit
5dc134038c
29 измененных файлов с 3487 добавлено и 245 удалено
  1. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportChannelPersonDataDetailDto.java
  2. 137 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportChannelPersonDataDto.java
  3. 169 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCompanyDataDetailDto.java
  4. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCompanyDataDto.java
  5. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCostVerificationDataDetailDto.java
  6. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCostVerificationDataDto.java
  7. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportMeetDataDetailDto.java
  8. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportMeetDataDto.java
  9. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportOperatingProfitDataDto.java
  10. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDetailDto.java
  11. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDto.java
  12. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDetailDto.java
  13. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDto.java
  14. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanBusinessDetailDto.java
  15. 152 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataDetailDto.java
  16. 155 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataDto.java
  17. 126 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDeptDetailDto.java
  18. 97 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDeptDto.java
  19. 157 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanReportDetailDto.java
  20. 141 0
      commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanReportDto.java
  21. 21 0
      consoleStatistics/src/main/java/com/jzg/console/service/ReportSalesmanDeptService.java
  22. 48 31
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportChannelDataServiceImpl.java
  23. 51 30
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportChannelPersonDataServiceImpl.java
  24. 53 30
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportCompanyDataServiceImpl.java
  25. 53 31
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportSalesmanDataServiceImpl.java
  26. 97 30
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportSalesmanDeptServiceImpl.java
  27. 52 31
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportSalesmanReportServiceImpl.java
  28. 49 32
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportTelemarketingDataServiceImpl.java
  29. 45 30
      consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportTelemarketingPersonDataServiceImpl.java

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportChannelPersonDataDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-渠道数据-详情
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-渠道数据-详情")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportChannelPersonDataDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  出单佣金
+     */
+    @ExcelProperty(value = "出单佣金", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "出单佣金")
+    private BigDecimal orderCommissionPremium;
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 11)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 12)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 137 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportChannelPersonDataDto.java

@@ -0,0 +1,137 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-渠道数据-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-渠道数据-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportChannelPersonDataDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+    /**
+     *  所属机构
+     */
+    @ExcelProperty(value = "所属机构", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "所属机构")
+    private String deptName;
+
+    /**
+     *  所在地区
+     */
+    @ExcelProperty(value = "所在地区", index = 3)
+    @ColumnWidth(25)
+    @Schema(description = "所在地区")
+    private String areaName;
+
+    /**
+     *  承保订单
+     */
+    @ExcelProperty(value = "承保订单", index = 4)
+    @ColumnWidth(20)
+    @Schema(description = "承保订单")
+    private Long underwriteOrderNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 5)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  出单佣金
+     */
+    @ExcelProperty(value = "出单佣金", index = 6)
+    @ColumnWidth(20)
+    @Schema(description = "出单佣金")
+    private BigDecimal orderCommissionPremium;
+
+    /**
+     *  单均保费
+     */
+    @ExcelProperty(value = "单均保费", index = 8)
+    @ColumnWidth(20)
+    @Schema(description = "单均保费")
+    private BigDecimal avgOrderNumPremium;
+
+    /**
+     *  上次登录
+     */
+    @ExcelProperty(value = "上次登录", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Schema(description = "上次登录")
+    private Date lastLoginTime;
+
+    /**
+     *  上次签单
+     */
+    @ExcelProperty(value = "上次签单", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Schema(description = "上次签单")
+    private Date lastRecordTime;
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+
+    /**
+     *  人员状态
+     */
+    @ExcelProperty(value = "人员状态", index = 12)
+    @ColumnWidth(15)
+    @Schema(description = "人员状态")
+    private String personStatus;
+    /**
+     *  账号状态
+     */
+    @ExcelProperty(value = "账号状态", index = 13)
+    @ColumnWidth(10)
+    @Schema(description = "账号状态")
+    private String accountStatus;
+}

+ 169 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCompanyDataDetailDto.java

@@ -0,0 +1,169 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  任务数据-业务员-明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "任务数据-业务员-明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportCompanyDataDetailDto {
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 0)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 1)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+
+    /**
+     *  报价订单
+     */
+    @ExcelProperty(value = "报价订单", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "报价订单")
+    private Long quoteOrderNum;
+
+    /**
+     *  代客录单
+     */
+    @ExcelProperty(value = "代客录单", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "代客录单")
+    private Long proxyCustomerOrderNum;
+
+
+    /**
+     *  pc报价中
+     */
+    @ExcelProperty(value = "pc报价中", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "pc报价中")
+    private Long pcOrderNum;
+
+    /**
+     *  app报价中
+     */
+    @ExcelProperty(value = "app报价中", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "app报价中")
+    private Long appOrderNum;
+
+
+    /**
+     *  待缴费
+     */
+    @ExcelProperty(value = "待缴费", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "待缴费")
+    private Long payPendingOrderNum;
+    /**
+     *  核保失败
+     */
+    @ExcelProperty(value = "核保失败", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "核保失败")
+    private Long underwritRejectNum;
+
+    /**
+     *  报价率
+     */
+    @ExcelProperty(value = "报价率", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "报价率")
+    private BigDecimal quoteOrderRate;
+
+
+    /**
+     *  核保通过率
+     */
+    @ExcelProperty(value = "核保通过率", index = 10)
+    @ColumnWidth(20)
+    @Schema(description = "核保通过率")
+    private BigDecimal underwritPassRate;
+
+    /**
+     *  承保率
+     */
+    @ExcelProperty(value = "承保率", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "承保率")
+    private BigDecimal underwriteRate;
+
+    /**
+     *  补录订单
+     */
+    @ExcelProperty(value = "补录订单", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录订单")
+    private Long additionalRecordingOrderNum;
+
+    /**
+     *  补录待审核
+     */
+    @ExcelProperty(value = "补录待审核", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录待审核")
+    private Long additionalRecordingPendingApprovalOrderNum;
+
+    /**
+     *  补录审核通过
+     */
+    @ExcelProperty(value = "补录审核通过", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录审核通过")
+    private Long additionalRecordingApprovalOrderNum;
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCompanyDataDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.math.BigDecimal;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  任务数据-保险公司-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "任务数据-保险公司-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportCompanyDataDto {
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 0)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 1)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  报价订单
+     */
+    @ExcelProperty(value = "报价订单", index = 2)
+    @ColumnWidth(15)
+    @Schema(description = "报价订单")
+    private Long quoteOrderNum;
+
+    /**
+     *  代客录单
+     */
+    @ExcelProperty(value = "代客录单", index = 3)
+    @ColumnWidth(15)
+    @Schema(description = "代客录单")
+    private Long proxyCustomerOrderNum;
+
+
+    /**
+     *  pc报价中
+     */
+    @ExcelProperty(value = "pc报价中", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "pc报价中")
+    private Long pcOrderNum;
+
+    /**
+     *  app报价中
+     */
+    @ExcelProperty(value = "app报价中", index = 5)
+    @ColumnWidth(10)
+    @Schema(description = "app报价中")
+    private Long appOrderNum;
+
+
+    /**
+     *  待缴费
+     */
+    @ExcelProperty(value = "待缴费", index = 6)
+    @ColumnWidth(10)
+    @Schema(description = "待缴费")
+    private Long payPendingOrderNum;
+    /**
+     *  核保失败
+     */
+    @ExcelProperty(value = "核保不通过", index = 7)
+    @ColumnWidth(20)
+    @Schema(description = "核保不通过")
+    private Long underwritRejectNum;
+
+
+    /**
+     *  核保通过率
+     */
+    @ExcelProperty(value = "核保通过率", index = 8)
+    @ColumnWidth(20)
+    @Schema(description = "核保通过率")
+    private BigDecimal underwritPassRate;
+
+    /**
+     *  承保率
+     */
+    @ExcelProperty(value = "承保率", index = 9)
+    @ColumnWidth(15)
+    @Schema(description = "承保率")
+    private BigDecimal underwriteRate;
+
+    /**
+     *  补录订单
+     */
+    @ExcelProperty(value = "补录订单", index = 10)
+    @ColumnWidth(15)
+    @Schema(description = "补录订单")
+    private Long additionalRecordingOrderNum;
+
+    /**
+     *  补录待审核
+     */
+    @ExcelProperty(value = "补录待审核", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录待审核")
+    private Long additionalRecordingPendingApprovalOrderNum;
+
+    /**
+     *  补录审核通过
+     */
+    @ExcelProperty(value = "补录审核通过", index = 12)
+    @ColumnWidth(15)
+    @Schema(description = "补录审核通过")
+    private Long additionalRecordingApprovalOrderNum;
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 13)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCostVerificationDataDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-费用校验-明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-费用校验-明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportCostVerificationDataDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCostVerificationDataDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-费用校验-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "任务数据-业务员-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportCostVerificationDataDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportMeetDataDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-应付-详情
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-应付-详情")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportMeetDataDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportMeetDataDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-应付-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-应付-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportMeetDataDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportOperatingProfitDataDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-经营利润-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-经营利润-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportOperatingProfitDataDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-人员审核-明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-人员审核-明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportPersonCheckDataDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-人员审核-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-人员审核-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportPersonCheckDataDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-应收-明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-应收-明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportReceivableDataDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  财务数据-应收-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "财务数据-应收-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportReceivableDataDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价次数
+     */
+    @ExcelProperty(value = "报价次数", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "报价次数")
+    private Long quoteCountNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanBusinessDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-业务员报表-业务明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-业务员报表-业务明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanBusinessDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  出单佣金
+     */
+    @ExcelProperty(value = "出单佣金", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "出单佣金")
+    private BigDecimal orderCommissionPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 152 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataDetailDto.java

@@ -0,0 +1,152 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  任务数据-业务员-明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "任务数据-业务员-明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanDataDetailDto {
+
+    /**
+     *  姓名
+     */
+    @ExcelProperty(value = "姓名", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "姓名")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+
+    /**
+     *  所属机构
+     */
+    @ExcelProperty(value = "所属机构", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "所属机构")
+    private String deptName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 3)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 6)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+
+    /**
+     *  报价来源
+     */
+    @ExcelProperty(value = "报价来源", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "报价来源")
+    private String orderSourceName;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  状态
+     */
+    @ExcelProperty(value = "状态", index = 9)
+    @ColumnWidth(10)
+    @Schema(description = "状态")
+    private String orderStatusName;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 11)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 12)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 13)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+}

+ 155 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataDto.java

@@ -0,0 +1,155 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  任务数据-业务员-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "任务数据-业务员-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanDataDto {
+
+    /**
+     *  姓名
+     */
+    @ExcelProperty(value = "姓名", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "姓名")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     *  所属机构
+     */
+    @ExcelProperty(value = "所属机构", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "所属机构")
+    private String deptName;
+
+    /**
+     *  报价订单
+     */
+    @ExcelProperty(value = "报价订单", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "报价订单")
+    private Long quoteOrderNum;
+
+    /**
+     *  代客录单
+     */
+    @ExcelProperty(value = "代客录单", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "代客录单")
+    private Long proxyCustomerOrderNum;
+
+
+    /**
+     *  pc报价中
+     */
+    @ExcelProperty(value = "pc报价中", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "pc报价中")
+    private Long pcOrderNum;
+
+    /**
+     *  app报价中
+     */
+    @ExcelProperty(value = "app报价中", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "app报价中")
+    private Long appOrderNum;
+
+
+    /**
+     *  待缴费
+     */
+    @ExcelProperty(value = "待缴费", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "待缴费")
+    private Long payPendingOrderNum;
+    /**
+     *  核保失败
+     */
+    @ExcelProperty(value = "核保失败", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "核保失败")
+    private Long underwritRejectNum;
+
+
+    /**
+     *  核保通过率
+     */
+    @ExcelProperty(value = "核保通过率", index = 10)
+    @ColumnWidth(20)
+    @Schema(description = "核保通过率")
+    private BigDecimal underwritPassRate;
+
+    /**
+     *  承保率
+     */
+    @ExcelProperty(value = "承保率", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "承保率")
+    private BigDecimal underwriteRate;
+
+    /**
+     *  补录订单
+     */
+    @ExcelProperty(value = "补录订单", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录订单")
+    private Long additionalRecordingOrderNum;
+
+    /**
+     *  补录待审核
+     */
+    @ExcelProperty(value = "补录待审核", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录待审核")
+    private Long additionalRecordingPendingApprovalOrderNum;
+
+    /**
+     *  补录审核通过
+     */
+    @ExcelProperty(value = "补录审核通过", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "补录审核通过")
+    private Long additionalRecordingApprovalOrderNum;
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 126 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDeptDetailDto.java

@@ -0,0 +1,126 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-业务员报表-人员明细
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-业务员报表-人员明细")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanDeptDetailDto {
+
+    /**
+     *  姓名
+     */
+    @ExcelProperty(value = "姓名", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "姓名")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     *  所属机构
+     */
+    @ExcelProperty(value = "所属机构", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "所属机构")
+    private String deptName;
+
+    /**
+     *  类型
+     */
+    @ExcelProperty(value = "类型", index = 3)
+    @ColumnWidth(10)
+    @Schema(description = "类型")
+    private String salesmanTypeName;
+
+    /**
+     *  归属
+     */
+    @ExcelProperty(value = "归属", index = 4)
+    @ColumnWidth(10)
+    @Schema(description = "归属")
+    private String salesmanTypeDeptName;
+
+    /**
+     *  承保订单
+     */
+    @ExcelProperty(value = "承保订单", index = 5)
+    @ColumnWidth(20)
+    @Schema(description = "承保订单")
+    private Long underwriteOrderNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 6)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+
+    /**
+     *  出单佣金
+     */
+    @ExcelProperty(value = "出单佣金", index = 7)
+    @ColumnWidth(20)
+    @Schema(description = "出单佣金")
+    private BigDecimal orderCommissionPremium;
+    /**
+     *  单均保费
+     */
+    @ExcelProperty(value = "单均保费", index = 8)
+    @ColumnWidth(20)
+    @Schema(description = "单均保费")
+    private BigDecimal avgOrderNumPremium;
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 9)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+
+    /**
+     *  人员状态
+     */
+    @ExcelProperty(value = "人员状态", index = 10)
+    @ColumnWidth(15)
+    @Schema(description = "人员状态")
+    private String personStatus;
+    /**
+     *  账号状态
+     */
+    @ExcelProperty(value = "账号状态", index = 11)
+    @ColumnWidth(10)
+    @Schema(description = "账号状态")
+    private String accountStatus;
+}

+ 97 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDeptDto.java

@@ -0,0 +1,97 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-业务员组织-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-业务员组织-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanDeptDto {
+
+    /**
+     *  类型
+     */
+    @ExcelProperty(value = "类型", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "类型")
+    private String salesmanTypeName;
+
+    /**
+     *  名称
+     */
+    @ExcelProperty(value = "名称", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "名称")
+    private String salesmanTypeDeptName;
+
+    /**
+     *  所属机构
+     */
+    @ExcelProperty(value = "所属机构", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "所属机构")
+    private String deptName;
+
+    /**
+     *  所在地区
+     */
+    @ExcelProperty(value = "所在地区", index = 3)
+    @ColumnWidth(25)
+    @Schema(description = "所在地区")
+    private String areaName;
+
+    /**
+     *  出单人力
+     */
+    @ExcelProperty(value = "出单人力", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "出单人力")
+    private Long avgOrderPersonNum;
+
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 5)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  承保订单
+     */
+    @ExcelProperty(value = "承保订单", index = 6)
+    @ColumnWidth(20)
+    @Schema(description = "承保订单")
+    private Long underwriteOrderNum;
+
+    /**
+     *  出单人数
+     */
+    @ExcelProperty(value = "出单人数", index =7)
+    @ColumnWidth(20)
+    @Schema(description = "出单人数")
+    private Long sumPersonNum;
+}

+ 157 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanReportDetailDto.java

@@ -0,0 +1,157 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-业务员报表-详情
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-业务员报表-详情")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanReportDetailDto {
+
+    /**
+     *  业务员
+     */
+    @ExcelProperty(value = "业务员", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "业务员")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     * 保险公司id
+     */
+    @ExcelIgnore
+    @Schema(description = "保险公司id")
+    private String companyId;
+    /**
+     * 保险公司名称
+     */
+    @ExcelProperty(value = "保险公司", index = 2)
+    @ColumnWidth(20)
+    @Schema(description = "保险公司")
+    private String companyName;
+
+
+    /**
+     *  合作保险公司Id
+     */
+    @ExcelIgnore
+    @Schema(description = "合作保险公司Id")
+    private String partnerCompanyId;
+    /**
+     *  合作保险公司名称
+     */
+    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "合作保险公司")
+    private String partnerCompanyName;
+
+    /**
+     *  订单号
+     */
+    @ExcelProperty(value = "订单号", index = 4)
+    @ColumnWidth(15)
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    /**
+     *  车牌号
+     */
+    @ExcelProperty(value = "车牌号", index = 5)
+    @ColumnWidth(15)
+    @Schema(description = "车牌号")
+    private String licenseNo;
+
+
+    /**
+     *  订单类型
+     */
+    @ExcelProperty(value = "订单类型", index = 6)
+    @ColumnWidth(15)
+    @Schema(description = "订单类型")
+    private String orderTypeName;
+
+    /**
+     *  险种
+     */
+    @ExcelProperty(value = "险种", index = 7)
+    @ColumnWidth(10)
+    @Schema(description = "险种")
+    private String riskName;
+
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  出单佣金
+     */
+    @ExcelProperty(value = "出单佣金", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "出单佣金")
+    private BigDecimal orderCommissionPremium;
+
+    /**
+     *  录单时间
+     */
+    @ExcelProperty(value = "录单时间", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "录单时间")
+    private Date createTime;
+
+
+    /**
+     *  签单时间
+     */
+    @ExcelProperty(value = "签单时间", index = 11)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "签单时间")
+    private Date recordTime;
+
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 12)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+}

+ 141 - 0
commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanReportDto.java

@@ -0,0 +1,141 @@
+package com.jzg.commons.entity.report.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ *  @version
+ *  @author: hxl
+ *  @Date: 2025/9/23 11:51
+ *  @Description:  人员数据-业务员报表-列表
+ */
+@HeadRowHeight(20)
+@ContentRowHeight(15)
+@Data
+@Builder
+@Schema(description = "人员数据-业务员报表-列表")
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReportSalesmanReportDto {
+
+    /**
+     *  姓名
+     */
+    @ExcelProperty(value = "姓名", index = 0)
+    @ColumnWidth(10)
+    @Schema(description = "姓名")
+    private String salesmanName;
+
+    /**
+     *  业务员手机号
+     */
+    @ExcelProperty(value = "手机号", index = 1)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String salesmanPhone;
+
+    /**
+     *  所属机构
+     */
+    @ExcelProperty(value = "所属机构", index = 3)
+    @ColumnWidth(20)
+    @Schema(description = "所属机构")
+    private String deptName;
+
+    /**
+     *  所在地区
+     */
+    @ExcelProperty(value = "所在地区", index = 4)
+    @ColumnWidth(25)
+    @Schema(description = "所在地区")
+    private String areaName;
+
+    /**
+     *  承保订单
+     */
+    @ExcelProperty(value = "承保订单", index = 5)
+    @ColumnWidth(20)
+    @Schema(description = "承保订单")
+    private Long underwriteOrderNum;
+    /**
+     *  保费
+     */
+    @ExcelProperty(value = "保费", index =6)
+    @ColumnWidth(10)
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
+
+    /**
+     *  出单佣金
+     */
+    @ExcelProperty(value = "出单佣金", index = 7)
+    @ColumnWidth(20)
+    @Schema(description = "出单佣金")
+    private BigDecimal orderCommissionPremium;
+
+    /**
+     *  单均保费
+     */
+    @ExcelProperty(value = "单均保费", index = 8)
+    @ColumnWidth(20)
+    @Schema(description = "单均保费")
+    private BigDecimal avgOrderNumPremium;
+
+    /**
+     *  上次登录
+     */
+    @ExcelProperty(value = "上次登录", index = 9)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Schema(description = "上次登录")
+    private Date lastLoginTime;
+
+    /**
+     *  上次签单
+     */
+    @ExcelProperty(value = "上次签单", index = 10)
+    @ColumnWidth(20)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern="yyyy-MM-dd")
+    @Schema(description = "上次签单")
+    private Date lastRecordTime;
+
+    /**
+     *  管理人
+     */
+    @ExcelProperty(value = "管理人", index = 11)
+    @ColumnWidth(15)
+    @Schema(description = "管理人")
+    private String manegerName;
+
+
+    /**
+     *  人员状态
+     */
+    @ExcelProperty(value = "人员状态", index = 12)
+    @ColumnWidth(15)
+    @Schema(description = "人员状态")
+    private String personStatus;
+    /**
+     *  账号状态
+     */
+    @ExcelProperty(value = "账号状态", index = 13)
+    @ColumnWidth(10)
+    @Schema(description = "账号状态")
+    private String accountStatus;
+
+}

+ 21 - 0
consoleStatistics/src/main/java/com/jzg/console/service/ReportSalesmanDeptService.java

@@ -1,5 +1,12 @@
 package com.jzg.console.service;
 
+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.vo.ReportSearchCommonVo;
+
+import java.util.List;
+
 /**
  *  @version 
  *  @author: hxl
@@ -7,5 +14,19 @@ package com.jzg.console.service;
  *  @Description:  人员数据-业务员组织
  */ 
 public interface ReportSalesmanDeptService extends  ReportBaseService{
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:03
+     *  @Description:  人员数据-业务员组织-业务明细
+     */
+    IPage<?> getPageBusinessDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:02
+     *  @Description:  人员数据-业务员组织-业务明细导出
+     */
+    void downloadBusinessDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 }

+ 48 - 31
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportChannelDataServiceImpl.java

@@ -3,9 +3,7 @@ package com.jzg.console.service.impl;
 
 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.dto.ReportSalesmanDataManageDto;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportChannelDataManageService;
 import com.jzg.console.service.ReportChannelDataService;
@@ -29,13 +27,13 @@ public class ReportChannelDataServiceImpl extends ReportBaseServiceImpl implemen
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 任务数据-渠道-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportSalesmanDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDataDto> pageList = new Page<ReportSalesmanDataDto>();
+        List<ReportSalesmanDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -43,18 +41,28 @@ public class ReportChannelDataServiceImpl extends ReportBaseServiceImpl implemen
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:00
+     *  @Description:  任务数据-渠道-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDataDto.class,list,"任务数据-渠道-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:01
+     *  @Description:  任务数据-渠道-明细查询
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportSalesmanDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDataDetailDto> detailPageList = new Page<ReportSalesmanDataDetailDto>();
+        List<ReportSalesmanDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -62,11 +70,16 @@ public class ReportChannelDataServiceImpl extends ReportBaseServiceImpl implemen
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:01
+     *  @Description:  任务数据-渠道-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDataDetailDto.class,detailList,"任务数据-渠道-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -75,13 +88,15 @@ public class ReportChannelDataServiceImpl extends ReportBaseServiceImpl implemen
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportSalesmanDataDto>  getList(){
+        List<ReportSalesmanDataDto> list =new ArrayList<>();
+        ReportSalesmanDataDto reportSalesmanDataDto = ReportSalesmanDataDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("众安财险机构").quoteOrderNum(200L)
+                .proxyCustomerOrderNum(50L).pcOrderNum(20L).appOrderNum(500L).payPendingOrderNum(300L).underwritRejectNum(50L)
+                .underwritPassRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32))
+                .additionalRecordingOrderNum(50L).additionalRecordingPendingApprovalOrderNum(20L).additionalRecordingApprovalOrderNum(10L)
+                .manegerName("李四").build();
+        list.add(reportSalesmanDataDto);
         return list;
     }
 
@@ -91,14 +106,16 @@ public class ReportChannelDataServiceImpl extends ReportBaseServiceImpl implemen
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
-                .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
+    public List<ReportSalesmanDataDetailDto>  getDetailList(){
+        List<ReportSalesmanDataDetailDto> list =new ArrayList<>();
+        ReportSalesmanDataDetailDto reportSalesmanDataDetailDto = ReportSalesmanDataDetailDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("太原分部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .orderSourceName("pc报价").sumPremium(new BigDecimal(456)).orderStatusName("已承保")
+                .createTime(new Date()).recordTime(new Date())
+                .companyName("永诚财险").partnerCompanyName("众安财险科技营销部")
+                .build();
+        list.add(reportSalesmanDataDetailDto);
         return list;
     }
 }

+ 51 - 30
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportChannelPersonDataServiceImpl.java

@@ -1,14 +1,18 @@
 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.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportSalesmanDataManageDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportChannelDataManageService;
 import com.jzg.console.service.ReportChannelPersonDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,13 +32,13 @@ public class ReportChannelPersonDataServiceImpl extends ReportBaseServiceImpl im
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 人员数据-渠道数据-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportChannelPersonDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportChannelPersonDataDto> pageList = new Page<ReportChannelPersonDataDto>();
+        List<ReportChannelPersonDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,18 +46,28 @@ public class ReportChannelPersonDataServiceImpl extends ReportBaseServiceImpl im
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:16
+     *  @Description:  人员数据-渠道数据-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportChannelPersonDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportChannelPersonDataDto.class,list,"人员数据-渠道数据-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:17
+     *  @Description:   人员数据-渠道数据-明细查询
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportChannelPersonDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportChannelPersonDataDetailDto> detailPageList = new Page<ReportChannelPersonDataDetailDto>();
+        List<ReportChannelPersonDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +75,16 @@ public class ReportChannelPersonDataServiceImpl extends ReportBaseServiceImpl im
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:17
+     *  @Description:   人员数据-渠道数据-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportChannelPersonDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportChannelPersonDataDetailDto.class,detailList,"人员数据-渠道数据-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +93,14 @@ public class ReportChannelPersonDataServiceImpl extends ReportBaseServiceImpl im
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportChannelPersonDataDto>  getList(){
+        List<ReportChannelPersonDataDto> list =new ArrayList<>();
+        ReportChannelPersonDataDto reportChannelPersonDataDto = ReportChannelPersonDataDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("张三渠道").areaName("北京/市辖区")
+                .underwriteOrderNum(200L).sumPremium(new BigDecimal(980)).orderCommissionPremium(new BigDecimal(180))
+                .avgOrderNumPremium(new BigDecimal(500)).lastLoginTime(new Date()).lastRecordTime(new Date())
+                .manegerName("李四").personStatus("在职").accountStatus("正常").build();
+        list.add(reportChannelPersonDataDto);
         return list;
     }
 
@@ -90,14 +110,15 @@ public class ReportChannelPersonDataServiceImpl extends ReportBaseServiceImpl im
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
+    public List<ReportChannelPersonDataDetailDto>  getDetailList(){
+        List<ReportChannelPersonDataDetailDto> list =new ArrayList<>();
+        ReportChannelPersonDataDetailDto reportChannelPersonDataDetailDto = ReportChannelPersonDataDetailDto.builder()
+                .salesmanName("張三").salesmanPhone("18811459985")
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .sumPremium(new BigDecimal(456)).orderCommissionPremium(new BigDecimal(456))
+                .createTime(new Date()).recordTime(new Date()).manegerName("李四").build();
+        list.add(reportChannelPersonDataDetailDto);
         return list;
     }
 }

+ 53 - 30
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportCompanyDataServiceImpl.java

@@ -1,14 +1,16 @@
 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.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportSalesmanDataManageDto;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportChannelDataManageService;
 import com.jzg.console.service.ReportCompanyDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,13 +30,13 @@ public class ReportCompanyDataServiceImpl extends ReportBaseServiceImpl implemen
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 任务数据-保险公司-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportCompanyDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportCompanyDataDto> pageList = new Page<ReportCompanyDataDto>();
+        List<ReportCompanyDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,18 +44,28 @@ public class ReportCompanyDataServiceImpl extends ReportBaseServiceImpl implemen
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:20
+     *  @Description:  任务数据-保险公司-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportCompanyDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportCompanyDataDto.class,list,"任务数据-保险公司-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:20
+     *  @Description:   任务数据-保险公司-明细列表
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportCompanyDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportCompanyDataDetailDto> detailPageList = new Page<ReportCompanyDataDetailDto>();
+        List<ReportCompanyDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +73,16 @@ public class ReportCompanyDataServiceImpl extends ReportBaseServiceImpl implemen
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:21
+     *  @Description: 任务数据-保险公司-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportCompanyDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportCompanyDataDetailDto.class,detailList,"任务数据-保险公司-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +91,16 @@ public class ReportCompanyDataServiceImpl extends ReportBaseServiceImpl implemen
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDto>  getList(){
-        List<ReportRiskDataManageDto> list =new ArrayList<>();
-        ReportRiskDataManageDto reportRiskDataManageDto = ReportRiskDataManageDto.builder()
+    public List<ReportCompanyDataDto>  getList(){
+        List<ReportCompanyDataDto> list =new ArrayList<>();
+        ReportCompanyDataDto reportCompanyDataDto = ReportCompanyDataDto.builder()
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
-                .riskName("单交").quoteCountNum(1000l).quoteOrderNum(500l).underwriteOrderNum(300l).underwritePremium(new BigDecimal(456))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+                .quoteOrderNum(100L).proxyCustomerOrderNum(100L).pcOrderNum(100L).appOrderNum(100L).payPendingOrderNum(100L)
+                .underwritRejectNum(100L).underwritPassRate(new BigDecimal(32))
+                .underwriteRate(new BigDecimal(32)).additionalRecordingOrderNum(50L).additionalRecordingPendingApprovalOrderNum(50L)
+                .additionalRecordingApprovalOrderNum(50L).manegerName("李四")
+                .build();
+        list.add(reportCompanyDataDto);
         return list;
     }
 
@@ -90,14 +110,17 @@ public class ReportCompanyDataServiceImpl extends ReportBaseServiceImpl implemen
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
+    public List<ReportCompanyDataDetailDto>  getDetailList(){
+        List<ReportCompanyDataDetailDto> list =new ArrayList<>();
+        ReportCompanyDataDetailDto reportCompanyDataDetailDto = ReportCompanyDataDetailDto.builder()
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .quoteOrderNum(100L).proxyCustomerOrderNum(100L).pcOrderNum(100L).appOrderNum(100L)
+                .payPendingOrderNum(100L).underwritRejectNum(100L).quoteOrderRate(new BigDecimal(32))
+                .underwritPassRate(new BigDecimal(32)).underwriteRate(new BigDecimal(32))
+                .additionalRecordingOrderNum(50L).additionalRecordingPendingApprovalOrderNum(50L)
+                .additionalRecordingApprovalOrderNum(50L).manegerName("李四")
+                .build();
+        list.add(reportCompanyDataDetailDto);
         return list;
     }
 }

+ 53 - 31
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportSalesmanDataServiceImpl.java

@@ -1,13 +1,16 @@
 package com.jzg.console.service.impl;
 
 
+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.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportSalesmanDataManageDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportSalesmanDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -27,13 +30,13 @@ public class ReportSalesmanDataServiceImpl extends ReportBaseServiceImpl impleme
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 任务数据-业务员-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportSalesmanDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDataDto> pageList = new Page<ReportSalesmanDataDto>();
+        List<ReportSalesmanDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -41,18 +44,28 @@ public class ReportSalesmanDataServiceImpl extends ReportBaseServiceImpl impleme
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:00
+     *  @Description:  任务数据-业务员-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDataDto.class,list,"任务数据-业务员-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:01
+     *  @Description:  任务数据-业务员-明细查询
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportSalesmanDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDataDetailDto> detailPageList = new Page<ReportSalesmanDataDetailDto>();
+        List<ReportSalesmanDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -60,11 +73,16 @@ public class ReportSalesmanDataServiceImpl extends ReportBaseServiceImpl impleme
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:01
+     *  @Description:  任务数据-业务员-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDataDetailDto.class,detailList,"任务数据-业务员-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -73,13 +91,15 @@ public class ReportSalesmanDataServiceImpl extends ReportBaseServiceImpl impleme
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportSalesmanDataDto>  getList(){
+        List<ReportSalesmanDataDto> list =new ArrayList<>();
+        ReportSalesmanDataDto reportSalesmanDataDto = ReportSalesmanDataDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("众安财险机构").quoteOrderNum(200L)
+                .proxyCustomerOrderNum(50L).pcOrderNum(20L).appOrderNum(500L).payPendingOrderNum(300L).underwritRejectNum(50L)
+                .underwritPassRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32))
+                .additionalRecordingOrderNum(50L).additionalRecordingPendingApprovalOrderNum(20L).additionalRecordingApprovalOrderNum(10L)
+                .manegerName("李四").build();
+        list.add(reportSalesmanDataDto);
         return list;
     }
 
@@ -89,14 +109,16 @@ public class ReportSalesmanDataServiceImpl extends ReportBaseServiceImpl impleme
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
-                .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
+    public List<ReportSalesmanDataDetailDto>  getDetailList(){
+        List<ReportSalesmanDataDetailDto> list =new ArrayList<>();
+        ReportSalesmanDataDetailDto reportSalesmanDataDetailDto = ReportSalesmanDataDetailDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("太原分部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .orderSourceName("pc报价").sumPremium(new BigDecimal(456)).orderStatusName("已承保")
+                .createTime(new Date()).recordTime(new Date())
+                .companyName("永诚财险").partnerCompanyName("众安财险科技营销部")
+                .build();
+        list.add(reportSalesmanDataDetailDto);
         return list;
     }
 }

+ 97 - 30
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportSalesmanDeptServiceImpl.java

@@ -1,14 +1,18 @@
 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.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportSalesmanDataManageDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportChannelDataManageService;
 import com.jzg.console.service.ReportSalesmanDeptService;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,13 +32,13 @@ public class ReportSalesmanDeptServiceImpl extends ReportBaseServiceImpl impleme
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 人员数据-业务员组织-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportSalesmanDeptDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDeptDto> pageList = new Page<ReportSalesmanDeptDto>();
+        List<ReportSalesmanDeptDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,18 +46,28 @@ public class ReportSalesmanDeptServiceImpl extends ReportBaseServiceImpl impleme
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 15:59
+     *  @Description: 人员数据-业务员组织-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDeptDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDeptDto.class,list,"人员数据-业务员组织-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:01
+     *  @Description: 人员数据-业务员组织-人员明细
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportSalesmanDeptDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDeptDetailDto> detailPageList = new Page<ReportSalesmanDeptDetailDto>();
+        List<ReportSalesmanDeptDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +75,46 @@ public class ReportSalesmanDeptServiceImpl extends ReportBaseServiceImpl impleme
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:02
+     *  @Description:  人员数据-业务员组织-人员明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDeptDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDeptDetailDto.class,detailList,"人员数据-业务员组织-人员明细导出-"+ reportSearchCommonVo.getUserId());
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:01
+     *  @Description: 人员数据-业务员组织-业务明细
+     */
+    @Override
+    public IPage<?> getPageBusinessDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
+        Page<ReportSalesmanBusinessDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanBusinessDetailDto> detailPageList = new Page<ReportSalesmanBusinessDetailDto>();
+        List<ReportSalesmanBusinessDetailDto> detailList = getBusinessDetailList();
+        detailPageList.setRecords(detailList);
+        detailPageList.setTotal(1l);
+        detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
+        detailPageList.setPages(reportSearchCommonVo.getPageNo());
+        detailPageList.setPages(reportSearchCommonVo.getPageSize());
+        return detailPageList;
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:02
+     *  @Description:  人员数据-业务员组织-业务明细导出
+     */
+    @Override
+    public void downloadBusinessDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
+        List<ReportSalesmanBusinessDetailDto> detailList = getBusinessDetailList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanBusinessDetailDto.class,detailList,"人员数据-业务员组织-业务明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +123,30 @@ public class ReportSalesmanDeptServiceImpl extends ReportBaseServiceImpl impleme
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportSalesmanDeptDto>  getList(){
+        List<ReportSalesmanDeptDto> list =new ArrayList<>();
+        ReportSalesmanDeptDto reportSalesmanDeptDto = ReportSalesmanDeptDto.builder()
+                .salesmanTypeName("渠道").salesmanTypeDeptName("张三渠道").deptName("众安财险科技营销部")
+                .areaName("山西/太原").avgOrderPersonNum(1000L).sumPremium(new BigDecimal(456)).underwriteOrderNum(300L)
+                .sumPersonNum(1000L).build();
+        list.add(reportSalesmanDeptDto);
+        return list;
+    }
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/24 10:42
+     *  @Description:  模拟数据
+     */
+    public List<ReportSalesmanDeptDetailDto>  getDetailList(){
+        List<ReportSalesmanDeptDetailDto> list =new ArrayList<>();
+        ReportSalesmanDeptDetailDto reportSalesmanDeptDetailDto = ReportSalesmanDeptDetailDto.builder()
+                .salesmanName("張三").salesmanPhone("18811459985").deptName("众安财险科技营销部")
+                .salesmanTypeName("渠道").salesmanTypeDeptName("张三渠道").underwriteOrderNum(100L).sumPremium(new BigDecimal(456))
+                .orderCommissionPremium(new BigDecimal(456)).avgOrderNumPremium(new BigDecimal(456))
+                .manegerName("李四").personStatus("入职").accountStatus("正常").build();
+        list.add(reportSalesmanDeptDetailDto);
         return list;
     }
 
@@ -90,14 +156,15 @@ public class ReportSalesmanDeptServiceImpl extends ReportBaseServiceImpl impleme
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
+    public List<ReportSalesmanBusinessDetailDto>  getBusinessDetailList(){
+        List<ReportSalesmanBusinessDetailDto> list =new ArrayList<>();
+        ReportSalesmanBusinessDetailDto reportSalesmanBusinessDetailDto = ReportSalesmanBusinessDetailDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985")
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .sumPremium(new BigDecimal(456)).orderCommissionPremium(new BigDecimal(456))
+                .createTime(new Date()).recordTime(new Date()).manegerName("李四").build();
+        list.add(reportSalesmanBusinessDetailDto);
         return list;
     }
 }

+ 52 - 31
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportSalesmanReportServiceImpl.java

@@ -1,14 +1,18 @@
 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.jzg.commons.entity.report.dto.ReportRiskDataManageDetailDto;
-import com.jzg.commons.entity.report.dto.ReportRiskDataManageDto;
-import com.jzg.commons.entity.report.dto.ReportSalesmanDataManageDto;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportChannelDataManageService;
 import com.jzg.console.service.ReportSalesmanReportService;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,13 +32,13 @@ public class ReportSalesmanReportServiceImpl extends ReportBaseServiceImpl imple
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 人员数据-业务员报表-列表
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportSalesmanReportDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanReportDto> pageList = new Page<ReportSalesmanReportDto>();
+        List<ReportSalesmanReportDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,18 +46,28 @@ public class ReportSalesmanReportServiceImpl extends ReportBaseServiceImpl imple
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 15:12
+     *  @Description:  人员数据-业务员报表-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanReportDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanReportDto.class,list,"人员数据-业务员报表-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 15:12
+     *  @Description:  人员数据-业务员报表-明细列表
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportSalesmanReportDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanReportDetailDto> detailPageList = new Page<ReportSalesmanReportDetailDto>();
+        List<ReportSalesmanReportDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +75,16 @@ public class ReportSalesmanReportServiceImpl extends ReportBaseServiceImpl imple
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 15:50
+     *  @Description:  人员数据-业务员报表-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanReportDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanReportDetailDto.class,detailList,"人员数据-业务员报表-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +93,14 @@ public class ReportSalesmanReportServiceImpl extends ReportBaseServiceImpl imple
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportSalesmanReportDto>  getList(){
+        List<ReportSalesmanReportDto> list =new ArrayList<>();
+        ReportSalesmanReportDto reportSalesmanReportDto = ReportSalesmanReportDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("张三团队").areaName("山西/太原")
+                .underwriteOrderNum(1000L).sumPremium(new BigDecimal(456)).orderCommissionPremium(new BigDecimal(456))
+                .avgOrderNumPremium(new BigDecimal(456)).lastLoginTime(new Date()).lastRecordTime(new Date())
+                .manegerName("李四").personStatus("入职").accountStatus("正常").build();
+        list.add(reportSalesmanReportDto);
         return list;
     }
 
@@ -90,14 +110,15 @@ public class ReportSalesmanReportServiceImpl extends ReportBaseServiceImpl imple
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
-                .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
+    public List<ReportSalesmanReportDetailDto>  getDetailList(){
+        List<ReportSalesmanReportDetailDto> list =new ArrayList<>();
+        ReportSalesmanReportDetailDto reportSalesmanReportDetailDto = ReportSalesmanReportDetailDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").companyId("1").companyName("众安财险")
+                .partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .sumPremium(new BigDecimal(456)).orderCommissionPremium(new BigDecimal(45))
+                .createTime(new Date()).recordTime(new Date()).manegerName("李四").build();
+        list.add(reportSalesmanReportDetailDto);
         return list;
     }
 }

+ 49 - 32
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportTelemarketingDataServiceImpl.java

@@ -3,9 +3,7 @@ package com.jzg.console.service.impl;
 
 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.dto.ReportSalesmanDataManageDto;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportChannelDataService;
 import com.jzg.console.service.ReportTelemarketingDataService;
@@ -20,7 +18,7 @@ import java.util.List;
  *  @version
  *  @author: hxl
  *  @Date: 2025/9/22 16:45
- *  @Description:  任务数据-渠道
+ *  @Description:  任务数据-电销
  */
 @Service
 public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl implements ReportTelemarketingDataService {
@@ -28,13 +26,13 @@ public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl im
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 任务数据-电销-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportSalesmanDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDataDto> pageList = new Page<ReportSalesmanDataDto>();
+        List<ReportSalesmanDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,18 +40,28 @@ public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl im
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:00
+     *  @Description:  任务数据-电销-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDataDto.class,list,"任务数据-电销-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:01
+     *  @Description:  任务数据-电销-明细查询
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportSalesmanDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportSalesmanDataDetailDto> detailPageList = new Page<ReportSalesmanDataDetailDto>();
+        List<ReportSalesmanDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +69,16 @@ public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl im
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 17:01
+     *  @Description:  任务数据-电销-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportSalesmanDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportSalesmanDataDetailDto.class,detailList,"任务数据-电销-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +87,15 @@ public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl im
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportSalesmanDataDto>  getList(){
+        List<ReportSalesmanDataDto> list =new ArrayList<>();
+        ReportSalesmanDataDto reportSalesmanDataDto = ReportSalesmanDataDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("众安财险机构").quoteOrderNum(200L)
+                .proxyCustomerOrderNum(50L).pcOrderNum(20L).appOrderNum(500L).payPendingOrderNum(300L).underwritRejectNum(50L)
+                .underwritPassRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32))
+                .additionalRecordingOrderNum(50L).additionalRecordingPendingApprovalOrderNum(20L).additionalRecordingApprovalOrderNum(10L)
+                .manegerName("李四").build();
+        list.add(reportSalesmanDataDto);
         return list;
     }
 
@@ -90,14 +105,16 @@ public class ReportTelemarketingDataServiceImpl extends ReportBaseServiceImpl im
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
-                .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
+    public List<ReportSalesmanDataDetailDto>  getDetailList(){
+        List<ReportSalesmanDataDetailDto> list =new ArrayList<>();
+        ReportSalesmanDataDetailDto reportSalesmanDataDetailDto = ReportSalesmanDataDetailDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("太原分部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .orderSourceName("pc报价").sumPremium(new BigDecimal(456)).orderStatusName("已承保")
+                .createTime(new Date()).recordTime(new Date())
+                .companyName("永诚财险").partnerCompanyName("众安财险科技营销部")
+                .build();
+        list.add(reportSalesmanDataDetailDto);
         return list;
     }
 }

+ 45 - 30
consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportTelemarketingPersonDataServiceImpl.java

@@ -3,9 +3,7 @@ package com.jzg.console.service.impl;
 
 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.dto.ReportSalesmanDataManageDto;
+import com.jzg.commons.entity.report.dto.*;
 import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportTelemarketingPersonDataService;
 import org.springframework.stereotype.Service;
@@ -27,13 +25,13 @@ public class ReportTelemarketingPersonDataServiceImpl extends ReportBaseServiceI
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 人员数据-电销数据-列表查询
      */
     @Override
     public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDto> pageList = new Page<ReportRiskDataManageDto>();
-        List<ReportRiskDataManageDto> list = getList();
+        Page<ReportChannelPersonDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportChannelPersonDataDto> pageList = new Page<ReportChannelPersonDataDto>();
+        List<ReportChannelPersonDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -41,18 +39,28 @@ public class ReportTelemarketingPersonDataServiceImpl extends ReportBaseServiceI
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:16
+     *  @Description:  人员数据-电销数据-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportChannelPersonDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportChannelPersonDataDto.class,list,"人员数据-电销数据-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:17
+     *  @Description:   人员数据-电销数据-明细查询
+     */
     @Override
     public IPage<?> getPageDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        Page<ReportRiskDataManageDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
-        IPage<ReportRiskDataManageDetailDto> detailPageList = new Page<ReportRiskDataManageDetailDto>();
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
+        Page<ReportChannelPersonDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportChannelPersonDataDetailDto> detailPageList = new Page<ReportChannelPersonDataDetailDto>();
+        List<ReportChannelPersonDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -60,11 +68,16 @@ public class ReportTelemarketingPersonDataServiceImpl extends ReportBaseServiceI
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/25 16:17
+     *  @Description:   人员数据-电销数据-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportChannelPersonDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportChannelPersonDataDetailDto.class,detailList,"人员数据-电销数据-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -73,13 +86,14 @@ public class ReportTelemarketingPersonDataServiceImpl extends ReportBaseServiceI
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    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))
-                .penetrationRate(new BigDecimal(23)).underwriteRate(new BigDecimal(32)).build();
-        list.add(reportRiskDataManageDto);
+    public List<ReportChannelPersonDataDto>  getList(){
+        List<ReportChannelPersonDataDto> list =new ArrayList<>();
+        ReportChannelPersonDataDto reportChannelPersonDataDto = ReportChannelPersonDataDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("张三渠道").areaName("北京/市辖区")
+                .underwriteOrderNum(200L).sumPremium(new BigDecimal(980)).orderCommissionPremium(new BigDecimal(180))
+                .avgOrderNumPremium(new BigDecimal(500)).lastLoginTime(new Date()).lastRecordTime(new Date())
+                .manegerName("李四").personStatus("在职").accountStatus("正常").build();
+        list.add(reportChannelPersonDataDto);
         return list;
     }
 
@@ -89,14 +103,15 @@ public class ReportTelemarketingPersonDataServiceImpl extends ReportBaseServiceI
      *  @Date: 2025/9/24 10:42
      *  @Description:  模拟数据
      */
-    public List<ReportRiskDataManageDetailDto>  getDetailList(){
-        List<ReportRiskDataManageDetailDto> list =new ArrayList<>();
-        ReportRiskDataManageDetailDto reportRiskDataManageDetailDto = ReportRiskDataManageDetailDto.builder()
+    public List<ReportChannelPersonDataDetailDto>  getDetailList(){
+        List<ReportChannelPersonDataDetailDto> list =new ArrayList<>();
+        ReportChannelPersonDataDetailDto reportChannelPersonDataDetailDto = ReportChannelPersonDataDetailDto.builder()
+                .salesmanName("張三").salesmanPhone("18811459985")
                 .companyId("1").companyName("永诚财险").partnerCompanyId("1").partnerCompanyName("众安财险科技营销部")
                 .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+                .sumPremium(new BigDecimal(456)).orderCommissionPremium(new BigDecimal(456))
+                .createTime(new Date()).recordTime(new Date()).manegerName("李四").build();
+        list.add(reportChannelPersonDataDetailDto);
         return list;
     }
 }