Merge remote-tracking branch 'origin/master'

commons/src/main/java/com/jzg/commons/core/base/BaseModel.java

@@ -1,5 +1,6 @@
 package com.jzg.commons.core.base;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableLogic;
@@ -13,23 +14,28 @@ import java.time.LocalDateTime;
 @Data
 public class BaseModel implements Serializable {
 
+    @ExcelIgnore
     @Schema(description = "是否删除")
     @TableLogic
     private Integer isDelete;
 
+    @ExcelIgnore
     @Schema(description = "创建人")
     @TableField(fill = FieldFill.INSERT)
     private String createBy;
 
+    @ExcelIgnore
     @Schema(description = "创建时间")
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime createTime;
 
+    @ExcelIgnore
     @Schema(description = "修改人")
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String updateBy;
 
+    @ExcelIgnore
     @Schema(description = "修改时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @TableField(fill = FieldFill.INSERT_UPDATE)

commons/src/main/java/com/jzg/commons/entity/dto/InsOrdersParam.java

@@ -40,4 +40,9 @@ public class InsOrdersParam extends PageRequest {
 
     @Schema(description = "录单时间结束")
     private String endDate;
+
+    @Schema(description = "批改状态")
+    private String adjustStatus;
+
+
 }

commons/src/main/java/com/jzg/commons/entity/dto/OrderAdjustAddParam.java

@@ -0,0 +1,18 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+
+@Schema(description = "订单批改新增dto")
+@Data
+public class OrderAdjustAddParam {
+
+    @Schema(description = "订单号")
+    @NotNull(message = "订单号不能为空")
+    private String orderNo;
+
+    @NotNull(message = "批改类型不能为空")
+    @Schema(description = "批改类型 0.整单退保 1.险种批改")
+    private Integer type;
+}

commons/src/main/java/com/jzg/commons/entity/dto/OrderAdjustExportParam.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "订单批改查询dto")
+@Data
+public class OrderAdjustExportParam {
+
+    @Schema(description = "订单号")
+    private Long orderNo;
+
+    @Schema(description = "车牌")
+    private String licenseNo;
+
+    @Schema(description = "保司id")
+    private String companyId;
+
+    @Schema(description = "业务员信息")
+    private String salesman;
+
+    @Schema(description = "批单状态 0.订单批改中 1.待审核 2.审核通过 3.退回修改 4.拒绝批改")
+    private Integer status;
+
+    @Schema(description = "批改类型 0.整单退保 1.险种批改")
+    private Integer type;
+
+    @Schema(description = "批改开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startDate;
+
+    @Schema(description = "批改结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endDate;
+}

commons/src/main/java/com/jzg/commons/entity/dto/OrderAdjustParam.java

@@ -0,0 +1,39 @@
+package com.jzg.commons.entity.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.core.base.PageRequest;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "订单批改分页查询dto")
+@Data
+public class OrderAdjustParam extends PageRequest {
+
+    @Schema(description = "订单号")
+    private Long orderNo;
+
+    @Schema(description = "车牌")
+    private String licenseNo;
+
+    @Schema(description = "保司id")
+    private String companyId;
+
+    @Schema(description = "业务员信息")
+    private String salesman;
+
+    @Schema(description = "批单状态 0.订单批改中 1.待审核 2.审核通过 3.退回修改 4.拒绝批改")
+    private Integer status;
+
+    @Schema(description = "批改类型 0.整单退保 1.险种批改")
+    private Integer type;
+
+    @Schema(description = "批改开始时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime startDate;
+
+    @Schema(description = "批改结束时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private LocalDateTime endDate;
+}

commons/src/main/java/com/jzg/commons/entity/dto/OrdersTrackParam.java

@@ -10,4 +10,7 @@ public class OrdersTrackParam {
 
     @Schema(description = "订单号")
     private String orderNo;
+
+    @Schema(description = "模块")
+    private String module;
 }

commons/src/main/java/com/jzg/commons/entity/dto/VerifyAdjustParam.java

@@ -0,0 +1,18 @@
+package com.jzg.commons.entity.dto;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+@Schema(description = "审核批改订单dto")
+@Data
+public class VerifyAdjustParam {
+
+    @Schema(description = "id")
+    private String id;
+
+    @Schema(description = "费用审核状态 2.审核通过 3.退回修改 4.拒绝批改")
+    private Integer status;
+
+    @Schema(description = "退回修改/拒绝修改原因")
+    private String refuse;
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrderAdjust.java

@@ -0,0 +1,77 @@
+package com.jzg.commons.entity.orders.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.jzg.commons.core.base.BaseModel;
+import com.jzg.commons.entity.quote.vo.aggregated.QuoteEchoVo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 订单批改表
+ * @TableName ins_order_adjust
+ */
+@Data
+@Schema(description = "订单批改表")
+public class InsOrderAdjust extends BaseModel {
+
+    @Schema(description = "主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "车牌")
+    private String licenseNo;
+
+    @Schema(description = "产品ID")
+    private String productId;
+
+    @Schema(description = "产品名称")
+    private String productName;
+
+    @Schema(description = "保司id")
+    private String companyId;
+
+    @Schema(description = "保司名称")
+    private String companyName;
+
+    @Schema(description = "批单状态 0.订单批改中 1.待审核 2.审核通过 3.退回修改 4.拒绝批改")
+    private Integer status;
+
+    @Schema(description = "批改类型 0.整单退保 1.险种批改")
+    private Integer type;
+
+    @Schema(description = "保费")
+    private BigDecimal premium;
+
+    @Schema(description = "批改后保费")
+    private BigDecimal afterPremium;
+
+    @Schema(description = "批改后交强保费")
+    private BigDecimal afterJqPremium;
+
+    @Schema(description = "批改后商业保费")
+    private BigDecimal afterSyPremium;
+
+    @Schema(description = "批改后驾意保费")
+    private BigDecimal afterJyPremium;
+
+    @Schema(description = "拒绝/退回原因")
+    private String refuse;
+
+    @TableField(exist = false)
+    @Schema(description = "批改明细")
+    private List<InsOrderAdjustInfo> adjustInfoList;
+
+
+
+
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrderAdjustInfo.java

@@ -0,0 +1,63 @@
+package com.jzg.commons.entity.orders.po;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+/**
+ * 订单批改明细表
+ * @TableName ins_order_adjust_info
+ */
+@Data
+@Schema(description = "订单批改明细表")
+public class InsOrderAdjustInfo extends BaseModel {
+
+    @Schema(description = "主键ID")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @Schema(description = "批改表id")
+    private String adjustId;
+
+    @Schema(description = "险种类型 0. 交强 1.商业 2.非车")
+    private Integer kindType;
+
+    @Schema(description = "险种code")
+    private String kindCode;
+
+    @Schema(description = "险种名称")
+    private String kindName;
+
+    @Schema(description = "金额或数量")
+    private BigDecimal amount;
+
+    @Schema(description = "调整后金额或数量")
+    private BigDecimal afterAmount;
+
+    @Schema(description = "保费")
+    private BigDecimal premium;
+
+    @Schema(description = "批改类型 0.未批改 1.保额批改 2.退保 3.批增")
+    private Integer type;
+
+    @Schema(description = "调整类型 0. 补缴 1.退款")
+    private Integer adjustType;
+
+    @Schema(description = "调整金额")
+    private BigDecimal adjustAmount;
+
+    @Schema(description = "批改后的保费")
+    private BigDecimal AfterPremium;
+
+    @Schema(description = "是否隐藏 0.否 1.是")
+    private Integer isHide;
+
+
+}

commons/src/main/java/com/jzg/commons/entity/orders/po/InsOrdersKind.java

@@ -4,6 +4,7 @@ package com.jzg.commons.entity.orders.po;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.jzg.commons.aop.aspect.DiffProperty;
+import com.jzg.commons.core.base.BaseModel;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -11,7 +12,7 @@ import java.math.BigDecimal;
 
 @Data
 @Schema(description = "保险订单险种信息")
-public class InsOrdersKind {
+public class InsOrdersKind extends BaseModel {
 
     @TableId(type = IdType.ASSIGN_ID)
     private String id;

commons/src/main/java/com/jzg/commons/entity/orders/vo/OrderListVo.java

@@ -99,4 +99,13 @@ public class OrderListVo {
 
     //支付链接
     private String paymentLink;
+
+    //批改状态
+    private String adjustStatus;
+
+    //批改id
+    private String adjustId;
+
+    //批改后的保费
+    private String adjustPremium;
 }

commons/src/main/java/com/jzg/commons/entity/quote/vo/aggregated/QuoteEchoVo.java

@@ -1,6 +1,10 @@
 package com.jzg.commons.entity.quote.vo.aggregated;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersQrcode;
 import com.jzg.commons.entity.po.EsmInsCompany;
 import com.jzg.commons.entity.po.InsCompanyClause;
@@ -20,6 +24,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.springframework.beans.BeanUtils;
 
 import java.io.Serial;
 import java.math.BigDecimal;
@@ -217,6 +222,38 @@ public class QuoteEchoVo extends QuoteVo {
     private List<InsCompanyClause> biSpecialInfoVo;
 
 
+    @Schema(description = "订单批改信息")
+    private InsOrderAdjustVo insOrderAdjustVo;
+
+    @Data
+    private static class InsOrderAdjustVo{
+
+        @Schema(description = "主键ID")
+        @TableId(value = "id", type = IdType.ASSIGN_ID)
+        private String id;
+
+        @Schema(description = "产品ID")
+        private String productId;
+
+        @Schema(description = "产品名称")
+        private String productName;
+
+        @Schema(description = "批单状态 0.订单批改中 1.待审核 2.审核通过 3.退回修改 4.拒绝批改")
+        private Integer status;
+
+        @Schema(description = "批改类型 0.整单退保 1.险种批改")
+        private Integer type;
+
+        @Schema(description = "保费")
+        private BigDecimal premium;
+
+        @Schema(description = "批改后保费")
+        private BigDecimal afterPremium;
+
+        @Schema(description = "批改明细")
+        private List<InsOrderAdjustInfo> adjustInfoList;
+    }
+
     /**
      * 订单数据库查询数据转 QuoteVo对象
      * @param insOrdersVo
@@ -260,6 +297,13 @@ public class QuoteEchoVo extends QuoteVo {
             insOrdersVo.getCarInfoVo().setTransferDate(insOrdersVo.getCarInfoVo().getTransferDate().substring(0, insOrdersVo.getCarInfoVo().getTransferDate().indexOf(" ")));
         }
 
+        // 批改信息处理
+        if(Objects.nonNull(insOrdersVo.getInsOrderAdjust())) {
+            InsOrderAdjustVo insOrderAdjustVo = new InsOrderAdjustVo();
+            BeanUtils.copyProperties(insOrdersVo.getInsOrderAdjust(), insOrderAdjustVo);
+            insOrderAdjustVo.setAdjustInfoList(insOrdersVo.getInsOrderAdjust().getAdjustInfoList());
+            this.insOrderAdjustVo = insOrderAdjustVo;
+        }
 
         //人员处理
         this.setOwnersInfo(insOrdersVo.getOwnersInfo());

commons/src/main/java/com/jzg/commons/entity/quote/vo/orders/InsOrdersVo.java

@@ -112,6 +112,9 @@ public class InsOrdersVo extends QuoteVo {
     @Schema(description = "业务员信息")
     private Salesman salesmanInfo;
 
+    @Schema(description = "订单批改信息")
+    private InsOrderAdjust insOrderAdjust;
+
     @Data
     public static class Salesman{
         @Schema(description = "业务员姓名")

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

commons/src/main/java/com/jzg/commons/entity/vo/AdjustAllRefundInfoVo.java

@@ -0,0 +1,67 @@
+package com.jzg.commons.entity.vo;
+
+import com.jzg.commons.entity.orders.po.InsOrdersPolicy;
+import com.jzg.commons.entity.orders.po.InsOrdersRisk;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Schema(description = "整单退明细VO")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdjustAllRefundInfoVo {
+
+    @Schema(description = "批改表id")
+    private String adjustId;
+
+    @NotNull(message = "保险类型不能为空")
+    @Schema(description = "保险类型 0. 交强 1.商业 3.非车")
+    private Integer kindType;
+
+    @Schema(description = "保险类型名称")
+    private String kindName;
+
+    @Schema(description = "保单号")
+    private String policyNumber;
+
+    @Schema(description = "终保日期")
+    private LocalDateTime expiryDate;
+
+    @NotNull(message = "保费不能为空")
+    @Schema(description = "保费")
+    private BigDecimal premium;
+
+    @NotNull(message = "退款金额不能为空")
+    @Schema(description = "退款金额")
+    private BigDecimal refundAmount;
+
+
+    public AdjustAllRefundInfoVo(Integer type, List<InsOrdersRisk> risks, InsOrdersPolicy policie, OrderAdjustVo orderAdjustVo,String id) {
+        this.adjustId = id;
+        if (type == 0){
+            this.kindType = 0;
+            this.kindName = "交强险";
+            this.policyNumber = policie.getJqPolicyNo();
+            this.expiryDate = risks.stream().filter(risk -> risk.getRiskCode().equals("0507")).findFirst().get().getEndDate();
+            this.premium = orderAdjustVo.getAfterJqPremium();
+        }else if (type == 1){
+            this.kindType = 1;
+            this.kindName = "商业险";
+            this.policyNumber = policie.getSyPolicyNo();
+            this.expiryDate = risks.stream().filter(risk -> risk.getRiskCode().equals("0510")).findFirst().get().getEndDate();
+            this.premium = orderAdjustVo.getAfterSyPremium();
+        }else if (type == 2){
+            this.kindType = 2;
+            this.kindName = "驾意险";
+            this.policyNumber = policie.getJyPolicyNo();
+            this.premium = orderAdjustVo.getAfterJyPremium();
+        }
+    }
+}

commons/src/main/java/com/jzg/commons/entity/vo/AdjustAllRefundVo.java

@@ -0,0 +1,29 @@
+package com.jzg.commons.entity.vo;
+
+import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+@Schema(description = "整单退VO")
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AdjustAllRefundVo {
+
+    @Schema(description = "主键")
+    private String id;
+
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @Schema(description = "整单退明细VO")
+    private List<AdjustAllRefundInfoVo> infoVosList;
+
+    @Schema(description = "批改明细VO")
+    private List<InsOrderAdjustInfo> changeInfoVosList;
+
+}

commons/src/main/java/com/jzg/commons/entity/vo/OrderAdjustInfoVo.java

@@ -0,0 +1,18 @@
+package com.jzg.commons.entity.vo;
+
+import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "订单批改明细表VO")
+@Data
+public class OrderAdjustInfoVo {
+
+    @Schema(description = "订单批改信息")
+    private OrderAdjustVo orderAdjustVo;
+
+    @Schema(description = "订单批改明细信息")
+    private List<InsOrderAdjustInfo> adjustInfos;
+}

commons/src/main/java/com/jzg/commons/entity/vo/OrderAdjustVo.java

@@ -0,0 +1,94 @@
+package com.jzg.commons.entity.vo;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.jzg.commons.core.base.BaseModel;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "订单批改表VO")
+@Data
+public class OrderAdjustVo extends BaseModel {
+
+    @ExcelProperty("ID")
+    @Schema(description = "主键")
+    private String id;
+
+    @ExcelProperty("订单号")
+    @Schema(description = "订单号")
+    private String orderNo;
+
+    @ExcelProperty("车牌")
+    @Schema(description = "车牌")
+    private String licenseNo;
+
+    @ExcelIgnore
+    @Schema(description = "保司id")
+    private String companyId;
+
+    @ExcelProperty("保险公司")
+    @Schema(description = "保司名称")
+    private String companyName;
+
+    @ExcelProperty("保费")
+    @Schema(description = "保费")
+    private BigDecimal premium;
+
+    @ExcelIgnore
+    @Schema(description = "批单状态 0.订单批改中 1.待审核 2.审核通过 3.退回修改 4.拒绝批改")
+    private Integer status;
+
+    @ExcelProperty("批单状态")
+    @Schema(description = "批单状态 0.订单批改中 1.待审核 2.审核通过 3.退回修改 4.拒绝批改")
+    private String statusStr;
+
+    @ExcelIgnore
+    @Schema(description = "批改类型 0.整单退保 1.险种批改")
+    private Integer type;
+
+    @ExcelProperty("批改类型")
+    @Schema(description = "批改类型 0.整单退保 1.险种批改")
+    private String typeStr;
+
+    @ExcelProperty("保费变化")
+    @Schema(description = "保费变化")
+    private BigDecimal changePremium;
+
+    @ExcelProperty("批改后保费")
+    @Schema(description = "批改后保费")
+    private BigDecimal afterPremium;
+
+
+    @ExcelIgnore
+    @Schema(description = "批改后交强保费")
+    private BigDecimal afterJqPremium;
+
+    @ExcelIgnore
+    @Schema(description = "批改后商业保费")
+    private BigDecimal afterSyPremium;
+
+    @ExcelIgnore
+    @Schema(description = "批改后驾意保费")
+    private BigDecimal afterJyPremium;
+
+    @ExcelProperty("批改人")
+    @Schema(description = "创建人")
+    private String createBy;
+
+    @ExcelProperty("批改时间")
+    @Schema(description = "创建时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime createTime;
+
+//    @Schema(description = "退款金额")
+//    private BigDecimal subAmount;
+//
+//    @Schema(description = "补缴金额")
+//    private BigDecimal addAmount;
+}

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;
     }
 }

gateway/src/main/resources/application-dev.yml

@@ -38,7 +38,7 @@ spring:
         - id: summary_route
           uri: http://localhost:9898/
           predicates:
-            - Path= /order/identify/** ,/supplementOrder/**,/order/carModel/**,/unify/**,/order/taskImages/**,/order/qrCode/**,/orderTrack/**,/feeAudit/**
+            - Path= /order/identify/** ,/supplementOrder/**,/order/carModel/**,/unify/**,/order/taskImages/**,/order/qrCode/**,/orderTrack/**,/feeAudit/**,/adjust/**
 
         - id: costsorrule_route
           uri: http://localhost:8085/

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/aop/OrderOperationLogAspect.java

@@ -3,15 +3,19 @@ package com.jzg.quotation.summary.aop;
 import com.alibaba.fastjson2.JSON;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.jzg.commons.constants.dict.InsOrderStatusEnum;
+import com.jzg.commons.entity.dto.VerifyAdjustParam;
+import com.jzg.commons.entity.orders.po.InsOrderAdjust;
 import com.jzg.commons.entity.orders.po.InsOrders;
 import com.jzg.commons.entity.orders.po.InsOrdersCarInfo;
 import com.jzg.commons.entity.orders.po.InsOrdersTrack;
 import com.jzg.commons.entity.quote.vo.QuoteVo;
 import com.jzg.commons.entity.quote.vo.aggregated.*;
+import com.jzg.commons.entity.vo.AdjustAllRefundVo;
 import com.jzg.commons.exception.SystemException;
 import com.jzg.quotation.commons.constant.SpElMapping;
 import com.jzg.quotation.commons.utils.SpElFieldExtractor;
 import com.jzg.quotation.summary.constants.QuoteNumberConstant;
+import com.jzg.quotation.summary.service.InsOrderAdjustService;
 import com.jzg.quotation.summary.service.InsOrdersCarInfoService;
 import com.jzg.quotation.summary.service.InsOrdersService;
 import com.jzg.quotation.summary.service.InsOrdersTrackService;
@@ -49,6 +53,9 @@ public class OrderOperationLogAspect {
     @Autowired
     private SpElFieldExtractor fieldExtractor;
 
+    @Autowired
+    private InsOrderAdjustService insOrderAdjustService;
+
     @Around("@annotation(log)")
     public Object handleLog(ProceedingJoinPoint joinPoint, OrderOperationLog log) throws Throwable {
         // 获取方法信息和参数
@@ -113,11 +120,108 @@ public class OrderOperationLogAspect {
                 InsOrders after = loadAfterState(orderStatusVo.getOrder().getOrdersNo()); // 可选：新状态
                 this.getOrderStatusLog(orderStatusVo.getOrder().getOrdersNo(),before,after,result,log);
                 break;
-
+            // 提交批改申请
+            case 11:
+                // 通过 SpEL 提取 入参
+                AdjustAllRefundVo adjustAllRefundVo = parser.parseExpression(log.orderSpEl()).getValue(context, AdjustAllRefundVo.class);
+                result = joinPoint.proceed();
+                this.adjustSubmitLog(adjustAllRefundVo.getOrderNo(),result,log);
+                break;
+            // 审核批改申请
+            case 12:
+                // 通过 SpEL 提取 入参
+                VerifyAdjustParam param = parser.parseExpression(log.orderSpEl()).getValue(context, VerifyAdjustParam.class);
+                result = joinPoint.proceed();
+                this.adjustVerifyLog(param,result,log);
+                break;
+            // 撤销批改申请
+            case 13:
+                // 通过 SpEL 提取 入参
+                String orderNo = parser.parseExpression(log.orderSpEl()).getValue(context, String.class);
+                result = joinPoint.proceed();
+                this.adjustSubmitLog(orderNo,result,log);
+                break;
         }
         return result;
     }
 
+    /**
+     * 审核批改订单
+     * @param param
+     * @param result
+     * @param log
+     */
+    private void adjustVerifyLog(VerifyAdjustParam param, Object result, OrderOperationLog log) {
+
+        // 定义要提取的字段
+        List<SpElMapping> mappings = List.of(
+                new SpElMapping("msg", "#ret.msg"),
+                new SpElMapping("code", "#ret.code"),
+                new SpElMapping("data", "#ret.data")
+        );
+        // 执行提取
+        Map<String, Object> extracted = fieldExtractor.extractFields(result, mappings);
+        InsOrderAdjust adjust = insOrderAdjustService.getById(param.getId());
+        InsOrdersTrack track = new InsOrdersTrack();
+        track.setOrderNo(adjust.getOrderNo());
+        track.setModule(log.module());
+        track.setSubModule(log.subModule());
+        track.setOptType(log.optType().getCode());
+        track.setOptContent(log.description());
+        track.setCompanyId(adjust.getCompanyId());
+        track.setLicenseNo(adjust.getLicenseNo());
+        if(extracted.get("code").equals(200)){
+            if(param.getStatus().equals(2)){
+                track.setChangeAfter("批改已完成");
+                track.setOptContent("订单批改申请审核通过");
+            }else if(param.getStatus().equals(3)){
+                track.setChangeAfter("退回修改");
+                track.setOptContent("退回订单批改申请");
+                track.setResult(param.getRefuse());
+            }else if(param.getStatus().equals(4)){
+                track.setChangeAfter("拒绝批改");
+                track.setOptContent("拒绝订单批改申请");
+                track.setResult(param.getRefuse());
+            }
+            track.setStatus(QuoteNumberConstant.QuoteResult.SUCCESS.getCode());
+            traceService.save(track);
+        }
+
+    }
+
+    /**
+     * 提交/撤销批改订单
+     * @param orderNo
+     * @param result
+     * @param log
+     */
+    private void adjustSubmitLog(String orderNo, Object result, OrderOperationLog log) {
+
+        // 定义要提取的字段
+        List<SpElMapping> mappings = List.of(
+                new SpElMapping("msg", "#ret.msg"),
+                new SpElMapping("code", "#ret.code"),
+                new SpElMapping("data", "#ret.data")
+        );
+        // 执行提取
+        Map<String, Object> extracted = fieldExtractor.extractFields(result, mappings);
+        InsOrders insOrders = orderService.getById(orderNo);
+        InsOrdersCarInfo carInfo = carInfoService.getByOrderId(insOrders.getId());
+        InsOrdersTrack track = new InsOrdersTrack();
+        track.setOrderNo(orderNo);
+        track.setModule(log.module());
+        track.setSubModule(log.subModule());
+        track.setOptType(log.optType().getCode());
+        track.setOptContent(log.description());
+        track.setCompanyId(insOrders.getCompanyId());
+        track.setLicenseNo(carInfo.getLicenseNo());
+
+        if(extracted.get("code").equals(200)){
+            track.setStatus(QuoteNumberConstant.QuoteResult.SUCCESS.getCode());
+            traceService.save(track);
+        }
+    }
+
     /**
      * 更新订单状态日志
      * @param orderId
@@ -136,7 +240,7 @@ public class OrderOperationLogAspect {
         // 执行提取
         Map<String, Object> extracted = fieldExtractor.extractFields(result, mappings);
         InsOrdersCarInfo carInfo = carInfoService.getByOrderId(orderId);
-        if(extracted.get("code").equals("200")){
+        if(extracted.get("code").equals(200)){
             if(!before.getOrderStatus().equals(after.getOrderStatus())){
                 InsOrdersTrack track = new InsOrdersTrack();
                 track.setOrderNo(orderId);
@@ -181,7 +285,7 @@ public class OrderOperationLogAspect {
         track.setOptContent(log.description());
         track.setCompanyId(insOrders.getCompanyId());
         track.setLicenseNo(carInfo.getLicenseNo());
-        if(extracted.get("code").equals("200")){
+        if(extracted.get("code").equals(200)){
             track.setStatus(QuoteNumberConstant.QuoteResult.SUCCESS.getCode());
             track.setChangeBefore("电子保单未下载");
             track.setChangeAfter("电子保单已下载");
@@ -213,7 +317,7 @@ public class OrderOperationLogAspect {
         Map<String, Object> extracted = fieldExtractor.extractFields(result, mappings);
         InsOrders insOrders = orderService.getById(orderId);
         InsOrdersCarInfo carInfo = carInfoService.getByOrderId(insOrders.getId());
-        if(extracted.get("code").equals("200")){
+        if(extracted.get("code").equals(200)){
             InsOrdersTrack track = new InsOrdersTrack();
             track.setOrderNo(orderId);
             track.setModule(log.module());
@@ -255,7 +359,7 @@ public class OrderOperationLogAspect {
         track.setLicenseNo(carInfo.getLicenseNo());
         track.setChangeBefore("待核保");
 
-        if(extracted.get("code").equals("200")){
+        if(extracted.get("code").equals(200)){
             track.setStatus(QuoteNumberConstant.QuoteResult.SUCCESS.getCode());
             track.setResult("核保通过");
             track.setChangeAfter(InsOrderStatusEnum.PAY_PENDING.getDesc());

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/constants/QuoteNumberConstant.java

@@ -89,6 +89,10 @@ public class QuoteNumberConstant {
         OPT_TYPE_8(8,"下载电子保单"),
         OPT_TYPE_9(9,"同步订单"),
         OPT_TYPE_10(10,"订单编辑"),
+        OPT_TYPE_11(11,"提交批改申请"),
+        OPT_TYPE_12(12,"批改审核"),
+        OPT_TYPE_13(13,"撤销批改"),
+
         ;
         private Integer code;
         private String desc;

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/controller/InsOrderAdjustController.java

@@ -0,0 +1,195 @@
+package com.jzg.quotation.summary.controller;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.constants.dict.InsOrderStatusEnum;
+import com.jzg.commons.core.base.BaseController;
+import com.jzg.commons.core.page.HttpResult;
+import com.jzg.commons.entity.dto.*;
+import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
+import com.jzg.commons.entity.orders.po.InsOrders;
+import com.jzg.commons.entity.vo.AdjustAllRefundInfoVo;
+import com.jzg.commons.entity.vo.AdjustAllRefundVo;
+import com.jzg.commons.entity.vo.OrderAdjustVo;
+import com.jzg.commons.util.AssertionUtils;
+import com.jzg.commons.util.EasyExcelUtils;
+import com.jzg.commons.util.ServletUtils;
+import com.jzg.quotation.summary.aop.OrderOperationLog;
+import com.jzg.quotation.summary.constants.QuoteNumberConstant;
+import com.jzg.quotation.summary.service.InsOrderAdjustInfoService;
+import com.jzg.quotation.summary.service.InsOrderAdjustService;
+import com.jzg.quotation.summary.service.InsOrdersService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Objects;
+
+@Tag(name = "订单批改管理接口")
+@RestController
+@RequestMapping("/adjust")
+@RequiredArgsConstructor
+public class InsOrderAdjustController extends BaseController {
+
+    private final InsOrderAdjustService insOrderAdjustService;
+    private final InsOrderAdjustInfoService insOrderAdjustInfoService;
+    private final InsOrdersService insOrdersService;
+    /**
+     * 订单批改列表分页
+     * @return
+     */
+    @PostMapping("/adjustList")
+    @Operation(summary = "订单批改列表分页")
+    public HttpResult adjustList(@RequestBody OrderAdjustParam param){
+        Page<OrderAdjustVo> result = insOrderAdjustService.queryPage(param);
+        return HttpResult.ok(result);
+    }
+
+    /**
+     * 导出订单批改列表
+     * @return
+     */
+    @PostMapping("/exportAdjustList")
+    @Operation(summary = "导出订单批改列表")
+    public void exportAdjustList(@RequestBody OrderAdjustExportParam param){
+        List<OrderAdjustVo> orderAdjustVos = insOrderAdjustService.adjustList(param);
+        AssertionUtils.isFail(CollUtil.isEmpty(orderAdjustVos), "无导出数据");
+        EasyExcelUtils.exportForWeb(ServletUtils.getResponse(), OrderAdjustVo.class, orderAdjustVos,"订单批改导出");
+    }
+
+
+    /**
+     * 订单批改信息查询
+     * @param id
+     * @return
+     */
+    @GetMapping(value = { "/adjustGet"})
+    @Operation(summary = "订单批改信息查询")
+    public HttpResult adjustGet(String id) {
+        return HttpResult.ok(insOrderAdjustService.queryById(id));
+    }
+
+    /**
+     * 订单批改信息添加
+     * @param param
+     * @return
+     */
+    @Operation(summary = "订单批改信息添加")
+    @PostMapping("/adjustAdd")
+    public HttpResult adjustAdd(@Validated @RequestBody OrderAdjustAddParam param) {
+        String orderNo = param.getOrderNo();
+        InsOrders order = insOrdersService.getById(orderNo);
+        AssertionUtils.isFail(Objects.isNull(order), "订单不存在");
+        AssertionUtils.isFail(!InsOrderStatusEnum.UNDERWRITED.getCode().equals(order.getOrderStatus()), "未承保订单不允许批改");
+        LambdaQueryWrapper<InsOrderAdjust> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InsOrderAdjust::getOrderNo, orderNo);
+        wrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        wrapper.in(InsOrderAdjust::getStatus, 0,1,3);
+        long count = insOrderAdjustService.count(wrapper);
+        AssertionUtils.isFail(count > 0, "订单批改中，请勿重复操作！");
+        String id = insOrderAdjustService.adjustAdd(param,order);
+        // 整单退
+        if(param.getType().equals(0)){
+            AdjustAllRefundVo refundVo = insOrderAdjustInfoService.adjustAllRefundGet(id,orderNo);
+            return HttpResult.ok("新增成功",refundVo);
+        }else{
+            // 批改
+            AdjustAllRefundVo refundVo = insOrderAdjustInfoService.adjustChangeGet(id,orderNo);
+            return HttpResult.ok("新增成功",refundVo);
+        }
+    }
+
+    /**
+     * 订单批改信息清除
+     * @param orderNo
+     * @return
+     */
+    @OrderOperationLog(
+            module = "批改订单",
+            subModule = "订单详情",
+            optType = QuoteNumberConstant.QuoteOptType.OPT_TYPE_13,
+            description = "撤销了订单批改申请",
+            orderSpEl = "#orderNo",
+            feedbackSpEl = "#ret.code + ' - ' + #ret.msg+ ' - ' + #ret.data"
+    )
+    @Operation(summary = "订单批改信息清除")
+    @DeleteMapping("/adjustRemove")
+    public HttpResult adjustRemove(String orderNo) {
+        boolean b = insOrderAdjustService.adjustRemove(orderNo);
+        return HttpResult.ok(b ? "清除成功":"清除失败");
+    }
+
+    /**
+     * 订单批改删除（已退回单据）
+     * @param id
+     * @return
+     */
+    @Operation(summary = "订单批改删除（已退回单据）")
+    @DeleteMapping("/adjustDel")
+    public HttpResult adjustDel(String id) {
+        boolean b = insOrderAdjustService.adjustDel(id);
+        return HttpResult.ok(b ? "删除成功":"删除失败");
+    }
+
+    /**
+     * 整单退提交
+     * @return
+     */
+    @OrderOperationLog(
+            module = "批改订单",
+            subModule = "订单详情",
+            optType = QuoteNumberConstant.QuoteOptType.OPT_TYPE_11,
+            description = "提交订单批改申请",
+            orderSpEl = "#refundVo",
+            feedbackSpEl = "#ret.code + ' - ' + #ret.msg+ ' - ' + #ret.data"
+    )
+    @Operation(summary = "整单退提交")
+    @PostMapping("/refundSubmit")
+    public HttpResult refundSubmit(@Validated @RequestBody AdjustAllRefundVo refundVo) {
+        insOrderAdjustInfoService.refundSubmit(refundVo);
+        return HttpResult.ok("保存成功");
+    }
+
+    /**
+     * 批改提交
+     * @return
+     */
+    @OrderOperationLog(
+            module = "批改订单",
+            subModule = "订单详情",
+            optType = QuoteNumberConstant.QuoteOptType.OPT_TYPE_11,
+            description = "提交订单批改申请",
+            orderSpEl = "#refundVo",
+            feedbackSpEl = "#ret.code + ' - ' + #ret.msg+ ' - ' + #ret.data"
+    )
+    @Operation(summary = "批改提交")
+    @PostMapping("/changeSubmit")
+    public HttpResult changeSubmit(@Validated @RequestBody AdjustAllRefundVo refundVo) {
+        insOrderAdjustInfoService.changeSubmit(refundVo);
+        return HttpResult.ok("保存成功");
+    }
+
+    /**
+     * 审核批改订单
+     * @return
+     */
+    @OrderOperationLog(
+            module = "批改订单",
+            subModule = "订单详情",
+            optType = QuoteNumberConstant.QuoteOptType.OPT_TYPE_12,
+            description = "",
+            orderSpEl = "#param",
+            feedbackSpEl = "#ret.code + ' - ' + #ret.msg+ ' - ' + #ret.data"
+    )
+    @PostMapping("/verifyOrder")
+    @Operation(summary = "审核批改订单")
+    public HttpResult verifyOrder(@RequestBody VerifyAdjustParam param){
+        insOrderAdjustInfoService.verifyOrder(param);
+        return HttpResult.ok("操作成功");
+    }
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrderAdjustInfoMapper.java

@@ -0,0 +1,18 @@
+package com.jzg.quotation.summary.mapper;
+
+import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author dongxin
+* @description 针对表【ins_order_adjust_info(订单批改明细表)】的数据库操作Mapper
+* @createDate 2025-09-16 10:48:13
+* @Entity generator.domain.InsOrderAdjustInfo
+*/
+public interface InsOrderAdjustInfoMapper extends BaseMapper<InsOrderAdjustInfo> {
+
+}
+
+
+
+

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/mapper/InsOrderAdjustMapper.java

@@ -0,0 +1,48 @@
+package com.jzg.quotation.summary.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.jzg.commons.entity.dto.OrderAdjustExportParam;
+import com.jzg.commons.entity.dto.OrderAdjustParam;
+import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.entity.vo.OrderAdjustVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+* @author dongxin
+* @description 针对表【ins_order_adjust(订单批改表)】的数据库操作Mapper
+* @createDate 2025-09-16 10:48:13
+* @Entity generator.domain.InsOrderAdjust
+*/
+public interface InsOrderAdjustMapper extends BaseMapper<InsOrderAdjust> {
+
+    /**
+     * 订单批改分页列表
+     * @param page
+     * @param param
+     * @return
+     */
+    Page<OrderAdjustVo> queryPage(Page page,  @Param("param") OrderAdjustParam param);
+
+    /**
+     * 订单批改列表
+     * @param param
+     * @return
+     */
+    List<OrderAdjustVo> adjustList(@Param("param") OrderAdjustExportParam param);
+
+    /**
+     * 通过id获取订单批改信息
+     * @param id
+     * @return
+     */
+    OrderAdjustVo queryById(String id);
+
+
+}
+
+
+
+

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrderAdjustInfoService.java

@@ -0,0 +1,54 @@
+package com.jzg.quotation.summary.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.dto.VerifyAdjustParam;
+import com.jzg.commons.entity.orders.po.InsOrderAdjustInfo;
+import com.jzg.commons.entity.vo.AdjustAllRefundInfoVo;
+import com.jzg.commons.entity.vo.AdjustAllRefundVo;
+
+import java.util.List;
+
+/**
+* @author dongxin
+* @description 针对表【ins_order_adjust_info(订单批改明细表)】的数据库操作Service
+* @createDate 2025-09-16 10:48:13
+*/
+public interface InsOrderAdjustInfoService extends IService<InsOrderAdjustInfo> {
+
+    /**
+     * 整单退明细列表
+     *
+     * @param id
+     * @param orderNo
+     * @return
+     */
+    AdjustAllRefundVo adjustAllRefundGet(String id, String orderNo);
+
+    /**
+     * 批改明细列表
+     * @param id
+     * @param orderNo
+     * @return
+     */
+    AdjustAllRefundVo adjustChangeGet(String id, String orderNo);
+
+    /**
+     * 整单退提交
+     *
+     * @param refundVos
+     */
+    void refundSubmit(AdjustAllRefundVo refundVos);
+
+
+    /**
+     * 批改提交
+     * @param refundVo
+     */
+    void changeSubmit(AdjustAllRefundVo refundVo);
+
+    /**
+     * 审核批改订单
+     * @param param
+     */
+    void verifyOrder(VerifyAdjustParam param);
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/InsOrderAdjustService.java

@@ -0,0 +1,70 @@
+package com.jzg.quotation.summary.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.jzg.commons.entity.dto.OrderAdjustAddParam;
+import com.jzg.commons.entity.dto.OrderAdjustExportParam;
+import com.jzg.commons.entity.dto.OrderAdjustParam;
+import com.jzg.commons.entity.orders.po.InsOrderAdjust;
+import com.jzg.commons.entity.orders.po.InsOrders;
+import com.jzg.commons.entity.vo.OrderAdjustInfoVo;
+import com.jzg.commons.entity.vo.OrderAdjustVo;
+
+import java.util.List;
+
+/**
+* @author dongxin
+* @description 针对表【ins_order_adjust(订单批改表)】的数据库操作Service
+* @createDate 2025-09-16 10:48:13
+*/
+public interface InsOrderAdjustService extends IService<InsOrderAdjust> {
+
+    /**
+     * 订单批改分页列表
+     * @param param
+     * @return
+     */
+    Page<OrderAdjustVo> queryPage(OrderAdjustParam param);
+
+    /**
+     * 订单批改信息查询
+     * @param id
+     * @return
+     */
+    OrderAdjustInfoVo queryById(String id);
+
+    /**
+     * 查询订单批改信息是否存在
+     * @param id
+     * @return
+     */
+    OrderAdjustVo isExistById(String id);
+
+    /**
+     * 创建批单
+     *
+     * @param param
+     * @param order
+     */
+    String adjustAdd(OrderAdjustAddParam param, InsOrders order);
+
+    /**
+     * 订单批改信息清除
+     * @return
+     */
+    boolean adjustRemove(String orderNo);
+
+    /**
+     * 订单批改导出列表
+     * @param param
+     * @return
+     */
+    List<OrderAdjustVo> adjustList(OrderAdjustExportParam param);
+
+    /**
+     *
+     * @param id
+     * @return
+     */
+    boolean adjustDel(String id);
+}

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrderAdjustInfoServiceImpl.java

@@ -0,0 +1,561 @@
+package com.jzg.quotation.summary.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.dto.VerifyAdjustParam;
+import com.jzg.commons.entity.orders.po.*;
+import com.jzg.commons.entity.vo.AdjustAllRefundInfoVo;
+import com.jzg.commons.entity.vo.AdjustAllRefundVo;
+import com.jzg.commons.entity.vo.OrderAdjustInfoVo;
+import com.jzg.commons.entity.vo.OrderAdjustVo;
+import com.jzg.commons.util.AssertionUtils;
+import com.jzg.quotation.summary.mapper.InsOrderAdjustInfoMapper;
+import com.jzg.quotation.summary.service.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+* @author dongxin
+* @description 针对表【ins_order_adjust_info(订单批改明细表)】的数据库操作Service实现
+* @createDate 2025-09-16 10:48:13
+*/
+@Service
+public class InsOrderAdjustInfoServiceImpl extends ServiceImpl<InsOrderAdjustInfoMapper, InsOrderAdjustInfo>
+    implements InsOrderAdjustInfoService {
+
+    @Autowired
+    private InsOrderAdjustService orderAdjustService;
+
+    @Autowired
+    private InsOrdersRiskService ordersRiskService;
+
+    @Autowired
+    private InsOrdersPolicyService ordersPolicyService;
+
+    @Autowired
+    private InsOrdersCostsService ordersCostsService;
+
+    @Autowired
+    private InsOrdersKindService ordersKindService;
+
+    @Autowired
+    private InsOrdersAccidentalDrivingService ordersAccidentalDrivingService;
+
+    @Override
+    public AdjustAllRefundVo adjustAllRefundGet(String id, String orderNo) {
+
+        AdjustAllRefundVo adjustAllRefundVo = new AdjustAllRefundVo();
+        adjustAllRefundVo.setId(id);
+        List<AdjustAllRefundInfoVo> refundVos = new ArrayList<>();
+        // 获取最新的批改记录
+        LambdaQueryWrapper<InsOrderAdjust> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(InsOrderAdjust::getId, id);
+        queryWrapper.eq(InsOrderAdjust::getOrderNo, orderNo);
+        queryWrapper.eq(InsOrderAdjust::getStatus, 2);
+        queryWrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        queryWrapper.orderByDesc(InsOrderAdjust::getCreateTime).last("limit 1");;
+        InsOrderAdjust adjust = orderAdjustService.getOne(queryWrapper);
+
+        // 查询原订单信息
+        List<InsOrdersRisk> risks = ordersRiskService.getById(orderNo);
+        InsOrdersPolicy policie = ordersPolicyService.getById(orderNo);
+        InsOrdersCosts costs = ordersCostsService.getById(orderNo);
+
+        // 有批改
+        if(Objects.nonNull(adjust)){
+            OrderAdjustInfoVo orderAdjustInfoVo = orderAdjustService.queryById(adjust.getId());
+            List<InsOrderAdjustInfo> adjustInfos = orderAdjustInfoVo.getAdjustInfos();
+            if(CollUtil.isNotEmpty(adjustInfos)){
+                Set<Integer> types = adjustInfos.stream()
+                        .filter(info -> !info.getIsHide().equals(1))
+                        .filter(info -> !info.getType().equals(2))
+                        .map(InsOrderAdjustInfo::getKindType).collect(Collectors.toSet());
+                for (Integer type : types) {
+                    refundVos.add(new AdjustAllRefundInfoVo(type,risks,policie,orderAdjustInfoVo.getOrderAdjustVo(),id));
+                }
+            }
+        // 无批改
+        }else{
+            for (InsOrdersRisk risk : risks) {
+                AdjustAllRefundInfoVo refundVo = new AdjustAllRefundInfoVo();
+                refundVo.setAdjustId(id);
+                refundVo.setKindName(risk.getRiskName());
+                refundVo.setExpiryDate(risk.getEndDate());
+                if(risk.getRiskCode().equals("0507")){
+                    refundVo.setKindType(0);
+                    refundVo.setPolicyNumber(policie.getJqPolicyNo());
+                    refundVo.setPremium(costs.getJqPremium());
+                    refundVos.add(refundVo);
+                }else{
+                    refundVo.setKindType(1);
+                    refundVo.setPolicyNumber(policie.getSyPolicyNo());
+                    refundVo.setPremium(costs.getSyPremium());
+                    refundVos.add(refundVo);
+                }
+            }
+            LambdaQueryWrapper<InsOrdersAccidentalDriving> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(InsOrdersAccidentalDriving::getOrderNo, orderNo);
+            List<InsOrdersAccidentalDriving> drivings = ordersAccidentalDrivingService.list(wrapper);
+            if (CollUtil.isNotEmpty(drivings)) {
+                AdjustAllRefundInfoVo refundVo = new AdjustAllRefundInfoVo();
+                refundVo.setAdjustId(id);
+                refundVo.setKindType(2);
+                refundVo.setKindName("驾意险");
+                refundVo.setPolicyNumber(policie.getJyPolicyNo());
+                refundVo.setPremium(costs.getJyPremium());
+                refundVos.add(refundVo);
+            }
+        }
+        adjustAllRefundVo.setInfoVosList(refundVos);
+        return adjustAllRefundVo;
+    }
+
+    @Override
+    public AdjustAllRefundVo adjustChangeGet(String id, String orderNo) {
+        AdjustAllRefundVo adjustAllRefundVo = new AdjustAllRefundVo();
+        adjustAllRefundVo.setId(id);
+        // 获取最新的批改记录
+        LambdaQueryWrapper<InsOrderAdjust> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(InsOrderAdjust::getId, id);
+        queryWrapper.eq(InsOrderAdjust::getOrderNo, orderNo);
+        queryWrapper.eq(InsOrderAdjust::getStatus, 2);
+        queryWrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        queryWrapper.orderByDesc(InsOrderAdjust::getCreateTime).last("limit 1");;
+        InsOrderAdjust adjust = orderAdjustService.getOne(queryWrapper);
+
+        // 查询原订单信息
+        List<InsOrdersRisk> risks = ordersRiskService.getById(orderNo);
+        InsOrdersCosts costs = ordersCostsService.getById(orderNo);
+
+        // 有批改
+        if(Objects.nonNull(adjust)){
+            OrderAdjustInfoVo orderAdjustInfoVo = orderAdjustService.queryById(adjust.getId());
+            List<InsOrderAdjustInfo> adjustInfos = orderAdjustInfoVo.getAdjustInfos();
+            List<InsOrderAdjustInfo> newAdjustInfos = new ArrayList<>();
+            if (CollUtil.isNotEmpty(adjustInfos)) {
+                newAdjustInfos = adjustInfos.stream()
+                        .filter(info -> !info.getIsHide().equals(1))
+                        .filter(info -> !info.getType().equals(2))
+                        .collect(Collectors.toList());
+            }
+            for (InsOrderAdjustInfo newAdjustInfo : newAdjustInfos) {
+                newAdjustInfo.setId(null);
+                newAdjustInfo.setAdjustId(id);
+                newAdjustInfo.setPremium(newAdjustInfo.getAfterPremium());
+                newAdjustInfo.setAmount(newAdjustInfo.getAfterAmount());
+            }
+            adjustAllRefundVo.setChangeInfoVosList(newAdjustInfos);
+
+        }else{
+            // 无批改
+            List<InsOrderAdjustInfo> adjustInfos = new ArrayList<>();
+            for (InsOrdersRisk risk : risks) {
+                if(risk.getRiskCode().equals("0507")){
+                    InsOrderAdjustInfo orderAdjustInfo = new InsOrderAdjustInfo();
+                    orderAdjustInfo.setAdjustId(id);
+                    orderAdjustInfo.setKindType(0);
+                    orderAdjustInfo.setKindCode("J1");
+                    orderAdjustInfo.setKindName("交强险");
+                    orderAdjustInfo.setPremium(costs.getJqPremium());
+                    orderAdjustInfo.setType(0);
+                    orderAdjustInfo.setIsHide(0);
+                    adjustInfos.add(orderAdjustInfo);
+                }else{
+                    LambdaQueryWrapper<InsOrdersKind> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(InsOrdersKind::getOrderNo, orderNo);
+                    wrapper.eq(InsOrdersKind::getIsDelete, 0);
+                    List<InsOrdersKind> kindList = ordersKindService.list(wrapper);
+                    if(CollUtil.isNotEmpty(kindList)){
+                        for (InsOrdersKind insOrdersKind : kindList) {
+                            InsOrderAdjustInfo orderAdjustInfo = new InsOrderAdjustInfo();
+                            orderAdjustInfo.setAdjustId(id);
+                            orderAdjustInfo.setKindType(1);
+                            orderAdjustInfo.setKindCode(insOrdersKind.getKindCode());
+                            orderAdjustInfo.setKindName(insOrdersKind.getKindName());
+                            orderAdjustInfo.setAmount(insOrdersKind.getAmount());
+                            orderAdjustInfo.setPremium(insOrdersKind.getPremium());
+                            orderAdjustInfo.setType(0);
+                            orderAdjustInfo.setIsHide(0);
+                            adjustInfos.add(orderAdjustInfo);
+                        }
+                    }
+                }
+            }
+            LambdaQueryWrapper<InsOrdersAccidentalDriving> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(InsOrdersAccidentalDriving::getOrderNo, orderNo);
+            List<InsOrdersAccidentalDriving> drivings = ordersAccidentalDrivingService.list(wrapper);
+            if (CollUtil.isNotEmpty(drivings)) {
+                InsOrderAdjustInfo orderAdjustInfo = new InsOrderAdjustInfo();
+                orderAdjustInfo.setAdjustId(id);
+                orderAdjustInfo.setKindType(2);
+                orderAdjustInfo.setKindCode(drivings.get(0).getRiskCode());
+                orderAdjustInfo.setKindName(drivings.get(0).getRiskName());
+                orderAdjustInfo.setAmount(new BigDecimal(drivings.get(0).getQuantity()));
+                orderAdjustInfo.setPremium(costs.getJyPremium());
+                orderAdjustInfo.setType(0);
+                orderAdjustInfo.setIsHide(0);
+                adjustInfos.add(orderAdjustInfo);
+            }
+            adjustAllRefundVo.setChangeInfoVosList(adjustInfos);
+        }
+        return adjustAllRefundVo;
+    }
+
+    @Override
+    public void refundSubmit(AdjustAllRefundVo refundVos) {
+        // 获取最新的批改记录
+        LambdaQueryWrapper<InsOrderAdjust> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(InsOrderAdjust::getId, refundVos.getId());
+        queryWrapper.eq(InsOrderAdjust::getOrderNo, refundVos.getOrderNo());
+        queryWrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        queryWrapper.eq(InsOrderAdjust::getStatus, 2);
+        queryWrapper.orderByDesc(InsOrderAdjust::getCreateTime).last("limit 1");;
+        InsOrderAdjust adjust = orderAdjustService.getOne(queryWrapper);
+
+        List<InsOrderAdjustInfo> orderAdjustInfos = new ArrayList<>();
+        List<AdjustAllRefundInfoVo> infoVosList = refundVos.getInfoVosList();
+
+        List<AdjustAllRefundInfoVo> jqRefundVo = infoVosList.stream().filter(info-> info.getKindType().equals(0)).collect(Collectors.toList()); // 交强信息
+        List<AdjustAllRefundInfoVo> syRefundVo = infoVosList.stream().filter(info-> info.getKindType().equals(1)).collect(Collectors.toList()); // 商业信息
+        List<AdjustAllRefundInfoVo> jyRefundVo = infoVosList.stream().filter(info-> info.getKindType().equals(2)).collect(Collectors.toList()); // 驾意信息
+
+
+        // 当前单据（提前保存了）
+        InsOrderAdjust insOrderAdjust = orderAdjustService.getById(refundVos.getId());
+
+        BigDecimal jqPremium = new BigDecimal(0);
+        BigDecimal syPremium = new BigDecimal(0);
+        BigDecimal jyPremium = new BigDecimal(0);
+        if (Objects.nonNull(adjust)) {
+            OrderAdjustInfoVo orderAdjustInfoVo = orderAdjustService.queryById(adjust.getId());
+            List<InsOrderAdjustInfo> adjustInfos = orderAdjustInfoVo.getAdjustInfos();
+            OrderAdjustVo orderAdjustVo = orderAdjustInfoVo.getOrderAdjustVo();
+            jqPremium = orderAdjustVo.getAfterJqPremium();
+            syPremium = orderAdjustVo.getAfterSyPremium();
+            jyPremium = orderAdjustVo.getAfterJyPremium();
+
+            List<InsOrderAdjustInfo> jqInfos = adjustInfos.stream()
+                    .filter(info -> info.getKindType().equals(0))
+                    .filter(info -> !info.getType().equals(2))
+                    .collect(Collectors.toList());
+            List<InsOrderAdjustInfo> syInfos = adjustInfos.stream()
+                    .filter(info -> info.getKindType().equals(1))
+                    .filter(info -> !info.getType().equals(2))
+                    .collect(Collectors.toList());
+            List<InsOrderAdjustInfo> jyInfos = adjustInfos.stream()
+                    .filter(info -> info.getKindType().equals(2))
+                    .filter(info -> !info.getType().equals(2))
+                    .collect(Collectors.toList());
+
+            for (InsOrderAdjustInfo adjustInfo : adjustInfos) {
+                adjustInfo.setAdjustId(insOrderAdjust.getId());
+                adjustInfo.setPremium(adjustInfo.getAfterPremium());
+                if(adjustInfo.getType().equals(0)){
+                    adjustInfo.setAfterAmount(adjustInfo.getAmount());
+                }else{
+                    adjustInfo.setAfterAmount(null);
+                }
+                adjustInfo.setAdjustType(null);
+                adjustInfo.setAdjustAmount(null);
+                if(adjustInfo.getIsHide().equals(0)){
+                    if((CollUtil.isNotEmpty(jqRefundVo) && adjustInfo.getKindType().equals(0))
+                            || (CollUtil.isNotEmpty(syRefundVo) && adjustInfo.getKindType().equals(1))
+                            || (CollUtil.isNotEmpty(jyRefundVo) && adjustInfo.getKindType().equals(2))
+                    ){
+                        adjustInfo.setType(2);
+                        adjustInfo.setPremium(null);
+                        adjustInfo.setAfterPremium(null);
+                        adjustInfo.setAdjustType(null);
+                        adjustInfo.setAdjustAmount(null);
+                        adjustInfo.setIsHide(0);
+                        if (CollUtil.isNotEmpty(jqInfos)) {
+                            if(Objects.nonNull(jqInfos.get(0).getId())){
+                                if (jqInfos.get(0).getId().equals(adjustInfo.getId())) {
+                                    adjustInfo.setPremium(jqRefundVo.get(0).getPremium());
+                                    adjustInfo.setAfterPremium(jqRefundVo.get(0).getPremium().subtract(jqRefundVo.get(0).getRefundAmount()));
+                                }
+                            }
+                        }
+                        if (CollUtil.isNotEmpty(syInfos)) {
+                            if(Objects.nonNull(syInfos.get(0).getId())){
+                                if (syInfos.get(0).getId().equals(adjustInfo.getId())) {
+                                    adjustInfo.setPremium(syRefundVo.get(0).getPremium());
+                                    adjustInfo.setAfterPremium(syRefundVo.get(0).getPremium().subtract(syRefundVo.get(0).getRefundAmount()));
+                                }
+                            }
+                        }
+                        if (CollUtil.isNotEmpty(jyInfos)) {
+                            if(Objects.nonNull(jyInfos.get(0).getId())){
+                                if (jyInfos.get(0).getId().equals(adjustInfo.getId())) {
+                                    adjustInfo.setPremium(jyRefundVo.get(0).getPremium());
+                                    adjustInfo.setAfterPremium(jyRefundVo.get(0).getPremium().subtract(jyRefundVo.get(0).getRefundAmount()));
+                                }
+                            }
+                        }
+                    }else{
+                        adjustInfo.setIsHide(1);
+                    }
+                }
+                adjustInfo.setId(null);
+                orderAdjustInfos.add(adjustInfo);
+            }
+        } else {
+            // 查询原订单信息
+            List<InsOrdersRisk> risks = ordersRiskService.getById(refundVos.getOrderNo());
+            InsOrdersCosts costs = ordersCostsService.getById(refundVos.getOrderNo());
+            LambdaQueryWrapper<InsOrdersKind> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(InsOrdersKind::getOrderNo, refundVos.getOrderNo());
+            wrapper.eq(InsOrdersKind::getIsDelete, 0);
+            List<InsOrdersKind> kindList = ordersKindService.list(wrapper);
+
+            jqPremium = costs.getJqPremium();
+            syPremium = costs.getSyPremium();
+            jyPremium = costs.getJyPremium();
+
+            for (InsOrdersRisk risk : risks) {
+                if(risk.getRiskCode().equals("0507")){
+                    InsOrderAdjustInfo info = new InsOrderAdjustInfo();
+                    info.setAdjustId(insOrderAdjust.getId());
+                    info.setKindType(0);
+                    info.setKindCode("J1");
+                    info.setKindName("交强险");
+                    info.setIsHide(0);
+                    if(CollUtil.isNotEmpty(jqRefundVo)){
+                        info.setType(2);
+                        info.setPremium(null);
+                        info.setAfterPremium(null);
+                        info.setAfterAmount(null);
+                        info.setAdjustType(null);
+                    }else{
+                        info.setType(0);
+                        info.setPremium(costs.getJqPremium());
+                        info.setAfterPremium(costs.getJqPremium());
+                    }
+                    orderAdjustInfos.add(info);
+                }else{
+                    for (InsOrdersKind insOrdersKind : kindList) {
+                        InsOrderAdjustInfo info = new InsOrderAdjustInfo();
+                        info.setAdjustId(insOrderAdjust.getId());
+                        info.setKindType(1);
+                        info.setKindCode(insOrdersKind.getKindCode());
+                        info.setKindName(insOrdersKind.getKindName());
+                        info.setAmount(insOrdersKind.getAmount());
+                        info.setType(2);
+                        info.setIsHide(0);
+                        if(CollUtil.isNotEmpty(syRefundVo)){
+                            info.setPremium(null);
+                            info.setAfterPremium(null);
+                            info.setAfterAmount(null);
+                            info.setAdjustType(null);
+                        }else{
+                            info.setType(0);
+                            info.setPremium(insOrdersKind.getPremium());
+                            info.setAfterPremium(insOrdersKind.getPremium());
+                        }
+                        orderAdjustInfos.add(info);
+                    }
+                }
+            }
+            LambdaQueryWrapper<InsOrdersAccidentalDriving> drivingLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            drivingLambdaQueryWrapper.eq(InsOrdersAccidentalDriving::getOrderNo, refundVos.getOrderNo());
+            List<InsOrdersAccidentalDriving> drivings = ordersAccidentalDrivingService.list(drivingLambdaQueryWrapper);
+            if (CollUtil.isNotEmpty(drivings)) {
+                InsOrderAdjustInfo info = new InsOrderAdjustInfo();
+                info.setAdjustId(insOrderAdjust.getId());
+                info.setKindType(2);
+                info.setKindCode(drivings.get(0).getRiskCode());
+                info.setKindName(drivings.get(0).getRiskName());
+                info.setAmount(new BigDecimal(drivings.get(0).getQuantity()));
+                info.setType(2);
+                info.setIsHide(0);
+                if(CollUtil.isNotEmpty(jyRefundVo)){
+                    info.setPremium(null);
+                    info.setAfterPremium(null);
+                    info.setAfterAmount(null);
+                    info.setAdjustType(null);
+                    info.setIsHide(1);
+                }else{
+                    info.setType(0);
+                    info.setPremium(costs.getJyPremium());
+                    info.setAfterPremium(costs.getJyPremium());
+                }
+                orderAdjustInfos.add(info);
+            }
+        }
+        this.checkProduct(orderAdjustInfos,insOrderAdjust);
+
+
+        if(CollUtil.isNotEmpty(jqRefundVo)){
+            jqPremium = jqPremium.subtract(jqRefundVo.get(0).getRefundAmount());
+        }
+        if(CollUtil.isNotEmpty(syRefundVo)){
+            syPremium = syPremium.subtract(syRefundVo.get(0).getRefundAmount());
+        }
+        if(CollUtil.isNotEmpty(jyRefundVo)){
+            jyPremium = jyPremium.subtract(jyRefundVo.get(0).getRefundAmount());
+        }
+
+        insOrderAdjust.setAfterJqPremium(jqPremium);
+        insOrderAdjust.setAfterSyPremium(syPremium);
+        insOrderAdjust.setAfterJyPremium(jyPremium);
+        insOrderAdjust.setAfterPremium(jqPremium.add(syPremium).add(jyPremium));
+        insOrderAdjust.setStatus(1);
+        orderAdjustService.updateById(insOrderAdjust);
+        this.saveBatch(orderAdjustInfos);
+    }
+
+    @Override
+    public void changeSubmit(AdjustAllRefundVo refundVo) {
+        List<InsOrderAdjustInfo> orderAdjustInfos = new ArrayList<>();
+        List<InsOrderAdjustInfo> changeInfoVosList = refundVo.getChangeInfoVosList();
+
+        // 获取之前的批改单 加入退保剩余金额
+        // 获取最新的批改记录
+        LambdaQueryWrapper<InsOrderAdjust> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.ne(InsOrderAdjust::getId, refundVo.getId());
+        queryWrapper.eq(InsOrderAdjust::getOrderNo, refundVo.getOrderNo());
+        queryWrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        queryWrapper.eq(InsOrderAdjust::getStatus, 2);
+        queryWrapper.orderByDesc(InsOrderAdjust::getCreateTime).last("limit 1");
+        List<InsOrderAdjust> adjusts = orderAdjustService.list(queryWrapper);
+
+        // 当前单据（提前保存了）
+        InsOrderAdjust insOrderAdjust = orderAdjustService.getById(refundVo.getId());
+        if(CollUtil.isNotEmpty(changeInfoVosList)){
+            for (InsOrderAdjustInfo info : changeInfoVosList) {
+                info.setId(null);
+                info.setAdjustId(insOrderAdjust.getId());
+                if(Objects.nonNull(info.getAdjustType())){
+                    if (info.getAdjustType().equals(0)){
+                        info.setAfterPremium(info.getPremium().add(info.getAdjustAmount()));
+                    }else{
+                        info.setAfterPremium(info.getPremium().subtract(info.getAdjustAmount()));
+                    }
+                }else{
+                    info.setAfterPremium(info.getPremium());
+                    info.setAfterAmount(info.getAmount());
+                }
+                info.setIsHide(0);
+            }
+            orderAdjustInfos = changeInfoVosList;
+        }
+
+        // 将上一单的退单追加进去
+        if(CollUtil.isNotEmpty(adjusts)){
+            InsOrderAdjust adjust = adjusts.get(0);
+            OrderAdjustInfoVo orderAdjustInfoVo = orderAdjustService.queryById(adjust.getId());
+            List<InsOrderAdjustInfo> adjustInfos = orderAdjustInfoVo.getAdjustInfos();
+            if(CollUtil.isNotEmpty(adjustInfos)){
+                for (InsOrderAdjustInfo adjustInfo : adjustInfos) {
+                    if(adjustInfo.getType().equals(2)){
+                        adjustInfo.setId(null);
+                        adjustInfo.setAdjustId(insOrderAdjust.getId());
+                        adjustInfo.setIsHide(1);
+                        orderAdjustInfos.add(adjustInfo);
+                    }
+                }
+            }
+        }
+
+        this.checkProduct(orderAdjustInfos,insOrderAdjust);
+
+        BigDecimal jqPrenium = new BigDecimal(0); // 交强保费
+        BigDecimal syPrenium = new BigDecimal(0); // 商业保费
+        BigDecimal jyPrenium = new BigDecimal(0); // 驾意保费
+
+
+        for (InsOrderAdjustInfo orderAdjustInfo : orderAdjustInfos) {
+            if(orderAdjustInfo.getKindType().equals(0)){
+                jqPrenium = jqPrenium.add(orderAdjustInfo.getAfterPremium());
+            }
+            if(orderAdjustInfo.getKindType().equals(1)){
+                syPrenium = syPrenium.add(orderAdjustInfo.getAfterPremium());
+            }
+            if(orderAdjustInfo.getKindType().equals(2)){
+                jyPrenium = jyPrenium.add(orderAdjustInfo.getAfterPremium());
+            }
+        }
+        insOrderAdjust.setAfterJqPremium(jqPrenium);
+        insOrderAdjust.setAfterSyPremium(syPrenium);
+        insOrderAdjust.setAfterJyPremium(jyPrenium);
+        BigDecimal totalPremium = jqPrenium.add(syPrenium).add(jyPrenium);
+        insOrderAdjust.setAfterPremium(totalPremium);
+        insOrderAdjust.setStatus(1);
+        orderAdjustService.updateById(insOrderAdjust);
+        this.saveBatch(changeInfoVosList);
+    }
+
+    @Override
+    public void verifyOrder(VerifyAdjustParam param) {
+        InsOrderAdjust insOrderAdjust = orderAdjustService.getById(param.getId());
+        AssertionUtils.isFail(insOrderAdjust.getStatus() > 1, "订单已审核，请刷新页面");
+        insOrderAdjust.setStatus(param.getStatus());
+        insOrderAdjust.setRefuse(param.getRefuse());
+        orderAdjustService.updateById(insOrderAdjust);
+    }
+
+    /**
+     * 保险产品重新核算
+     *
+     * @param orderAdjustInfos
+     * @param insOrderAdjust
+     * @return
+     */
+    private void checkProduct(List<InsOrderAdjustInfo> orderAdjustInfos, InsOrderAdjust insOrderAdjust) {
+        Boolean jq = false;
+        Boolean sz = false;
+        Boolean sy = false;
+
+        List<InsOrderAdjustInfo> jqInfos = orderAdjustInfos.stream().filter(info -> info.getKindType().equals(0) && !info.getType().equals(2)).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(jqInfos)){
+            if (!jqInfos.get(0).getType().equals(2)){
+                jq = true;
+            }
+        }
+
+        List<InsOrderAdjustInfo> syInfos = orderAdjustInfos.stream().filter(info -> info.getKindType().equals(1) && !info.getType().equals(2)).collect(Collectors.toList());
+        if(CollUtil.isNotEmpty(syInfos)){
+            if(syInfos.size() > 1){
+                sy = true;
+            }else{
+                InsOrderAdjustInfo syInfo = syInfos.get(0);
+                if (syInfo.getKindName().equals("第三者责任险")){
+                    sz = true;
+                }else{
+                    sy = true;
+                }
+            }
+        }
+        if (jq && sy){ // 交商
+            insOrderAdjust.setProductId("0330034001");
+            insOrderAdjust.setProductName("交商");
+        } else if (jq && sz){ // 交三
+            insOrderAdjust.setProductId("0330034002");
+            insOrderAdjust.setProductName("交三");
+        } else if (jq){ // 单交
+            insOrderAdjust.setProductId("0330");
+            insOrderAdjust.setProductName("单交");
+        } else if (sy){ // 单商
+            insOrderAdjust.setProductId("034001");
+            insOrderAdjust.setProductName("单商");
+        } else if (sz){ // 单三
+            insOrderAdjust.setProductId("034002");
+            insOrderAdjust.setProductName("单三");
+        }else{
+            insOrderAdjust.setProductId(null);
+            insOrderAdjust.setProductName(null);
+        }
+    }
+}
+
+
+
+

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrderAdjustServiceImpl.java

@@ -0,0 +1,187 @@
+package com.jzg.quotation.summary.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jzg.commons.entity.dto.OrderAdjustAddParam;
+import com.jzg.commons.entity.dto.OrderAdjustExportParam;
+import com.jzg.commons.entity.dto.OrderAdjustParam;
+import com.jzg.commons.entity.orders.po.*;
+import com.jzg.commons.entity.vo.OrderAdjustInfoVo;
+import com.jzg.commons.entity.vo.OrderAdjustVo;
+import com.jzg.commons.exception.SystemException;
+import com.jzg.commons.util.EasyExcelUtils;
+import com.jzg.commons.util.ServletUtils;
+import com.jzg.quotation.summary.mapper.InsOrderAdjustInfoMapper;
+import com.jzg.quotation.summary.mapper.InsOrderAdjustMapper;
+import com.jzg.quotation.summary.service.InsOrderAdjustService;
+import com.jzg.quotation.summary.service.InsOrdersCarInfoService;
+import com.jzg.quotation.summary.service.InsOrdersCostsService;
+import org.apache.commons.lang3.ObjectUtils;
+import org.checkerframework.checker.units.qual.C;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+* @author dongxin
+* @description 针对表【ins_order_adjust(订单批改表)】的数据库操作Service实现
+* @createDate 2025-09-16 10:48:13
+*/
+@Service
+public class InsOrderAdjustServiceImpl extends ServiceImpl<InsOrderAdjustMapper, InsOrderAdjust>
+    implements InsOrderAdjustService {
+
+    @Autowired
+    private InsOrderAdjustInfoMapper orderAdjustInfoMapper;
+
+    @Autowired
+    private InsOrdersCarInfoService ordersCarInfoService;
+
+    @Autowired
+    private InsOrdersCostsService ordersCostsService;
+
+    @Override
+    public Page<OrderAdjustVo> queryPage(OrderAdjustParam param) {
+        Page<OrderAdjustVo> page = baseMapper.queryPage(param.getPage(), param);
+        return page;
+    }
+
+    @Override
+    public List<OrderAdjustVo> adjustList(OrderAdjustExportParam param) {
+        List<OrderAdjustVo> adjustVoList = baseMapper.adjustList(param);
+        return adjustVoList;
+    }
+
+    @Override
+    public boolean adjustDel(String id) {
+        LambdaQueryWrapper<InsOrderAdjust> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InsOrderAdjust::getId, id);
+        wrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        wrapper.eq(InsOrderAdjust::getStatus, 3);
+        List<InsOrderAdjust> adjusts = this.list(wrapper);
+        if(CollUtil.isNotEmpty(adjusts)){
+            InsOrderAdjust adjust = adjusts.get(0);
+            LambdaQueryWrapper<InsOrderAdjustInfo> infoWrapper = new LambdaQueryWrapper<>();
+            infoWrapper.eq(InsOrderAdjustInfo::getAdjustId, adjust.getId());
+            infoWrapper.eq(InsOrderAdjustInfo::getIsDelete, 0);
+            List<InsOrderAdjustInfo> infos = orderAdjustInfoMapper.selectList(infoWrapper);
+            if(CollUtil.isNotEmpty(infos)){
+                orderAdjustInfoMapper.deleteByIds(infos);
+            }
+            return this.removeById(adjust.getId());
+        }else{
+            return false;
+        }
+    }
+
+
+    @Override
+    public OrderAdjustInfoVo queryById(String id) {
+        OrderAdjustVo orderAdjustVo = this.isExistById(id);
+        LambdaQueryWrapper<InsOrderAdjustInfo> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(InsOrderAdjustInfo::getAdjustId, orderAdjustVo.getId());
+        queryWrapper.eq(InsOrderAdjustInfo::getIsDelete, 0);
+        List<InsOrderAdjustInfo> adjustInfos = orderAdjustInfoMapper.selectList(queryWrapper);
+//        BigDecimal subAmount = new BigDecimal(0);
+//        BigDecimal addAmount = new BigDecimal(0);
+//        if(CollUtil.isNotEmpty(adjustInfos)) {
+//            for (InsOrderAdjustInfo adjustInfo : adjustInfos) {
+//                if(adjustInfo.getAdjustType().equals(0)){
+//                    addAmount.add(adjustInfo.getAdjustAmount());
+//                }else{
+//                    subAmount.add(adjustInfo.getAdjustAmount());
+//                }
+//            }
+//        }
+//        orderAdjustVo.setSubAmount(subAmount);
+//        orderAdjustVo.setAddAmount(addAmount);
+        OrderAdjustInfoVo orderAdjustInfoVo = new OrderAdjustInfoVo();
+        orderAdjustInfoVo.setOrderAdjustVo(orderAdjustVo);
+        orderAdjustInfoVo.setAdjustInfos(adjustInfos);
+        return orderAdjustInfoVo;
+    }
+
+    @Override
+    public OrderAdjustVo isExistById(String id) {
+        OrderAdjustVo orderAdjustVo = baseMapper.queryById(id);
+        if (ObjectUtils.isEmpty(orderAdjustVo)) {
+            throw new SystemException("订单批改信息不存在!");
+        }
+        return orderAdjustVo;
+    }
+
+    @Override
+    public String adjustAdd(OrderAdjustAddParam param, InsOrders order) {
+        // 获取订单车辆信息
+        InsOrdersCarInfo carInfo = ordersCarInfoService.getByOrderId(order.getId());
+
+        // 获取最新的订单批改
+        LambdaQueryWrapper<InsOrderAdjust> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InsOrderAdjust::getOrderNo, param.getOrderNo());
+        wrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        wrapper.eq(InsOrderAdjust::getStatus, 2);
+        wrapper.orderByDesc(InsOrderAdjust::getCreateTime);
+        List<InsOrderAdjust> adjusts = this.list(wrapper);
+
+        BigDecimal premium = new BigDecimal(0);
+        if (CollUtil.isNotEmpty(adjusts)) {
+            InsOrderAdjust adjust = adjusts.get(0);
+            premium = adjust.getAfterPremium();
+            InsOrderAdjust adjustNew = new InsOrderAdjust();
+            BeanUtils.copyProperties(adjust, adjustNew);
+            adjustNew.setId(null);
+            adjustNew.setStatus(0);
+            adjustNew.setType(param.getType());
+            adjustNew.setOrderNo(param.getOrderNo());
+            adjustNew.setPremium(premium);
+            adjustNew.setAfterPremium(null);
+            adjustNew.setAfterJqPremium(null);
+            adjustNew.setAfterSyPremium(null);
+            adjustNew.setAfterJyPremium(null);
+            this.save(adjustNew);
+            return adjustNew.getId();
+        }else{
+            InsOrdersCosts costs = ordersCostsService.getById(param.getOrderNo());
+            premium = costs.getSumPremium().subtract(costs.getTaxPremium());
+            InsOrderAdjust adjust = new InsOrderAdjust();
+            adjust.setOrderNo(param.getOrderNo());
+            adjust.setType(param.getType());
+            adjust.setCompanyId(order.getCompanyId());
+            adjust.setCompanyName(order.getCompanyName());
+            adjust.setStatus(0);
+            adjust.setLicenseNo(carInfo.getLicenseNo());
+            adjust.setPremium(premium);
+            adjust.setProductId(order.getProductId());
+            adjust.setProductName(order.getProductName());
+            this.save(adjust);
+            return adjust.getId();
+        }
+    }
+
+    @Override
+    public boolean adjustRemove(String orderNo) {
+        LambdaQueryWrapper<InsOrderAdjust> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(InsOrderAdjust::getOrderNo, orderNo);
+        wrapper.eq(InsOrderAdjust::getIsDelete, 0);
+        wrapper.eq(InsOrderAdjust::getStatus, 0);
+        wrapper.orderByDesc(InsOrderAdjust::getCreateTime);
+        List<InsOrderAdjust> adjusts = this.list(wrapper);
+        if(CollUtil.isNotEmpty(adjusts)){
+            InsOrderAdjust adjust = adjusts.get(0);
+            return this.removeById(adjust.getId());
+        }else{
+            return false;
+        }
+    }
+
+}
+
+
+
+

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersServiceImpl.java

@@ -102,6 +102,8 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
 
     private final BaseController baseController;
 
+    private final InsOrderAdjustInfoService orderAdjustInfoService;
+
     @Autowired
     @Lazy
     private InsFeeAuditService insFeeAuditService; // ✅ 改为字段注入 + 延迟加载
@@ -399,6 +401,15 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             insOrdersVo.getInsOrdersRiskList().forEach(riskInfo -> {
                 if (StringUtils.equals(riskInfo.getRiskCode(),"0507")){
                     insOrdersVo.setCiRiskInfoVo(getRiskInfoVo(riskInfo));
+                    List<KindInfoVo> kindInfoVos = insOrdersVo.getKindInfoVo();
+                    InsOrdersCosts insOrdersCosts = insOrdersVo.getInsOrdersCosts();
+                    KindInfoVo jqKind = new KindInfoVo();
+                    jqKind.setKindCode("J1");
+                    jqKind.setKindName("交强险");
+                    if(Objects.nonNull(insOrdersCosts.getJqPremium())){
+                        jqKind.setPremium(insOrdersCosts.getJqPremium().toString());
+                    }
+                    kindInfoVos.add(jqKind);
                 }else {
                     insOrdersVo.setBiRiskInfoVo(getRiskInfoVo(riskInfo));
                 }
@@ -420,6 +431,17 @@ public class InsOrdersServiceImpl extends ServiceImpl<InsOrdersMapper, InsOrders
             }
             insOrdersVo.setSpecialInfoVo(companyClauseList);
         }
+
+        // 批改明细查询
+        if (insOrdersVo.getInsOrderAdjust() !=  null) {
+            LambdaQueryWrapper<InsOrderAdjustInfo> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(InsOrderAdjustInfo::getAdjustId, insOrdersVo.getInsOrderAdjust().getId());
+            wrapper.eq(InsOrderAdjustInfo::getIsDelete, 0);
+            List<InsOrderAdjustInfo> infos = orderAdjustInfoService.list(wrapper);
+            if (CollectionUtil.isNotEmpty(infos)) {
+                insOrdersVo.getInsOrderAdjust().setAdjustInfoList(infos);
+            }
+        }
         insOrdersVo.setInsOrdersTax(insOrdersTaxService.getById(id));
         setInsOrdersExternalPolicy(insOrdersVo.getInsOrdersExternalPolicy());
         return insOrdersVo;

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrderAdjustInfoMapper.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.quotation.summary.mapper.InsOrderAdjustInfoMapper">
+
+<!--    <resultMap id="BaseResultMap" type="generator.domain.InsOrderAdjustInfo">-->
+<!--            <id property="id" column="id" jdbcType="VARCHAR"/>-->
+<!--            <result property="adjustId" column="adjust_id" jdbcType="VARCHAR"/>-->
+<!--            <result property="relatedId" column="related_id" jdbcType="VARCHAR"/>-->
+<!--            <result property="kindType" column="kind_type" jdbcType="TINYINT"/>-->
+<!--            <result property="kindCode" column="kind_code" jdbcType="VARCHAR"/>-->
+<!--            <result property="kindName" column="kind_name" jdbcType="VARCHAR"/>-->
+<!--            <result property="amount" column="amount" jdbcType="INTEGER"/>-->
+<!--            <result property="premium" column="premium" jdbcType="DECIMAL"/>-->
+<!--            <result property="quantity" column="quantity" jdbcType="INTEGER"/>-->
+<!--            <result property="type" column="type" jdbcType="TINYINT"/>-->
+<!--            <result property="adjustType" column="adjust_type" jdbcType="TINYINT"/>-->
+<!--            <result property="adjustQuantity" column="adjust_quantity" jdbcType="INTEGER"/>-->
+<!--            <result property="adjustAmount" column="adjust_amount" jdbcType="DECIMAL"/>-->
+<!--            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>-->
+<!--            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>-->
+<!--            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>-->
+<!--            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>-->
+<!--            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>-->
+<!--    </resultMap>-->
+
+    <sql id="Base_Column_List">
+        id,adjust_id,related_id,
+        kind_type,kind_code,kind_name,
+        amount,premium,quantity,
+        type,adjust_type,adjust_quantity,
+        adjust_amount,is_delete,create_time,
+        create_by,update_time,update_by
+    </sql>
+</mapper>

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrderAdjustMapper.xml

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.jzg.quotation.summary.mapper.InsOrderAdjustMapper">
+
+<!--    <resultMap id="BaseResultMap" type="generator.domain.InsOrderAdjust">-->
+<!--            <id property="id" column="id" jdbcType="BIGINT"/>-->
+<!--            <result property="orderNo" column="order_no" jdbcType="BIGINT"/>-->
+<!--            <result property="licenseNo" column="license_no" jdbcType="VARCHAR"/>-->
+<!--            <result property="companyId" column="company_id" jdbcType="VARCHAR"/>-->
+<!--            <result property="companyName" column="company_name" jdbcType="VARCHAR"/>-->
+<!--            <result property="status" column="status" jdbcType="TINYINT"/>-->
+<!--            <result property="type" column="type" jdbcType="TINYINT"/>-->
+<!--            <result property="sumPremium" column="sum_premium" jdbcType="DECIMAL"/>-->
+<!--            <result property="isDelete" column="is_delete" jdbcType="TINYINT"/>-->
+<!--            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>-->
+<!--            <result property="createBy" column="create_by" jdbcType="VARCHAR"/>-->
+<!--            <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>-->
+<!--            <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>-->
+<!--    </resultMap>-->
+
+    <sql id="Base_Column_List">
+        ioa.id,ioa.order_no as orderNo,ioa.license_no as licenseNo,
+        ioa.company_name as companyName,ioa.status,ioa.company_id as companyId,
+        ioa.type,ioa.after_premium as afterPremium,ioa.premium,
+        ioa.create_time as createTime,ioa.create_by AS createBy,ioa.update_time as updateTime,ioa.update_by AS updateBy,
+        ioa.after_jq_premium as afterJqPremium, ioa.after_sy_premium as afterSyPremium,
+        ioa.after_jy_premium as afterJyPremium
+    </sql>
+    <select id="queryPage" resultType="com.jzg.commons.entity.vo.OrderAdjustVo">
+        select <include refid="Base_Column_List"/>
+        FROM ins_order_adjust ioa
+        LEFT JOIN sys_user su on ioa.create_by = su.username
+        <where>
+            ioa.is_delete = 0
+            <if test="param.orderNo != null and param.orderNo != ''">
+                and ioa.order_no = #{param.orderNo}
+            </if>
+            <if test="param.licenseNo != null and param.licenseNo != ''">
+                and ioa.license_no = #{param.licenseNo}
+            </if>
+            <if test="param.companyId != null and param.companyId != ''">
+                and ioa.company_id = #{param.companyId}
+            </if>
+            <if test="param.salesman != null and param.salesman != ''">
+                and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
+            </if>
+            <if test="param.status != null ">
+                and ioa.status = #{param.status}
+            </if>
+            <if test="param.type != null ">
+                and ioa.type = #{param.type}
+            </if>
+            <if test="param.startDate != null and param.endDate != null">
+                and DATE_FORMAT(ioa.create_time, '%Y-%m-%d') between #{param.startDate} AND #{param.endDate}
+            </if>
+        </where>
+        ORDER BY ioa.create_time DESC
+    </select>
+
+    <select id="adjustList" resultType="com.jzg.commons.entity.vo.OrderAdjustVo">
+        select <include refid="Base_Column_List"/>,ioa.after_premium - ioa.premium as changePremium,
+        CASE ioa.status
+        WHEN 0 THEN '订单批改中'
+        WHEN 1 THEN '待审核'
+        WHEN 2 THEN '审核通过'
+        WHEN 3 THEN '退回修改'
+        WHEN 4 THEN '拒绝批改'
+        ELSE '未知状态'
+        END AS statusStr,
+        CASE ioa.type
+        WHEN 0 THEN '整单退保'
+        WHEN 1 THEN '险种批改'
+        ELSE '未知类型'
+        END AS typeStr
+        FROM ins_order_adjust ioa
+        LEFT JOIN sys_user su on ioa.create_by = su.username
+        <where>
+            ioa.is_delete = 0
+            <if test="param.orderNo != null and param.orderNo != ''">
+                and ioa.order_no = #{param.orderNo}
+            </if>
+            <if test="param.licenseNo != null and param.licenseNo != ''">
+                and ioa.license_no = #{param.licenseNo}
+            </if>
+            <if test="param.companyId != null and param.companyId != ''">
+                and ioa.company_id = #{param.companyId}
+            </if>
+            <if test="param.salesman != null and param.salesman != ''">
+                and (su.username = #{param.salesman} or su.mobile = #{param.salesman})
+            </if>
+            <if test="param.status != null ">
+                and ioa.status = #{param.status}
+            </if>
+            <if test="param.type != null ">
+                and ioa.type = #{param.type}
+            </if>
+            <if test="param.startDate != null and param.endDate != null">
+                and DATE_FORMAT(ioa.create_time, '%Y-%m-%d') between #{param.startDate} AND #{param.endDate}
+            </if>
+        </where>
+        ORDER BY ioa.create_time DESC
+    </select>
+    <select id="queryById" resultType="com.jzg.commons.entity.vo.OrderAdjustVo">
+        select <include refid="Base_Column_List"/>
+        FROM ins_order_adjust ioa
+        <where>
+            ioa.is_delete = 0
+            <if test="id != null and id != ''">
+                and ioa.id = #{id}
+            </if>
+        </where>
+    </select>
+
+</mapper>

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersMapper.xml

@@ -149,6 +149,20 @@
         <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
     </resultMap>
 
+    <!--订单 批改-->
+    <resultMap id="InsOrderAdjustMap" type="com.jzg.commons.entity.orders.po.InsOrderAdjust">
+        <id property="id" column="id" jdbcType="VARCHAR"/>
+        <result property="orderNo" column="order_no" jdbcType="VARCHAR"/>
+        <result property="licenseNo" column="license_no" jdbcType="VARCHAR"/>
+        <result property="companyId" column="company_id" jdbcType="VARCHAR"/>
+        <result property="companyName" column="company_name" jdbcType="VARCHAR"/>
+        <result property="productId" column="product_id" jdbcType="VARCHAR"/>
+        <result property="productName" column="product_name" jdbcType="VARCHAR"/>
+        <result property="status" column="status" jdbcType="VARCHAR"/>
+        <result property="type" column="type" jdbcType="VARCHAR"/>
+        <result property="premium" column="premium" jdbcType="VARCHAR"/>
+        <result property="afterPremium" column="after_premium" jdbcType="VARCHAR"/>
+    </resultMap>
 
     <!--订单 车船税-->
     <resultMap id="InsOrdersTaxMap" type="com.jzg.commons.entity.orders.po.InsOrdersTax">
@@ -188,6 +202,7 @@
         <association property="vehicleAndVesselTaxVo" column="{orderNo=id}" select="selectOrdersTaxMap" />
         <association property="imagesAdds" column="{orderNo=id}" select="selectImageByOrderNo" />
         <collection property="insOrdersRiskList"  column="{orderNo=id}" select="selectOrdersRisk" />
+        <collection property="insOrderAdjust"  column="{orderNo=id}" select="selectOrderAdjust" />
         <collection property="carUserInfoList"  column="{orderNo=id}"  select="selectCarUserInfo" />
         <collection property="kindInfoVo" column="{orderNo=id}" select="selectKindMap" />
         <collection property="insOrdersCosts" column="{orderNo=id}" select="selectOrdersCostsByOrderNo" />
@@ -329,6 +344,10 @@
         select id,order_no,risk_name,amount,commission_rate,premium,risk_code,no_tax_premium,commission_amount,start_date,end_date from  ins_orders_risk where order_no = #{orderNo}
     </select>
 
+    <select id="selectOrderAdjust" resultMap="InsOrderAdjustMap">
+        select id,order_no ,license_no ,company_id,product_id,product_name,company_name ,status,type,after_premium,premium from ins_order_adjust where order_no = #{orderNo} AND status in (1,2,3) AND is_delete = 0 order by create_time desc limit 1
+    </select>
+
     <select id="selectOrdersTax" resultMap="InsOrdersTaxMap">
         select order_no,extend_char2,tax_relief,relif_reason,tax_com_code,tax_com_name,tax_document_date,tax_paid_area_code,paid_free_certificate,taxpayer_name,taxpayer_identifier,identify_number,tax_relif_flag from  ins_orders_tax where order_no = #{orderNo}
     </select>
@@ -480,7 +499,10 @@
             suji.type_attr as salesmanType,
             pa.agreement_name as agreementName,
             sd.name as deptName,
-            io.pay_link as paymentLink
+            io.pay_link as paymentLink,
+            ioa.status as adjustStatus,
+            ioa.id as adjustId,
+            ioa1.after_premium as adjustPremium
         FROM
             ins_orders io
                 LEFT JOIN ins_orders_car_info ioci ON ioci.order_no = io.id
@@ -504,6 +526,24 @@
             sys_dept sd on sd.id = suji.dept_id
                 left join
             ptl_agreement pa on pa.id = io.agreement_id
+                left join
+            (
+                SELECT *
+                    FROM (
+                        SELECT t.*,
+                        ROW_NUMBER() OVER(PARTITION BY t.order_no ORDER BY t.create_time DESC) AS rn
+                        FROM ins_order_adjust t where t.is_delete = 0
+                    ) x WHERE x.rn = 1
+            ) ioa ON io.id = ioa.order_no
+                left join
+            (
+            SELECT *
+            FROM (
+                SELECT t.*,
+                ROW_NUMBER() OVER(PARTITION BY t.order_no ORDER BY t.create_time DESC) AS rn
+                FROM ins_order_adjust t where t.status = 2 and t.is_delete = 0
+            ) x WHERE x.rn = 1
+        ) ioa1 ON io.id = ioa1.order_no
         where
             1=1
         <if test="insOrdersParam.orderNo != null and insOrdersParam.orderNo != ''">
@@ -515,6 +555,9 @@
         <if test="insOrdersParam.orderStatus!= null and insOrdersParam.orderStatus!= ''">
             AND io.order_status = #{insOrdersParam.orderStatus}
         </if>
+        <if test="insOrdersParam.adjustStatus!= null and insOrdersParam.adjustStatus!= ''">
+            AND ioa.status = #{insOrdersParam.adjustStatus}
+        </if>
         <if test="insOrdersParam.salesman!= null">
             AND io.real_quote_user_id = #{insOrdersParam.salesman}
         </if>

tenant/insurance/quotation-summary/src/main/resources/mapper/InsOrdersTrackMapper.xml

@@ -30,6 +30,9 @@
             <if test="param.orderNo != null and param.orderNo != ''">
                 and order_no = #{param.orderNo}
             </if>
+            <if test="param.module != null and param.module != ''">
+                and `module` = #{param.module}
+            </if>
         </where>
         order by create_time desc
     </select>

tenant/organization/src/main/java/com/jzg/organization/controller/SchemeController.java

@@ -62,6 +62,12 @@ public class SchemeController {
         return HttpResult.ok(ptlSchemeService.getBusinessInsuranceList(productId));
     }
 
+    @Operation(summary = "获取商业险信息")
+    @GetMapping("/getBusinessInsuranceByKindType")
+    public HttpResult getBusinessInsuranceByKindType(String kindCode){
+        return HttpResult.ok(ptlSchemeService.getBusinessInsuranceListByKindType(kindCode));
+    }
+
     @Operation(summary = "获取保司列表,用于方案排序")
     @GetMapping("/getCompanyList")
     public HttpResult getCompanyList(String systemCode){

tenant/organization/src/main/java/com/jzg/organization/mapper/InsBusinessInsuranceMapper.java

@@ -7,6 +7,7 @@ import com.jzg.commons.entity.scheme.po.InsBusinessInsuranceOption;
 import com.jzg.commons.entity.scheme.po.PtlSchemeInsurance;
 import com.jzg.commons.entity.scheme.vo.InsBusinessInsuranceVo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -20,4 +21,6 @@ public interface InsBusinessInsuranceMapper extends BaseMapper<InsBusinessInsura
      * @return
      */
     public List<InsBusinessInsuranceOption> getBusinessInsuranceOptionList();
+
+    List<InsBusinessInsuranceVo> getBusinessInsuranceListByKindType(@Param("kindCode") String kindCode);
 }

tenant/organization/src/main/java/com/jzg/organization/service/PtlSchemeService.java

@@ -83,4 +83,6 @@ public interface PtlSchemeService extends IService<PtlScheme> {
      * @return
      */
     public SchemeResultVo getSchemeResult(String companyId,String productId);
+
+    List<InsBusinessInsuranceVo> getBusinessInsuranceListByKindType(String kindCode);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/PtlSchemeServiceImpl.java

@@ -442,4 +442,9 @@ public class PtlSchemeServiceImpl extends ServiceImpl<PtlSchemeMapper, PtlScheme
 
         return schemeResultVo;
     }
+
+    @Override
+    public List<InsBusinessInsuranceVo> getBusinessInsuranceListByKindType(String kindCode) {
+        return insBusinessInsuranceMapper.getBusinessInsuranceListByKindType(kindCode);
+    }
 }

tenant/organization/src/main/resources/mapper/InsBusinessInsuranceMapper.xml

@@ -49,4 +49,25 @@
     <select id="getBusinessInsuranceOptionList" resultType="com.jzg.commons.entity.scheme.po.InsBusinessInsuranceOption">
         select * from ins_business_insurance_option
     </select>
+    <select id="getBusinessInsuranceListByKindType" resultMap="SchemeResultVoMap">
+        SELECT
+        ibi.power_id,
+        ibi.kind_code,
+        ibi.kind_name,
+        ibi.alias,
+        ibi.grouping,
+        ibio.id,
+        ibio.business_id,
+        ibio.label,
+        ibio.`value`,
+        ibio.sort
+        FROM
+        ins_business_insurance ibi
+        LEFT JOIN ins_business_insurance_option ibio ON ibi.id = ibio.business_id
+        WHERE
+        1=1
+        <if test="kindCode != null and kindCode != ''">
+            AND ibi.kind_code = #{kindCode}
+        </if>
+    </select>
 </mapper>