1.使用模拟数据提交财务数据接口

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportChannelPersonDataDto.java

@@ -88,7 +88,7 @@ public class ReportChannelPersonDataDto {
     /**
      *  单均保费
      */
-    @ExcelProperty(value = "单均保费", index = 8)
+    @ExcelProperty(value = "单均保费", index = 7)
     @ColumnWidth(20)
     @Schema(description = "单均保费")
     private BigDecimal avgOrderNumPremium;
@@ -96,7 +96,7 @@ public class ReportChannelPersonDataDto {
     /**
      *  上次登录
      */
-    @ExcelProperty(value = "上次登录", index = 9)
+    @ExcelProperty(value = "上次登录", index = 8)
     @ColumnWidth(20)
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -106,7 +106,7 @@ public class ReportChannelPersonDataDto {
     /**
      *  上次签单
      */
-    @ExcelProperty(value = "上次签单", index = 10)
+    @ExcelProperty(value = "上次签单", index = 9)
     @ColumnWidth(20)
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -115,7 +115,7 @@ public class ReportChannelPersonDataDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "管理人", index = 10)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;
@@ -123,14 +123,14 @@ public class ReportChannelPersonDataDto {
     /**
      *  人员状态
      */
-    @ExcelProperty(value = "人员状态", index = 12)
+    @ExcelProperty(value = "人员状态", index = 11)
     @ColumnWidth(15)
     @Schema(description = "人员状态")
     private String personStatus;
     /**
      *  账号状态
      */
-    @ExcelProperty(value = "账号状态", index = 13)
+    @ExcelProperty(value = "账号状态", index = 12)
     @ColumnWidth(10)
     @Schema(description = "账号状态")
     private String accountStatus;

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCompanyDataDetailDto.java

@@ -64,7 +64,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  报价订单
      */
-    @ExcelProperty(value = "报价订单", index = 4)
+    @ExcelProperty(value = "报价订单", index = 2)
     @ColumnWidth(15)
     @Schema(description = "报价订单")
     private Long quoteOrderNum;
@@ -72,7 +72,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  代客录单
      */
-    @ExcelProperty(value = "代客录单", index = 5)
+    @ExcelProperty(value = "代客录单", index = 3)
     @ColumnWidth(15)
     @Schema(description = "代客录单")
     private Long proxyCustomerOrderNum;
@@ -81,7 +81,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  pc报价中
      */
-    @ExcelProperty(value = "pc报价中", index = 6)
+    @ExcelProperty(value = "pc报价中", index = 4)
     @ColumnWidth(15)
     @Schema(description = "pc报价中")
     private Long pcOrderNum;
@@ -89,7 +89,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  app报价中
      */
-    @ExcelProperty(value = "app报价中", index = 7)
+    @ExcelProperty(value = "app报价中", index = 5)
     @ColumnWidth(10)
     @Schema(description = "app报价中")
     private Long appOrderNum;
@@ -98,14 +98,14 @@ public class ReportCompanyDataDetailDto {
     /**
      *  待缴费
      */
-    @ExcelProperty(value = "待缴费", index = 8)
+    @ExcelProperty(value = "待缴费", index = 6)
     @ColumnWidth(10)
     @Schema(description = "待缴费")
     private Long payPendingOrderNum;
     /**
      *  核保失败
      */
-    @ExcelProperty(value = "核保失败", index = 9)
+    @ExcelProperty(value = "核保失败", index = 7)
     @ColumnWidth(20)
     @Schema(description = "核保失败")
     private Long underwritRejectNum;
@@ -113,7 +113,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  报价率
      */
-    @ExcelProperty(value = "报价率", index = 9)
+    @ExcelProperty(value = "报价率", index = 8)
     @ColumnWidth(20)
     @Schema(description = "报价率")
     private BigDecimal quoteOrderRate;
@@ -122,7 +122,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  核保通过率
      */
-    @ExcelProperty(value = "核保通过率", index = 10)
+    @ExcelProperty(value = "核保通过率", index = 9)
     @ColumnWidth(20)
     @Schema(description = "核保通过率")
     private BigDecimal underwritPassRate;
@@ -130,7 +130,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  承保率
      */
-    @ExcelProperty(value = "承保率", index = 11)
+    @ExcelProperty(value = "承保率", index = 10)
     @ColumnWidth(15)
     @Schema(description = "承保率")
     private BigDecimal underwriteRate;
@@ -146,7 +146,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  补录待审核
      */
-    @ExcelProperty(value = "补录待审核", index = 11)
+    @ExcelProperty(value = "补录待审核", index = 12)
     @ColumnWidth(15)
     @Schema(description = "补录待审核")
     private Long additionalRecordingPendingApprovalOrderNum;
@@ -154,7 +154,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  补录审核通过
      */
-    @ExcelProperty(value = "补录审核通过", index = 11)
+    @ExcelProperty(value = "补录审核通过", index = 13)
     @ColumnWidth(15)
     @Schema(description = "补录审核通过")
     private Long additionalRecordingApprovalOrderNum;
@@ -162,7 +162,7 @@ public class ReportCompanyDataDetailDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "管理人", index = 14)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCostVerificationDataDetailDto.java

@@ -31,22 +31,6 @@ import java.util.Date;
 @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
      */
@@ -56,30 +40,23 @@ public class ReportCostVerificationDataDetailDto {
     /**
      * 保险公司名称
      */
-    @ExcelProperty(value = "保险公司", index = 2)
+    @ExcelProperty(value = "保险公司", index = 0)
     @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 = 1)
+    @ColumnWidth(10)
+    @Schema(description = "审核类型")
+    private String checkTypeName;
 
     /**
      *  订单号
      */
-    @ExcelProperty(value = "订单号", index = 4)
+    @ExcelProperty(value = "订单号", index = 2)
     @ColumnWidth(15)
     @Schema(description = "订单号")
     private String orderNo;
@@ -87,7 +64,7 @@ public class ReportCostVerificationDataDetailDto {
     /**
      *  车牌号
      */
-    @ExcelProperty(value = "车牌号", index = 5)
+    @ExcelProperty(value = "车牌号", index = 3)
     @ColumnWidth(15)
     @Schema(description = "车牌号")
     private String licenseNo;
@@ -96,62 +73,53 @@ public class ReportCostVerificationDataDetailDto {
     /**
      *  订单类型
      */
-    @ExcelProperty(value = "订单类型", index = 6)
+    @ExcelProperty(value = "订单类型", index = 4)
     @ColumnWidth(15)
     @Schema(description = "订单类型")
     private String orderTypeName;
 
     /**
-     *  险种
+     *  提交审核时间
      */
-    @ExcelProperty(value = "险种", index = 7)
+    @ExcelProperty(value = "提交审核时间", index = 5)
     @ColumnWidth(10)
-    @Schema(description = "险种")
-    private String riskName;
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "提交审核时间")
+    private Date submitCheckTime;
 
 
     /**
-     *  报价次数
+     *  审核时间
      */
-    @ExcelProperty(value = "报价次数", index = 8)
+    @ExcelProperty(value = "审核时间", index = 6)
     @ColumnWidth(10)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @Schema(description = "报价次数")
-    private Long quoteCountNum;
+    private Date checkTime;
     /**
-     *  保费
+     *  状态
      */
-    @ExcelProperty(value = "保费", index = 9)
+    @ExcelProperty(value = "状态", index = 7)
     @ColumnWidth(10)
-    @Schema(description = "保费")
-    private BigDecimal sumPremium;
+    @Schema(description = "状态")
+    private String checkStatusName;
 
     /**
-     *  录单时间
+     *  审核时长
      */
-    @ExcelProperty(value = "录单时间", index = 9)
+    @ExcelProperty(value = "审核时长", index = 8)
     @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;
+    @Schema(description = "审核时长")
+    private Long checkTimeSecond;
 
 
     /**
-     *  签单时间
+     *  审核人
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @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 recordTime;
-
-
-    /**
-     *  管理人
-     */
-    @ExcelProperty(value = "管理人", index = 11)
-    @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @Schema(description = "审核人")
+    private String checkUserName;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportCostVerificationDataDto.java

@@ -26,27 +26,11 @@ import java.util.Date;
 @ContentRowHeight(15)
 @Data
 @Builder
-@Schema(description = "任务数据-业务员-列表")
+@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
      */
@@ -56,102 +40,49 @@ public class ReportCostVerificationDataDto {
     /**
      * 保险公司名称
      */
-    @ExcelProperty(value = "保险公司", index = 2)
+    @ExcelProperty(value = "保险公司", index = 0)
     @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 = 1)
+    @ColumnWidth(10)
+    @Schema(description = "待审核")
+    private Long pendingReviewNum;
 
     /**
-     *  订单号
+     *  已审核
      */
-    @ExcelProperty(value = "订单号", index = 4)
+    @ExcelProperty(value = "已审核", index = 2)
     @ColumnWidth(15)
-    @Schema(description = "订单号")
-    private String orderNo;
+    @Schema(description = "已审核")
+    private Long reviewedNum;
 
     /**
-     *  车牌号
+     *  自动审核
      */
-    @ExcelProperty(value = "车牌号", index = 5)
+    @ExcelProperty(value = "自动审核", index = 3)
     @ColumnWidth(15)
-    @Schema(description = "车牌号")
-    private String licenseNo;
+    @Schema(description = "自动审核")
+    private Long autoReviewNum;
 
 
     /**
-     *  订单类型
+     *  人工审核
      */
-    @ExcelProperty(value = "订单类型", index = 6)
+    @ExcelProperty(value = "人工审核", index = 4)
     @ColumnWidth(15)
-    @Schema(description = "订单类型")
-    private String orderTypeName;
-
-    /**
-     *  险种
-     */
-    @ExcelProperty(value = "险种", index = 7)
-    @ColumnWidth(10)
-    @Schema(description = "险种")
-    private String riskName;
-
+    @Schema(description = "人工审核")
+    private Long manualReviewNum;
 
     /**
-     *  报价次数
+     *  平均审核时长
      */
-    @ExcelProperty(value = "报价次数", index = 8)
+    @ExcelProperty(value = "平均审核时长", index = 5)
     @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;
+    @Schema(description = "平均审核时长")
+    private Long aveReviewDuration;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportMeetDataDetailDto.java

@@ -35,7 +35,7 @@ public class ReportMeetDataDetailDto {
      *  业务员
      */
     @ExcelProperty(value = "业务员", index = 0)
-    @ColumnWidth(10)
+    @ColumnWidth(20)
     @Schema(description = "业务员")
     private String salesmanName;
 
@@ -43,115 +43,56 @@ public class ReportMeetDataDetailDto {
      *  业务员手机号
      */
     @ExcelProperty(value = "手机号", index = 1)
-    @ColumnWidth(10)
+    @ColumnWidth(20)
     @Schema(description = "手机号")
     private String salesmanPhone;
 
     /**
-     * 保险公司id
+     * 银行卡号
      */
-    @ExcelIgnore
-    @Schema(description = "保险公司id")
-    private String companyId;
+    @ExcelProperty(value = "手机号", index = 2)
+    @ColumnWidth(30)
+    @Schema(description = "银行卡号")
+    private String bankCardNumber;
     /**
-     * 保险公司名称
+     * 银行
      */
-    @ExcelProperty(value = "保险公司", index = 2)
-    @ColumnWidth(20)
-    @Schema(description = "保险公司")
-    private String companyName;
+    @ExcelProperty(value = "银行", index = 3)
+    @ColumnWidth(30)
+    @Schema(description = "银行")
+    private String bankName;
 
 
     /**
-     *  合作保险公司Id
-     */
-    @ExcelIgnore
-    @Schema(description = "合作保险公司Id")
-    private String partnerCompanyId;
-    /**
-     *  合作保险公司名称
+     *  状态
      */
-    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ExcelProperty(value = "状态", index = 4)
     @ColumnWidth(20)
-    @Schema(description = "合作保险公司")
-    private String partnerCompanyName;
-
-    /**
-     *  订单号
-     */
-    @ExcelProperty(value = "订单号", index = 4)
-    @ColumnWidth(15)
-    @Schema(description = "订单号")
-    private String orderNo;
-
+    @Schema(description = "状态")
+    private String statusName;
     /**
-     *  车牌号
+     *  提现金额
      */
-    @ExcelProperty(value = "车牌号", index = 5)
-    @ColumnWidth(15)
-    @Schema(description = "车牌号")
-    private String licenseNo;
-
+    @ExcelProperty(value = "提现金额", index = 5)
+    @ColumnWidth(20)
+    @Schema(description = "提现金额")
+    private BigDecimal withdrawalMoney;
 
     /**
-     *  订单类型
+     *  付款人
      */
-    @ExcelProperty(value = "订单类型", index = 6)
+    @ExcelProperty(value = "付款人", index = 6)
     @ColumnWidth(15)
-    @Schema(description = "订单类型")
-    private String orderTypeName;
+    @Schema(description = "付款人")
+    private String paidPersonName;
 
     /**
-     *  险种
+     *  付款时间
      */
-    @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)
+    @ExcelProperty(value = "付款时间", index = 7)
+    @ColumnWidth(30)
     @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;
+    @Schema(description = "付款时间")
+    private Date paidTime;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportMeetDataDto.java

@@ -32,126 +32,51 @@ import java.util.Date;
 public class ReportMeetDataDto {
 
     /**
-     *  业务员
+     *  时间
      */
-    @ExcelProperty(value = "业务员", index = 0)
+    @ExcelProperty(value = "时间", index = 0)
     @ColumnWidth(10)
-    @Schema(description = "业务员")
-    private String salesmanName;
-
+    @Schema(description = "时间")
+    private String yearAndMonthTime;
     /**
-     *  业务员手机号
+     *  保费
      */
-    @ExcelProperty(value = "手机号", index = 1)
+    @ExcelProperty(value = "保费", index = 1)
     @ColumnWidth(10)
-    @Schema(description = "手机号")
-    private String salesmanPhone;
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
 
     /**
-     * 保险公司id
-     */
-    @ExcelIgnore
-    @Schema(description = "保险公司id")
-    private String companyId;
-    /**
-     * 保险公司名称
+     *  应付佣金
      */
-    @ExcelProperty(value = "保险公司", index = 2)
+    @ExcelProperty(value = "应付佣金", index = 2)
     @ColumnWidth(20)
-    @Schema(description = "保险公司")
-    private String companyName;
+    @Schema(description = "应付佣金")
+    private BigDecimal payableCommissionMoney;
 
 
     /**
-     *  合作保险公司Id
+     *  未提现
      */
-    @ExcelIgnore
-    @Schema(description = "合作保险公司Id")
-    private String partnerCompanyId;
-    /**
-     *  合作保险公司名称
-     */
-    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ExcelProperty(value = "未提现", index = 3)
     @ColumnWidth(20)
-    @Schema(description = "合作保险公司")
-    private String partnerCompanyName;
+    @Schema(description = "未提现")
+    private BigDecimal unwithdrawnMoney;
 
-    /**
-     *  订单号
-     */
-    @ExcelProperty(value = "订单号", index = 4)
-    @ColumnWidth(15)
-    @Schema(description = "订单号")
-    private String orderNo;
 
     /**
-     *  车牌号
+     *  提现中
      */
-    @ExcelProperty(value = "车牌号", index = 5)
+    @ExcelProperty(value = "提现中", index = 4)
     @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;
-
+    @Schema(description = "提现中")
+    private BigDecimal withdrawingMoney;
 
     /**
-     *  管理人
+     *  已付款
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "已付款", index = 5)
     @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @Schema(description = "已付款")
+    private BigDecimal paidMoney;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportOperatingProfitDataDto.java

@@ -32,126 +32,60 @@ import java.util.Date;
 public class ReportOperatingProfitDataDto {
 
     /**
-     *  业务员
+     *  时间
      */
-    @ExcelProperty(value = "业务员", index = 0)
+    @ExcelProperty(value = "时间", index = 0)
     @ColumnWidth(10)
-    @Schema(description = "业务员")
-    private String salesmanName;
+    @Schema(description = "时间")
+    private String yearAndMonthTime;
 
     /**
-     *  业务员手机号
+     *  保费
      */
-    @ExcelProperty(value = "手机号", index = 1)
+    @ExcelProperty(value = "保费", index = 1)
     @ColumnWidth(10)
-    @Schema(description = "手机号")
-    private String salesmanPhone;
+    @Schema(description = "保费")
+    private BigDecimal sumPremium;
 
     /**
-     * 保险公司id
-     */
-    @ExcelIgnore
-    @Schema(description = "保险公司id")
-    private String companyId;
-    /**
-     * 保险公司名称
+     *  应收
      */
-    @ExcelProperty(value = "保险公司", index = 2)
+    @ExcelProperty(value = "应收", index = 2)
     @ColumnWidth(20)
-    @Schema(description = "保险公司")
-    private String companyName;
+    @Schema(description = "应收")
+    private BigDecimal receivableMoney;
 
-
-    /**
-     *  合作保险公司Id
-     */
-    @ExcelIgnore
-    @Schema(description = "合作保险公司Id")
-    private String partnerCompanyId;
     /**
-     *  合作保险公司名称
+     *  应付
      */
-    @ExcelProperty(value = "合作保险公司", index = 3)
+    @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;
+    @Schema(description = "应付")
+    private BigDecimal meetMoney;
 
 
     /**
-     *  报价次数
-     */
-    @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)
+    @ExcelProperty(value = "利润", index = 4)
     @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;
+    @Schema(description = "利润")
+    private BigDecimal profitMoney;
 
 
     /**
-     *  签单时间
+     *  实收
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @ExcelProperty(value = "实收", index = 5)
     @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;
-
+    @Schema(description = "实收")
+    private BigDecimal receivedMoney;
 
     /**
-     *  管理人
+     *  实付
      */
-    @ExcelProperty(value = "管理人", index = 11)
-    @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @ExcelProperty(value = "实付", index = 6)
+    @ColumnWidth(20)
+    @Schema(description = "实付")
+    private BigDecimal paidMoney;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDetailDto.java

@@ -31,55 +31,10 @@ import java.util.Date;
 @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)
+    @ExcelProperty(value = "订单号", index = 0)
     @ColumnWidth(15)
     @Schema(description = "订单号")
     private String orderNo;
@@ -87,7 +42,7 @@ public class ReportPersonCheckDataDetailDto {
     /**
      *  车牌号
      */
-    @ExcelProperty(value = "车牌号", index = 5)
+    @ExcelProperty(value = "车牌号", index = 1)
     @ColumnWidth(15)
     @Schema(description = "车牌号")
     private String licenseNo;
@@ -96,62 +51,62 @@ public class ReportPersonCheckDataDetailDto {
     /**
      *  订单类型
      */
-    @ExcelProperty(value = "订单类型", index = 6)
+    @ExcelProperty(value = "订单类型", index = 2)
     @ColumnWidth(15)
     @Schema(description = "订单类型")
     private String orderTypeName;
 
     /**
-     *  险种
+     *  提交审核时间
      */
-    @ExcelProperty(value = "险种", index = 7)
-    @ColumnWidth(10)
-    @Schema(description = "险种")
-    private String riskName;
+    @ExcelProperty(value = "提交审核时间", index = 3)
+    @ColumnWidth(30)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "提交审核时间")
+    private Date submitCheckTime;
 
 
     /**
-     *  报价次数
+     *  审核时间
      */
-    @ExcelProperty(value = "报价次数", index = 8)
-    @ColumnWidth(10)
-    @Schema(description = "报价次数")
-    private Long quoteCountNum;
+    @ExcelProperty(value = "审核时间", index = 4)
+    @ColumnWidth(30)
+    @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    @Schema(description = "审核时间")
+    private Date checkTime;
     /**
-     *  保费
+     *  审核结果
      */
-    @ExcelProperty(value = "保费", index = 9)
+    @ExcelProperty(value = "审核结果", index = 5)
     @ColumnWidth(10)
-    @Schema(description = "保费")
-    private BigDecimal sumPremium;
+    @Schema(description = "审核结果")
+    private String checkResult;
 
     /**
-     *  录单时间
+     *  审核时长
      */
-    @ExcelProperty(value = "录单时间", index = 9)
+    @ExcelProperty(value = "审核时长", index = 6)
     @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;
+    @Schema(description = "审核时长")
+    private Long checkDuration;
 
 
     /**
-     *  签单时间
+     *  审核人
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @ExcelProperty(value = "审核人", index = 7)
     @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;
+    @Schema(description = "审核人")
+    private String checkUserName;
 
 
     /**
-     *  管理人
+     *  手机号
      */
-    @ExcelProperty(value = "管理人", index = 11)
-    @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @ExcelProperty(value = "手机号", index = 8)
+    @ColumnWidth(10)
+    @Schema(description = "手机号")
+    private String checkUserPhone;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportPersonCheckDataDto.java

@@ -32,11 +32,11 @@ import java.util.Date;
 public class ReportPersonCheckDataDto {
 
     /**
-     *  业务员
+     *  姓名
      */
-    @ExcelProperty(value = "业务员", index = 0)
+    @ExcelProperty(value = "姓名", index = 0)
     @ColumnWidth(10)
-    @Schema(description = "业务员")
+    @Schema(description = "姓名")
     private String salesmanName;
 
     /**
@@ -48,110 +48,49 @@ public class ReportPersonCheckDataDto {
     private String salesmanPhone;
 
     /**
-     * 保险公司id
+     *  所属机构
      */
-    @ExcelIgnore
-    @Schema(description = "保险公司id")
-    private String companyId;
-    /**
-     * 保险公司名称
-     */
-    @ExcelProperty(value = "保险公司", index = 2)
+    @ExcelProperty(value = "所属机构", index = 2)
     @ColumnWidth(20)
-    @Schema(description = "保险公司")
-    private String companyName;
-
-
+    @Schema(description = "所属机构")
+    private String deptName;
     /**
-     *  合作保险公司Id
+     *  已审订单
      */
-    @ExcelIgnore
-    @Schema(description = "合作保险公司Id")
-    private String partnerCompanyId;
-    /**
-     *  合作保险公司名称
-     */
-    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ExcelProperty(value = "已审订单", index = 3)
     @ColumnWidth(20)
-    @Schema(description = "合作保险公司")
-    private String partnerCompanyName;
+    @Schema(description = "已审订单")
+    private Long checkOrderNum;
 
-    /**
-     *  订单号
-     */
-    @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 = 4)
+    @ColumnWidth(20)
+    @Schema(description = "待审订单")
+    private Long pendingReviewOrderNum;
     /**
-     *  录单时间
+     *  平均审核时长
      */
-    @ExcelProperty(value = "录单时间", index = 9)
+    @ExcelProperty(value = "平均审核时长", index = 5)
     @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;
-
+    @Schema(description = "平均审核时长")
+    private Long avgReviewDuration;
 
     /**
-     *  签单时间
+     *  驳回订单
      */
-    @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 = 6)
+    @ColumnWidth(15)
+    @Schema(description = "驳回订单")
+    private Long rejectOrderNum;
 
     /**
-     *  管理人
+     *  修改订单
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "修改订单", index = 7)
     @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @Schema(description = "修改订单")
+    private Long updateOrderNum;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDetailDto.java

@@ -31,22 +31,6 @@ import java.util.Date;
 @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
      */
@@ -56,102 +40,142 @@ public class ReportReceivableDataDetailDto {
     /**
      * 保险公司名称
      */
-    @ExcelProperty(value = "保险公司", index = 2)
+    @ExcelProperty(value = "保险公司", index = 0)
     @ColumnWidth(20)
     @Schema(description = "保险公司")
     private String companyName;
-
-
     /**
-     *  合作保险公司Id
+     *  地区
      */
-    @ExcelIgnore
-    @Schema(description = "合作保险公司Id")
-    private String partnerCompanyId;
-    /**
-     *  合作保险公司名称
-     */
-    @ExcelProperty(value = "合作保险公司", index = 3)
+    @ExcelProperty(value = "地区", index = 1)
     @ColumnWidth(20)
-    @Schema(description = "合作保险公司")
+    @Schema(description = "地区")
     private String partnerCompanyName;
 
     /**
-     *  订单号
+     *  应收总计
      */
-    @ExcelProperty(value = "订单号", index = 4)
+    @ExcelProperty(value = "应收总计", index = 2)
     @ColumnWidth(15)
-    @Schema(description = "订单号")
-    private String orderNo;
+    @Schema(description = "应收总计")
+    private BigDecimal accountsReceivableSumMoney;
 
     /**
-     *  车牌号
+     *  应收手续费
      */
-    @ExcelProperty(value = "车牌号", index = 5)
+    @ExcelProperty(value = "应收手续费", index = 3)
     @ColumnWidth(15)
-    @Schema(description = "车牌号")
-    private String licenseNo;
+    @Schema(description = "应收手续费")
+    private BigDecimal accountsReceivableCommissionMoney;
 
 
     /**
-     *  订单类型
+     *  应收跟单费
      */
-    @ExcelProperty(value = "订单类型", index = 6)
+    @ExcelProperty(value = "应收跟单费", index = 4)
     @ColumnWidth(15)
-    @Schema(description = "订单类型")
-    private String orderTypeName;
+    @Schema(description = "应收跟单费")
+    private BigDecimal accountsReceivableFollowUpFeeMoney;
 
     /**
-     *  险种
+     *  未开票总计
      */
-    @ExcelProperty(value = "险种", index = 7)
+    @ExcelProperty(value = "未开票总计", index = 5)
     @ColumnWidth(10)
-    @Schema(description = "险种")
-    private String riskName;
+    @Schema(description = "未开票总计")
+    private BigDecimal uninvoicedSumMoney;
 
 
     /**
-     *  报价次数
+     *  未开票手续费
      */
-    @ExcelProperty(value = "报价次数", index = 8)
+    @ExcelProperty(value = "未开票手续费", index = 6)
     @ColumnWidth(10)
-    @Schema(description = "报价次数")
-    private Long quoteCountNum;
+    @Schema(description = "未开票手续费")
+    private BigDecimal uninvoicedCommissionMoney;
     /**
-     *  保费
+     *  未开票跟单费
      */
-    @ExcelProperty(value = "保费", index = 9)
+    @ExcelProperty(value = "未开票跟单费", index = 7)
     @ColumnWidth(10)
-    @Schema(description = "保费")
-    private BigDecimal sumPremium;
+    @Schema(description = "未开票跟单费")
+    private BigDecimal uninvoicedFollowUpFeeMoney;
+
+    /**
+     *  已开票总计
+     */
+    @ExcelProperty(value = "已开票总计", index = 8)
+    @ColumnWidth(20)
+    @Schema(description = "已开票总计")
+    private BigDecimal invoicedSumMoney;
+
+
+    /**
+     *  已开票手续费
+     */
+    @ExcelProperty(value = "已开票手续费", index = 9)
+    @ColumnWidth(20)
+    @Schema(description = "已开票手续费")
+    private BigDecimal invoicedCommissionMoney;
+
+
+    /**
+     *  已开票跟单费
+     */
+    @ExcelProperty(value = "已开票跟单费", index = 10)
+    @ColumnWidth(15)
+    @Schema(description = "已开票跟单费")
+    private BigDecimal invoicedFollowUpFeeMoney;
+
+    /**
+     *  未结算总计
+     */
+    @ExcelProperty(value = "未结算总计", index = 11)
+    @ColumnWidth(20)
+    @Schema(description = "未结算总计")
+    private BigDecimal unsettledSumMoney;
+
+
+    /**
+     *  未结算手续费
+     */
+    @ExcelProperty(value = "未结算手续费", index = 12)
+    @ColumnWidth(20)
+    @Schema(description = "未结算手续费")
+    private BigDecimal unsettledCommissionMoney;
+
+
+    /**
+     *  未结算跟单费
+     */
+    @ExcelProperty(value = "未结算跟单费", index = 13)
+    @ColumnWidth(15)
+    @Schema(description = "未结算跟单费")
+    private BigDecimal unsettledFollowUpFeeMoney;
 
     /**
-     *  录单时间
+     *  已结算总计
      */
-    @ExcelProperty(value = "录单时间", index = 9)
+    @ExcelProperty(value = "已结算总计", index = 14)
     @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;
+    @Schema(description = "已结算总计")
+    private BigDecimal settledSumMoney;
 
 
     /**
-     *  签单时间
+     *  已结算手续费
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @ExcelProperty(value = "已结算手续费", index = 15)
     @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;
+    @Schema(description = "已结算手续费")
+    private BigDecimal settledCommissionMoney;
 
 
     /**
-     *  管理人
+     *  已结算跟单费
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "已结算跟单费", index = 16)
     @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @Schema(description = "已结算跟单费")
+    private BigDecimal settledFollowUpFeeMoney;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportReceivableDataDto.java

@@ -32,126 +32,49 @@ import java.util.Date;
 public class ReportReceivableDataDto {
 
     /**
-     *  业务员
+     *  时间
      */
-    @ExcelProperty(value = "业务员", index = 0)
+    @ExcelProperty(value = "时间", index = 0)
     @ColumnWidth(10)
-    @Schema(description = "业务员")
-    private String salesmanName;
+    @Schema(description = "时间")
+    private String yearAndMonthTime;
 
     /**
-     *  业务员手机号
+     *  应收
      */
-    @ExcelProperty(value = "手机号", index = 1)
+    @ExcelProperty(value = "应收", index = 1)
     @ColumnWidth(10)
-    @Schema(description = "手机号")
-    private String salesmanPhone;
+    @Schema(description = "应收")
+    private BigDecimal accountsReceivableMoney;
 
     /**
-     * 保险公司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)
+    @ExcelProperty(value = "应收", index = 3)
     @ColumnWidth(10)
-    @Schema(description = "险种")
-    private String riskName;
-
-
+    @Schema(description = "未开票")
+    private BigDecimal uninvoicedMoney;
     /**
-     *  报价次数
+     * 已开票
      */
-    @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)
+    @ExcelProperty(value = "已开票", index = 3)
     @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;
-
+    @Schema(description = "已开票")
+    private BigDecimal invoicedMoney;
 
     /**
-     *  签单时间
+     *  未结算
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @ExcelProperty(value = "未结算", index = 4)
     @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;
-
+    @Schema(description = "未结算")
+    private BigDecimal unsettledMoney;
 
     /**
-     *  管理人
+     *  已结算
      */
-    @ExcelProperty(value = "管理人", index = 11)
-    @ColumnWidth(15)
-    @Schema(description = "管理人")
-    private String manegerName;
+    @ExcelProperty(value = "已结算", index = 5)
+    @ColumnWidth(20)
+    @Schema(description = "已结算")
+    private BigDecimal settledMoney;
 }

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanBusinessDetailDto.java

@@ -128,7 +128,7 @@ public class ReportSalesmanBusinessDetailDto {
     /**
      *  录单时间
      */
-    @ExcelProperty(value = "录单时间", index = 9)
+    @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")
@@ -139,7 +139,7 @@ public class ReportSalesmanBusinessDetailDto {
     /**
      *  签单时间
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @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")
@@ -150,7 +150,7 @@ public class ReportSalesmanBusinessDetailDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "管理人", index = 12)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataDto.java

@@ -58,7 +58,7 @@ public class ReportSalesmanDataDto {
     /**
      *  报价订单
      */
-    @ExcelProperty(value = "报价订单", index = 4)
+    @ExcelProperty(value = "报价订单", index = 3)
     @ColumnWidth(15)
     @Schema(description = "报价订单")
     private Long quoteOrderNum;
@@ -66,7 +66,7 @@ public class ReportSalesmanDataDto {
     /**
      *  代客录单
      */
-    @ExcelProperty(value = "代客录单", index = 5)
+    @ExcelProperty(value = "代客录单", index = 4)
     @ColumnWidth(15)
     @Schema(description = "代客录单")
     private Long proxyCustomerOrderNum;
@@ -75,7 +75,7 @@ public class ReportSalesmanDataDto {
     /**
      *  pc报价中
      */
-    @ExcelProperty(value = "pc报价中", index = 6)
+    @ExcelProperty(value = "pc报价中", index = 5)
     @ColumnWidth(15)
     @Schema(description = "pc报价中")
     private Long pcOrderNum;
@@ -83,7 +83,7 @@ public class ReportSalesmanDataDto {
     /**
      *  app报价中
      */
-    @ExcelProperty(value = "app报价中", index = 7)
+    @ExcelProperty(value = "app报价中", index = 6)
     @ColumnWidth(10)
     @Schema(description = "app报价中")
     private Long appOrderNum;
@@ -92,14 +92,14 @@ public class ReportSalesmanDataDto {
     /**
      *  待缴费
      */
-    @ExcelProperty(value = "待缴费", index = 8)
+    @ExcelProperty(value = "待缴费", index = 7)
     @ColumnWidth(10)
     @Schema(description = "待缴费")
     private Long payPendingOrderNum;
     /**
      *  核保失败
      */
-    @ExcelProperty(value = "核保失败", index = 9)
+    @ExcelProperty(value = "核保失败", index = 8)
     @ColumnWidth(20)
     @Schema(description = "核保失败")
     private Long underwritRejectNum;
@@ -108,7 +108,7 @@ public class ReportSalesmanDataDto {
     /**
      *  核保通过率
      */
-    @ExcelProperty(value = "核保通过率", index = 10)
+    @ExcelProperty(value = "核保通过率", index = 9)
     @ColumnWidth(20)
     @Schema(description = "核保通过率")
     private BigDecimal underwritPassRate;
@@ -116,7 +116,7 @@ public class ReportSalesmanDataDto {
     /**
      *  承保率
      */
-    @ExcelProperty(value = "承保率", index = 11)
+    @ExcelProperty(value = "承保率", index = 10)
     @ColumnWidth(15)
     @Schema(description = "承保率")
     private BigDecimal underwriteRate;
@@ -132,7 +132,7 @@ public class ReportSalesmanDataDto {
     /**
      *  补录待审核
      */
-    @ExcelProperty(value = "补录待审核", index = 11)
+    @ExcelProperty(value = "补录待审核", index = 12)
     @ColumnWidth(15)
     @Schema(description = "补录待审核")
     private Long additionalRecordingPendingApprovalOrderNum;
@@ -140,7 +140,7 @@ public class ReportSalesmanDataDto {
     /**
      *  补录审核通过
      */
-    @ExcelProperty(value = "补录审核通过", index = 11)
+    @ExcelProperty(value = "补录审核通过", index = 13)
     @ColumnWidth(15)
     @Schema(description = "补录审核通过")
     private Long additionalRecordingApprovalOrderNum;
@@ -148,7 +148,7 @@ public class ReportSalesmanDataDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "管理人", index = 14)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataManageDetailDto.java

@@ -128,7 +128,7 @@ public class ReportSalesmanDataManageDetailDto {
     /**
      *  录单时间
      */
-    @ExcelProperty(value = "录单时间", index = 9)
+    @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")
@@ -139,7 +139,7 @@ public class ReportSalesmanDataManageDetailDto {
     /**
      *  签单时间
      */
-    @ExcelProperty(value = "签单时间", index = 10)
+    @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")
@@ -150,7 +150,7 @@ public class ReportSalesmanDataManageDetailDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "管理人", index = 12)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanDataManageDto.java

@@ -31,42 +31,42 @@ public class ReportSalesmanDataManageDto {
     /**
      *姓名
      */
-    @ExcelProperty(value = "姓名", index = 1)
+    @ExcelProperty(value = "姓名", index = 0)
     @ColumnWidth(20)
     @Schema(description = "姓名")
     private String salesmanName;
     /**
      * 手机号
      */
-    @ExcelProperty(value = "手机号", index = 2)
+    @ExcelProperty(value = "手机号", index = 1)
     @ColumnWidth(20)
     @Schema(description = "手机号")
     private String salesmanPhone;
     /**
      *  所属机构
      */
-    @ExcelProperty(value = "所属机构", index = 3)
+    @ExcelProperty(value = "所属机构", index = 2)
     @ColumnWidth(20)
     @Schema(description = "所属机构")
     private String deptName;
     /**
      *  承保订单
      */
-    @ExcelProperty(value = "承保订单", index = 4)
+    @ExcelProperty(value = "承保订单", index = 3)
     @ColumnWidth(20)
     @Schema(description = "承保订单")
     private Long underwriteOrderNum;
     /**
      *  保费
      */
-    @ExcelProperty(value = "保费", index = 5)
+    @ExcelProperty(value = "保费", index = 4)
     @ColumnWidth(10)
     @Schema(description = "保费")
     private BigDecimal sumPremium;
     /**
      *  单交保费
      */
-    @ExcelProperty(value = "交强保费", index = 6)
+    @ExcelProperty(value = "交强保费", index = 5)
     @ColumnWidth(15)
     @Schema(description = "交强保费")
     private BigDecimal jqPremium;
@@ -74,7 +74,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  车船税
      */
-    @ExcelProperty(value = "车船税", index = 7)
+    @ExcelProperty(value = "车船税", index = 6)
     @ColumnWidth(15)
     @Schema(description = "车船税")
     private BigDecimal taxPremium;
@@ -82,7 +82,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  商业保费
      */
-    @ExcelProperty(value = "商业保费", index = 8)
+    @ExcelProperty(value = "商业保费", index = 7)
     @ColumnWidth(15)
     @Schema(description = "商业保费")
     private BigDecimal syPremium;
@@ -90,7 +90,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  交三保费
      */
-    @ExcelProperty(value = "驾意保费", index = 9)
+    @ExcelProperty(value = "驾意保费", index = 8)
     @ColumnWidth(15)
     @Schema(description = "驾意保费")
     private BigDecimal jyPremium;
@@ -98,7 +98,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  单交订单
      */
-    @ExcelProperty(value = "单交订单", index = 10)
+    @ExcelProperty(value = "单交订单", index = 9)
     @ColumnWidth(15)
     @Schema(description = "单交订单")
     private BigDecimal djOrderNum;
@@ -106,7 +106,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  单三订单
      */
-    @ExcelProperty(value = "单三订单", index = 11)
+    @ExcelProperty(value = "单三订单", index = 10)
     @ColumnWidth(15)
     @Schema(description = "单三订单")
     private BigDecimal dszOrderNum;
@@ -114,7 +114,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  单商订单
      */
-    @ExcelProperty(value = "单商订单", index = 12)
+    @ExcelProperty(value = "单商订单", index = 11)
     @ColumnWidth(15)
     @Schema(description = "单商订单")
     private BigDecimal dsyOrderNum;
@@ -122,7 +122,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  交三订单
      */
-    @ExcelProperty(value = "交三订单", index = 13)
+    @ExcelProperty(value = "交三订单", index = 12)
     @ColumnWidth(15)
     @Schema(description = "交三订单")
     private BigDecimal jszOrderNum;
@@ -130,7 +130,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  交商订单
      */
-    @ExcelProperty(value = "交商订单", index = 14)
+    @ExcelProperty(value = "交商订单", index = 13)
     @ColumnWidth(15)
     @Schema(description = "交商订单")
     private BigDecimal jsyOrderNum;
@@ -138,7 +138,7 @@ public class ReportSalesmanDataManageDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 15)
+    @ExcelProperty(value = "管理人", index = 14)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;

commons/src/main/java/com/jzg/commons/entity/report/dto/ReportSalesmanReportDto.java

@@ -50,7 +50,7 @@ public class ReportSalesmanReportDto {
     /**
      *  所属机构
      */
-    @ExcelProperty(value = "所属机构", index = 3)
+    @ExcelProperty(value = "所属机构", index = 2)
     @ColumnWidth(20)
     @Schema(description = "所属机构")
     private String deptName;
@@ -58,7 +58,7 @@ public class ReportSalesmanReportDto {
     /**
      *  所在地区
      */
-    @ExcelProperty(value = "所在地区", index = 4)
+    @ExcelProperty(value = "所在地区", index = 3)
     @ColumnWidth(25)
     @Schema(description = "所在地区")
     private String areaName;
@@ -66,14 +66,14 @@ public class ReportSalesmanReportDto {
     /**
      *  承保订单
      */
-    @ExcelProperty(value = "承保订单", index = 5)
+    @ExcelProperty(value = "承保订单", index = 4)
     @ColumnWidth(20)
     @Schema(description = "承保订单")
     private Long underwriteOrderNum;
     /**
      *  保费
      */
-    @ExcelProperty(value = "保费", index =6)
+    @ExcelProperty(value = "保费", index =5)
     @ColumnWidth(10)
     @Schema(description = "保费")
     private BigDecimal sumPremium;
@@ -81,7 +81,7 @@ public class ReportSalesmanReportDto {
     /**
      *  出单佣金
      */
-    @ExcelProperty(value = "出单佣金", index = 7)
+    @ExcelProperty(value = "出单佣金", index = 6)
     @ColumnWidth(20)
     @Schema(description = "出单佣金")
     private BigDecimal orderCommissionPremium;
@@ -89,7 +89,7 @@ public class ReportSalesmanReportDto {
     /**
      *  单均保费
      */
-    @ExcelProperty(value = "单均保费", index = 8)
+    @ExcelProperty(value = "单均保费", index = 7)
     @ColumnWidth(20)
     @Schema(description = "单均保费")
     private BigDecimal avgOrderNumPremium;
@@ -97,7 +97,7 @@ public class ReportSalesmanReportDto {
     /**
      *  上次登录
      */
-    @ExcelProperty(value = "上次登录", index = 9)
+    @ExcelProperty(value = "上次登录", index = 8)
     @ColumnWidth(20)
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -107,7 +107,7 @@ public class ReportSalesmanReportDto {
     /**
      *  上次签单
      */
-    @ExcelProperty(value = "上次签单", index = 10)
+    @ExcelProperty(value = "上次签单", index = 9)
     @ColumnWidth(20)
     @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd")
     @DateTimeFormat(pattern="yyyy-MM-dd")
@@ -117,7 +117,7 @@ public class ReportSalesmanReportDto {
     /**
      *  管理人
      */
-    @ExcelProperty(value = "管理人", index = 11)
+    @ExcelProperty(value = "管理人", index = 10)
     @ColumnWidth(15)
     @Schema(description = "管理人")
     private String manegerName;
@@ -126,14 +126,14 @@ public class ReportSalesmanReportDto {
     /**
      *  人员状态
      */
-    @ExcelProperty(value = "人员状态", index = 12)
+    @ExcelProperty(value = "人员状态", index = 11)
     @ColumnWidth(15)
     @Schema(description = "人员状态")
     private String personStatus;
     /**
      *  账号状态
      */
-    @ExcelProperty(value = "账号状态", index = 13)
+    @ExcelProperty(value = "账号状态", index = 12)
     @ColumnWidth(10)
     @Schema(description = "账号状态")
     private String accountStatus;

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

@@ -11,6 +11,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  *  @version
  *  @author: hxl
@@ -20,7 +22,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Tag(name="财务数据管理")
 @RestController
-@RequestMapping("/console/businessDataManage")
+@RequestMapping("/console/financeDataManage")
 public class ReportFinanceDataManageController extends BaseController {
 
     //财务数据-费用校验
@@ -120,7 +122,7 @@ public class ReportFinanceDataManageController extends BaseController {
     @PostMapping(value = "/receivableDataPageList")
     public HttpResult<?> receivableDataPageList(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
-            IPage<?> pageList = reportReceivableDataService.getPageListByParams(reportSearchCommonVo);
+            List<?> pageList = reportReceivableDataService.getListByParams(reportSearchCommonVo);
             return HttpResult.ok(pageList);
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
@@ -152,8 +154,8 @@ public class ReportFinanceDataManageController extends BaseController {
     @PostMapping(value = "/receivableDataDetailPageList")
     public HttpResult<?> receivableDataDetailPageList(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
-            IPage<?> pageList = reportReceivableDataService.getPageDetailListByParams(reportSearchCommonVo);
-            return HttpResult.ok(pageList);
+            List<?> list = reportReceivableDataService.getDetailListByParams(reportSearchCommonVo);
+            return HttpResult.ok(list);
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
         }
@@ -182,11 +184,11 @@ public class ReportFinanceDataManageController extends BaseController {
      *  @Description: 财务数据-应付-列表
      */
     @Operation(summary = "财务数据-应付-列表查询", description = "财务数据-应付-列表查询")
-    @PostMapping(value = "meetDataPageList")
+    @PostMapping(value = "/meetDataPageList")
     public HttpResult<?> meetDataPageList(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
-            IPage<?> pageList = reportMeetDataService.getPageListByParams(reportSearchCommonVo);
-            return HttpResult.ok(pageList);
+            List<?> list = reportMeetDataService.getListByParams(reportSearchCommonVo);
+            return HttpResult.ok(list);
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
         }
@@ -263,8 +265,8 @@ public class ReportFinanceDataManageController extends BaseController {
      *  @Description: 财务数据-经营利润-列表导出
      */
     @Operation(summary = "财务数据-经营利润-列表导出", description = "财务数据-经营利润-列表导出")
-    @PostMapping(value = "/operatingProfitDataToTask1")
-    public HttpResult<?> salesmanDataManageToTask(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
+    @PostMapping(value = "/operatingProfitDataToTask")
+    public HttpResult<?> operatingProfitDataToTask(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
             reportOperatingProfitDataService.downloadListByParams(reportSearchCommonVo);
             return HttpResult.ok("财务数据-经营利润-列表导出任务处理中，请在导出中心中查看");

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

@@ -157,10 +157,10 @@ public class ReportPersonDataManageController extends BaseController {
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细导出
+     *  @Description:  人员数据-业务员组织-人员明细导出
      */
     @Operation(summary = "人员数据-业务员组织-人员明细导出", description = "人员数据-业务员组织-人员明细导出")
-    @PostMapping(value = "/salesmanDeptDetailToPage")
+    @PostMapping(value = "/salesmanDeptDetailToTask")
     public HttpResult<?> salesmanDeptDetailToPage(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
             reportSalesmanDeptService.downloadDetailListByParams(reportSearchCommonVo);
@@ -174,13 +174,13 @@ public class ReportPersonDataManageController extends BaseController {
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/22 17:11
-     *  @Description:  业务数据-保险公司-明细查询
+     *  @Description:  人员数据-业务员组织-业务明细查询
      */
     @Operation(summary = "人员数据-业务员组织-业务明细查询", description = "人员数据-业务员组织-业务明细查询")
     @PostMapping(value = "/salesmanBusinessDetailPageList")
     public HttpResult<?> riskDataManageDetailPageList(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
-            IPage<?> pageList = reportSalesmanDeptService.getPageDetailListByParams(reportSearchCommonVo);
+            IPage<?> pageList = reportSalesmanDeptService.getPageBusinessDetailListByParams(reportSearchCommonVo);
             return HttpResult.ok(pageList);
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
@@ -190,13 +190,13 @@ public class ReportPersonDataManageController extends BaseController {
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/22 17:11
-     *  @Description:  人员数据-保险公司-明细导出
+     *  @Description:  人员数据-业务员组织-业务明细导出
      */
     @Operation(summary = "人员数据-业务员组织-业务明细导出", description = "人员数据-业务员组织-业务明细导出")
-    @PostMapping(value = "/salesmanBusinessDetailToPage")
+    @PostMapping(value = "/salesmanBusinessDetailToTask")
     public HttpResult<?> riskDataManageDetailToPage(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
-            reportSalesmanDeptService.downloadDetailListByParams(reportSearchCommonVo);
+            reportSalesmanDeptService.downloadBusinessDetailListByParams(reportSearchCommonVo);
             return HttpResult.ok("人员数据-业务员组织-业务明细导出处理中，请在导出中心中查看");
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
@@ -230,7 +230,7 @@ public class ReportPersonDataManageController extends BaseController {
     public HttpResult<?> channelPersonDataToTask(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
             reportChannelPersonDataService.downloadListByParams(reportSearchCommonVo);
-            return HttpResult.ok("人员数据-保险公司-列表导出处理中，请在导出中心中查看");
+            return HttpResult.ok("人员数据-渠道-列表导出处理中，请在导出中心中查看");
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
         }
@@ -262,7 +262,7 @@ public class ReportPersonDataManageController extends BaseController {
     public HttpResult<?> channelPersonDataDetailToTask(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
             reportChannelPersonDataService.downloadDetailListByParams(reportSearchCommonVo);
-            return HttpResult.ok("人员数据-保险公司-明细导出处理中，请在导出中心中查看");
+            return HttpResult.ok("人员数据-渠道-明细导出处理中，请在导出中心中查看");
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
         }

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

@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.*;
 @Slf4j
 @Tag(name="任务数据管理")
 @RestController
-@RequestMapping("/console/businessDataManage")
+@RequestMapping("/console/taskDataManage")
 public class ReportTaskDataManageController extends BaseController {
 
     //任务数据-业务员
@@ -132,7 +132,7 @@ public class ReportTaskDataManageController extends BaseController {
     public HttpResult<?> channelDataToTask(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
             reportChannelDataService.downloadListByParams(reportSearchCommonVo);
-            return HttpResult.ok("业务数据-险种报表-列表导出处理中，请在导出中心中查看");
+            return HttpResult.ok("任务数据-渠道-列表导出处理中，请在导出中心中查看");
         }catch (Exception e){
             return HttpResult.error(e.getMessage());
         }
@@ -160,7 +160,7 @@ public class ReportTaskDataManageController extends BaseController {
      *  @Description:  任务数据-渠道-明细导出
      */
     @Operation(summary = "任务数据-渠道-明细导出", description = "任务数据-渠道-明细导出")
-    @PostMapping(value = "/channelDataDetailToPage")
+    @PostMapping(value = "/channelDataDetailToTask")
     public HttpResult<?> channelDataDetailToPage(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
         try{
             reportChannelDataService.downloadDetailListByParams(reportSearchCommonVo);
@@ -169,25 +169,6 @@ public class ReportTaskDataManageController extends BaseController {
             return HttpResult.error(e.getMessage());
         }
     }
-
-    /**
-     *  @version
-     *  @author: hxl
-     *  @Date: 2025/9/22 17:08
-     *  @Description: 业务数据-渠道-列表
-     */
-    @Operation(summary = "业务数据-渠道-列表查询", description = "业务数据-渠道-列表查询")
-    @PostMapping(value = "/channelDataManagePageList2")
-    public HttpResult<?> channelDataManagePageList(@RequestBody ReportSearchCommonVo reportSearchCommonVo) {
-        try{
-            IPage<?> pageList = reportTelemarketingDataService.getPageListByParams(reportSearchCommonVo);
-            return HttpResult.ok(pageList);
-        }catch (Exception e){
-            return HttpResult.error(e.getMessage());
-        }
-    }
-
-
     /**
      *  @version
      *  @author: hxl

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

@@ -1,5 +1,9 @@
 package com.jzg.console.service;
 
+import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
+
+import java.util.List;
+
 /**
  *  @version 
  *  @author: hxl

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

@@ -1,5 +1,9 @@
 package com.jzg.console.service;
 
+import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
+
+import java.util.List;
+
 /**
  *  @version 
  *  @author: hxl
@@ -8,4 +12,12 @@ package com.jzg.console.service;
  */ 
 public interface ReportMeetDataService extends  ReportBaseService{
 
+
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:57
+     *  @Description:  财务数据-应付-列表
+     */
+    List<?> getListByParams(ReportSearchCommonVo reportSearchCommonVo);
 }

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

@@ -1,5 +1,9 @@
 package com.jzg.console.service;
 
+import com.jzg.commons.entity.report.vo.ReportSearchCommonVo;
+
+import java.util.List;
+
 /**
  *  @version 
  *  @author: hxl
@@ -7,5 +11,20 @@ package com.jzg.console.service;
  *  @Description:  财务数据-应收
  */ 
 public interface ReportReceivableDataService extends  ReportBaseService{
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:37
+     *  @Description:  列表
+     */
+    List<?> getListByParams(ReportSearchCommonVo reportSearchCommonVo);
+
 
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:37
+     *  @Description:  明细
+     */
+    List<?> getDetailListByParams(ReportSearchCommonVo reportSearchCommonVo);
 }

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportCostVerificationDataServiceImpl.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.ReportCostVerificationDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -24,17 +28,19 @@ import java.util.List;
  */
 @Service
 public class ReportCostVerificationDataServiceImpl extends ReportBaseServiceImpl implements ReportCostVerificationDataService {
+
+
     /**
      *  @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<ReportCostVerificationDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportCostVerificationDataDto> pageList = new Page<ReportCostVerificationDataDto>();
+        List<ReportCostVerificationDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,30 +48,45 @@ public class ReportCostVerificationDataServiceImpl extends ReportBaseServiceImpl
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:28
+     *  @Description: 财务数据-费用校验-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportCostVerificationDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportCostVerificationDataDto.class,list,"财务数据-费用校验-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:30
+     *  @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();
-        detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
-        detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
-        detailPageList.setPages(reportSearchCommonVo.getPageNo());
-        detailPageList.setPages(reportSearchCommonVo.getPageSize());
-        return detailPageList;
+        Page<ReportCostVerificationDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportCostVerificationDataDetailDto> pageList = new Page<ReportCostVerificationDataDetailDto>();
+        List<ReportCostVerificationDataDetailDto> list = getDetailList();
+        pageList.setRecords(list);
+        pageList.setTotal(1l);
+        pageList.setCurrent(reportSearchCommonVo.getPageNo());
+        pageList.setPages(reportSearchCommonVo.getPageNo());
+        pageList.setPages(reportSearchCommonVo.getPageSize());
+        return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:30
+     *  @Description:  财务数据-费用校验-明细列表
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportCostVerificationDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportCostVerificationDataDetailDto.class,detailList,"财务数据-费用校验-明细列表-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +95,12 @@ public class ReportCostVerificationDataServiceImpl extends ReportBaseServiceImpl
      *  @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<ReportCostVerificationDataDto>  getList(){
+        List<ReportCostVerificationDataDto> list =new ArrayList<>();
+        ReportCostVerificationDataDto reportCostVerificationDataDto = ReportCostVerificationDataDto.builder()
+                .companyId("1").companyName("永诚财险").pendingReviewNum(100L).reviewedNum(100L)
+                .autoReviewNum(100L).manualReviewNum(100L).aveReviewDuration(10L).build();
+        list.add(reportCostVerificationDataDto);
         return list;
     }
 
@@ -90,14 +110,14 @@ public class ReportCostVerificationDataServiceImpl extends ReportBaseServiceImpl
      *  @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("众安财险科技营销部")
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+    public List<ReportCostVerificationDataDetailDto>  getDetailList(){
+        List<ReportCostVerificationDataDetailDto> list =new ArrayList<>();
+        ReportCostVerificationDataDetailDto reportCostVerificationDataDetailDto = ReportCostVerificationDataDetailDto.builder()
+                .companyId("1").companyName("永诚财险").checkTypeName("已审核")
+                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单")
+                .submitCheckTime(new Date()).checkTime(new Date()).checkStatusName("已承保")
+                .checkTimeSecond(100L).checkUserName("张三").build();
+        list.add(reportCostVerificationDataDetailDto);
         return list;
     }
 }

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

@@ -1,14 +1,17 @@
 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.ReportMeetDataService;
 import com.jzg.console.service.ReportReceivableDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
+import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,32 +31,39 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
      *  @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();
-        pageList.setRecords(list);
-        pageList.setTotal(1l);
-        pageList.setCurrent(reportSearchCommonVo.getPageNo());
-        pageList.setPages(reportSearchCommonVo.getPageNo());
-        pageList.setPages(reportSearchCommonVo.getPageSize());
-        return pageList;
+    public List<?> getListByParams(ReportSearchCommonVo reportSearchCommonVo) {
+        return getList();
     }
 
+    @Override
+    public IPage<?> getPageListByParams(ReportSearchCommonVo reportSearchCommonVo) {
+        return null;
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:58
+     *  @Description:  财务数据-应付-导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportMeetDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportMeetDataDto.class,list,"财务数据-应付-导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:58
+     *  @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<ReportMeetDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportMeetDataDetailDto> detailPageList = new Page<ReportMeetDataDetailDto>();
+        List<ReportMeetDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +71,16 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:58
+     *  @Description:  财务数据-应付-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportMeetDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportMeetDataDetailDto.class,detailList,"财务数据-应付-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +89,14 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
      *  @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<ReportMeetDataDto>  getList(){
+        List<ReportMeetDataDto> list =new ArrayList<>();
+        ReportMeetDataDto reportMeetDataDto = ReportMeetDataDto.builder()
+                .yearAndMonthTime("2023-10").sumPremium(new BigDecimal(456))
+                .payableCommissionMoney(new BigDecimal(456)).unwithdrawnMoney(new BigDecimal(456))
+                .withdrawingMoney(new BigDecimal(456)).paidMoney(new BigDecimal(456))
+                .build();
+        list.add(reportMeetDataDto);
         return list;
     }
 
@@ -90,14 +106,13 @@ public class ReportMeetDataServiceImpl extends ReportBaseServiceImpl implements
      *  @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("众安财险科技营销部")
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+    public List<ReportMeetDataDetailDto>  getDetailList(){
+        List<ReportMeetDataDetailDto> list =new ArrayList<>();
+        ReportMeetDataDetailDto reportMeetDataDetailDto = ReportMeetDataDetailDto.builder()
+                .salesmanName("张三").salesmanPhone("18811458895").bankCardNumber("12222").bankName("交通银行")
+                .statusName("已提现").withdrawalMoney(new BigDecimal(456))
+                .paidPersonName("李四").paidTime(new Date()).build();
+        list.add(reportMeetDataDetailDto);
         return list;
     }
 }

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

@@ -1,14 +1,18 @@
 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.ReportOperatingProfitDataDto;
 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.vo.ReportSearchCommonVo;
 import com.jzg.console.service.ReportOperatingProfitDataService;
 import com.jzg.console.service.ReportReceivableDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,13 +32,13 @@ public class ReportOperatingProfitDataServiceImpl extends ReportBaseServiceImpl
      *  @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<ReportOperatingProfitDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportOperatingProfitDataDto> pageList = new Page<ReportOperatingProfitDataDto>();
+        List<ReportOperatingProfitDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,46 +46,26 @@ public class ReportOperatingProfitDataServiceImpl extends ReportBaseServiceImpl
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 11:05
+     *  @Description:  财务数据-经营利润-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportOperatingProfitDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportOperatingProfitDataDto.class,list,"财务数据-经营利润-列表导出-"+ reportSearchCommonVo.getUserId());
     }
 
     @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();
-        detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
-        detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
-        detailPageList.setPages(reportSearchCommonVo.getPageNo());
-        detailPageList.setPages(reportSearchCommonVo.getPageSize());
-        return detailPageList;
+        return null;
     }
 
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
-    }
 
-    /**
-     *  @version
-     *  @author: hxl
-     *  @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);
-        return list;
     }
 
     /**
@@ -90,14 +74,13 @@ public class ReportOperatingProfitDataServiceImpl extends ReportBaseServiceImpl
      *  @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("众安财险科技营销部")
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+    public List<ReportOperatingProfitDataDto>  getList(){
+        List<ReportOperatingProfitDataDto> list =new ArrayList<>();
+        ReportOperatingProfitDataDto reportOperatingProfitDataDto = ReportOperatingProfitDataDto.builder()
+                .yearAndMonthTime("2023-10").sumPremium(new BigDecimal(456)).receivableMoney(new BigDecimal(456))
+                .meetMoney(new BigDecimal(23)).profitMoney(new BigDecimal(32))
+                .receivedMoney(new BigDecimal(23)).paidMoney(new BigDecimal(23)).build();
+        list.add(reportOperatingProfitDataDto);
         return list;
     }
 }

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

@@ -1,14 +1,17 @@
 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.ReportPersonCheckDataService;
 import com.jzg.console.service.ReportReceivableDataService;
+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 +31,13 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
      *  @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<ReportPersonCheckDataDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportPersonCheckDataDto> pageList = new Page<ReportPersonCheckDataDto>();
+        List<ReportPersonCheckDataDto> list = getList();
         pageList.setRecords(list);
         pageList.setTotal(1l);
         pageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -42,18 +45,28 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
         pageList.setPages(reportSearchCommonVo.getPageSize());
         return pageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 11:07
+     *  @Description: 财务数据-人员审核-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportPersonCheckDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportPersonCheckDataDto.class,list,"财务数据-人员审核-列表导出-"+ reportSearchCommonVo.getUserId());
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 11:08
+     *  @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<ReportPersonCheckDataDetailDto> page = new Page<>(reportSearchCommonVo.getPageNo(), reportSearchCommonVo.getPageSize());
+        IPage<ReportPersonCheckDataDetailDto> detailPageList = new Page<ReportPersonCheckDataDetailDto>();
+        List<ReportPersonCheckDataDetailDto> detailList = getDetailList();
         detailPageList.setRecords(detailList);
         detailPageList.setTotal(1l);
         detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
@@ -61,11 +74,16 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
         detailPageList.setPages(reportSearchCommonVo.getPageSize());
         return detailPageList;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 11:08
+     *  @Description: 财务数据-人员审核-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportPersonCheckDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportPersonCheckDataDetailDto.class,detailList,"财务数据-人员审核-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +92,14 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
      *  @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<ReportPersonCheckDataDto>  getList(){
+        List<ReportPersonCheckDataDto> list =new ArrayList<>();
+        ReportPersonCheckDataDto reportPersonCheckDataDto = ReportPersonCheckDataDto.builder()
+                .salesmanName("张三").salesmanPhone("18811459985").deptName("众安财险科技营销部")
+                .checkOrderNum(100L).pendingReviewOrderNum(100L).avgReviewDuration(100L)
+                .rejectOrderNum(100L).updateOrderNum(100L)
+                .build();
+        list.add(reportPersonCheckDataDto);
         return list;
     }
 
@@ -90,14 +109,14 @@ public class ReportPersonCheckDataServiceImpl extends ReportBaseServiceImpl impl
      *  @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("众安财险科技营销部")
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+    public List<ReportPersonCheckDataDetailDto>  getDetailList(){
+        List<ReportPersonCheckDataDetailDto> list =new ArrayList<>();
+        ReportPersonCheckDataDetailDto reportPersonCheckDataDetailDto = ReportPersonCheckDataDetailDto.builder()
+                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单")
+                .submitCheckTime(new Date()).checkTime(new Date()).checkResult("已审核")
+                .checkDuration(20L).checkUserName("李四").checkUserPhone("18811459985")
+                .build();
+        list.add(reportPersonCheckDataDetailDto);
         return list;
     }
 }

consoleStatistics/src/main/java/com/jzg/console/service/impl/ReportReceivableDataServiceImpl.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.ReportCostVerificationDataService;
 import com.jzg.console.service.ReportReceivableDataService;
+import io.swagger.v3.oas.annotations.media.Schema;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
@@ -28,44 +30,51 @@ public class ReportReceivableDataServiceImpl extends ReportBaseServiceImpl imple
      *  @version
      *  @author: hxl
      *  @Date: 2025/9/24 15:37
-     *  @Description: 业务数据-渠道
+     *  @Description: 财务数据-应收-列表
      */
     @Override
+    public List<?> getListByParams(ReportSearchCommonVo reportSearchCommonVo){
+        return getList();
+    }
+    @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();
-        pageList.setRecords(list);
-        pageList.setTotal(1l);
-        pageList.setCurrent(reportSearchCommonVo.getPageNo());
-        pageList.setPages(reportSearchCommonVo.getPageNo());
-        pageList.setPages(reportSearchCommonVo.getPageSize());
-        return pageList;
+        return null;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:44
+     *  @Description:  财务数据-应收-列表导出
+     */
     @Override
     public void downloadListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDto> list = getList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDto.class,list,"业务数据-险种报表-列表导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportReceivableDataDto> list = getList();
+        upLoadFile(reportSearchCommonVo, ReportReceivableDataDto.class,list,"财务数据-应收-列表导出-"+ reportSearchCommonVo.getUserId());
+    }
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:45
+     *  @Description:  财务数据-应收-明细
+     */
+    @Override
+    public List<?> getDetailListByParams(ReportSearchCommonVo reportSearchCommonVo){
+        return getDetailList();
     }
-
     @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();
-        detailPageList.setRecords(detailList);
-        detailPageList.setTotal(1l);
-        detailPageList.setCurrent(reportSearchCommonVo.getPageNo());
-        detailPageList.setPages(reportSearchCommonVo.getPageNo());
-        detailPageList.setPages(reportSearchCommonVo.getPageSize());
-        return detailPageList;
+        return null;
     }
-
+    /**
+     *  @version
+     *  @author: hxl
+     *  @Date: 2025/9/26 10:46
+     *  @Description:  财务数据-应收-明细导出
+     */
     @Override
     public void downloadDetailListByParams(ReportSearchCommonVo reportSearchCommonVo) {
-        List<ReportRiskDataManageDetailDto> detailList = getDetailList();
-        upLoadFile(reportSearchCommonVo, ReportRiskDataManageDetailDto.class,detailList,"业务数据-险种报表-明细导出-"+ reportSearchCommonVo.getUserId());
+        List<ReportReceivableDataDetailDto> detailList = getDetailList();
+        upLoadFile(reportSearchCommonVo, ReportReceivableDataDetailDto.class,detailList,"财务数据-应收-明细导出-"+ reportSearchCommonVo.getUserId());
     }
 
     /**
@@ -74,13 +83,13 @@ public class ReportReceivableDataServiceImpl 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<ReportReceivableDataDto>  getList(){
+        List<ReportReceivableDataDto> list =new ArrayList<>();
+        ReportReceivableDataDto reportReceivableDataDto = ReportReceivableDataDto.builder()
+                .yearAndMonthTime("2023-10").accountsReceivableMoney(new BigDecimal(100))
+                .uninvoicedMoney(new BigDecimal(100)).invoicedMoney(new BigDecimal(100))
+                .unsettledMoney(new BigDecimal(100)).settledMoney(new BigDecimal(100)).build();
+        list.add(reportReceivableDataDto);
         return list;
     }
 
@@ -90,14 +99,17 @@ public class ReportReceivableDataServiceImpl 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("众安财险科技营销部")
-                .orderNo("2025090811253600215").licenseNo("京AG6002").orderTypeName("代客录单").riskName("单交")
-                .quoteCountNum(100L).sumPremium(new BigDecimal(456)).orderStatusName("已承保")
-                .createTime(new Date()).recordTime(new Date()).build();
-        list.add(reportRiskDataManageDetailDto);
+    public List<ReportReceivableDataDetailDto>  getDetailList(){
+        List<ReportReceivableDataDetailDto> list =new ArrayList<>();
+        ReportReceivableDataDetailDto reportReceivableDataDetailDto = ReportReceivableDataDetailDto.builder()
+                .companyId("1").companyName("永诚财险").partnerCompanyName("众安财险科技营销部")
+                .accountsReceivableSumMoney(new BigDecimal(100)).accountsReceivableCommissionMoney(new BigDecimal(100)).accountsReceivableFollowUpFeeMoney(new BigDecimal(100))
+                .uninvoicedSumMoney(new BigDecimal(100)).uninvoicedCommissionMoney(new BigDecimal(100)).uninvoicedFollowUpFeeMoney(new BigDecimal(100))
+                .invoicedSumMoney(new BigDecimal(100)).invoicedCommissionMoney(new BigDecimal(100)).invoicedFollowUpFeeMoney(new BigDecimal(100))
+                .unsettledSumMoney(new BigDecimal(100)).unsettledCommissionMoney(new BigDecimal(100)).unsettledFollowUpFeeMoney(new BigDecimal(100))
+                .settledSumMoney(new BigDecimal(100)).settledCommissionMoney(new BigDecimal(100)).settledFollowUpFeeMoney(new BigDecimal(100))
+                .build();
+        list.add(reportReceivableDataDetailDto);
         return list;
     }
 }