优化获取动态OrderBaseXXXXEs对象

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/OrderBase2022Es.java

@@ -1,7 +1,9 @@
 package com.gree.mall.manager.bean.es;
 
+import cn.hutool.db.sql.Order;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
@@ -15,537 +17,9 @@ import java.math.BigDecimal;
  * @description
  * @date 2023/6/19 10:39 星期一
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Document(indexName = "pg_order_base2022")
-public class OrderBase2022Es {
+public class OrderBase2022Es extends OrderBaseEs {
 
-    @Id
-    @Field(value = "id", type = FieldType.Keyword)
-    private String id;
-
-    @ApiModelProperty(value = "服务说明(例如：家用空调x1,洗衣机x1)")
-    @Field(value = "order_title", type = FieldType.Keyword)
-    private String orderTitle;
-
-    @ApiModelProperty(value = "所属业务线   INSTALL=安装 REPAIR=维修")
-    @Field(value = "order_type", type = FieldType.Keyword)
-    private String orderType;
-
-    @ApiModelProperty(value = "所属业务线名称")
-    @Field(value = "order_type_text", type = FieldType.Keyword)
-    private String orderTypeText;
-
-    @ApiModelProperty(value = "工单类型")
-    @Field(value = "order_small_type", type = FieldType.Keyword)
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型名称")
-    @Field(value = "order_small_type_text", type = FieldType.Keyword)
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "商户id")
-    @Field(value = "company_wechat_id", type = FieldType.Keyword)
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    @Field(value = "company_wechat_name", type = FieldType.Keyword)
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "主要师傅id")
-    @Field(value = "worker_id", type = FieldType.Keyword)
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    @Field(value = "worker_name", type = FieldType.Keyword)
-    private String workerName;
-
-    @ApiModelProperty(value = "师傅电话")
-    @Field(value = "worker_mobile", type = FieldType.Keyword)
-    private String workerMobile;
-
-    @ApiModelProperty(value = "师傅身份证")
-    @Field(value = "worker_idcard", type = FieldType.Keyword)
-    private String workerIdcard;
-
-    @ApiModelProperty(value = "所有师傅的id(冗余字段)，实际请看order_worker")
-    @Field(value = "worker_id_list", type = FieldType.Keyword)
-    private String workerIdList;
-
-    @ApiModelProperty(value = "工单状态 DYY=待预约 DSHPG=待商户派工 DWDPG=待网点派工 DQD=待抢单 DJD=待接单 FWZ=服务中 YCD=异常单 YWG=已完工待结算 YJS=已结算 YQX=已取消")
-    @Field(value = "order_status", type = FieldType.Keyword)
-    private String orderStatus;
-
-    @ApiModelProperty(value = "工单状态中文名称")
-    @Field(value = "order_status_text", type = FieldType.Keyword)
-    private String orderStatusText;
-
-    @ApiModelProperty(value = "派单给师傅的时间")
-    @Field(value = "dispatch_time", type = FieldType.Date,format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String dispatchTime;
-
-    @ApiModelProperty(value = "师傅接单时间")
-    @Field(value = "worker_rece_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String workerReceTime;
-
-    @ApiModelProperty(value = "派工网点时间")
-    @Field(value = "dispatch_websit_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String dispatchWebsitTime;
-
-    @ApiModelProperty(value = "客户id(客户建单才有)")
-    @Field(value = "user_id", type = FieldType.Keyword)
-    private String userId;
-
-    @ApiModelProperty(value = "客户名称")
-    @Field(value = "user_name", type = FieldType.Keyword)
-    private String userName;
-
-    @ApiModelProperty(value = "联系人")
-    @Field(value = "link_name", type = FieldType.Keyword)
-    private String linkName;
-
-    @ApiModelProperty(value = "客户电话")
-    @Field(value = "user_mobile", type = FieldType.Keyword)
-    private String userMobile;
-
-    @ApiModelProperty(value = "客户电话2")
-    @Field(value = "user_mobile2", type = FieldType.Keyword)
-    private String userMobile2;
-
-    @ApiModelProperty(value = "省")
-    @Field(value = "province", type = FieldType.Keyword)
-    private String province;
-
-    @ApiModelProperty(value = "省id")
-    @Field(value = "province_id", type = FieldType.Keyword)
-    private String provinceId;
-
-    @ApiModelProperty(value = "市")
-    @Field(value = "city", type = FieldType.Keyword)
-    private String city;
-
-    @ApiModelProperty(value = "市id")
-    @Field(value = "city_id", type = FieldType.Keyword)
-    private String cityId;
-
-    @ApiModelProperty(value = "区")
-    @Field(value = "area", type = FieldType.Keyword)
-    private String area;
-
-    @ApiModelProperty(value = "区id")
-    @Field(value = "area_id", type = FieldType.Keyword)
-    private String areaId;
-
-    @ApiModelProperty(value = "街道")
-    @Field(value = "street", type = FieldType.Keyword)
-    private String street;
-
-    @ApiModelProperty(value = "街道id")
-    @Field(value = "street_id", type = FieldType.Keyword)
-    private String streetId;
-
-    @ApiModelProperty(value = "详细地址")
-    @Field(value = "address", type = FieldType.Keyword)
-    private String address;
-
-    @ApiModelProperty(value = "备注")
-    @Field(value = "remark", type = FieldType.Keyword)
-    private String remark;
-
-    @ApiModelProperty(value = "安装或维修网点名称（售后网点）")
-    @Field(value = "websit_name", type = FieldType.Keyword)
-    private String websitName;
-
-    @ApiModelProperty(value = "安装或维修网点编号（售后网点）")
-    @Field(value = "websit_id", type = FieldType.Keyword)
-    private String websitId;
-
-    @ApiModelProperty(value = "售后网点联系电话")
-    @Field(value = "websit_phone", type = FieldType.Keyword)
-    private String websitPhone;
-
-    @ApiModelProperty(value = "创建网点编号")
-    @Field(value = "create_websit_id", type = FieldType.Keyword)
-    private String createWebsitId;
-
-    @ApiModelProperty(value = "创建网点名称")
-    @Field(value = "create_websit_name", type = FieldType.Keyword)
-    private String createWebsitName;
-
-    @ApiModelProperty(value = "gps地址信息")
-    @Field(value = "gps_address", type = FieldType.Keyword)
-    private String gpsAddress;
-
-    @ApiModelProperty(value = "最新反馈记录")
-    @Field(value = "last_operator", type = FieldType.Keyword)
-    private String lastOperator;
-
-    @ApiModelProperty(value = "最近操作网点")
-    @Field(value = "last_operator_websit", type = FieldType.Keyword)
-    private String lastOperatorWebsit;
-
-    @ApiModelProperty(value = "最近操作网点编号")
-    @Field(value = "last_operator_by", type = FieldType.Keyword)
-    private String lastOperatorBy;
-
-    @ApiModelProperty(value = "最近操作时间")
-    @Field(value = "last_operator_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String lastOperatorTime;
-
-    @ApiModelProperty(value = "预约安装/维修时间")
-    @Field(value = "appointment_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appointmentTime;
-
-    @ApiModelProperty(value = "预约结束时间")
-    @Field(value = "appointment_end_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appointmentEndTime;
-
-    @ApiModelProperty(value = "预约备注")
-    @Field(value = "appointment_remark", type = FieldType.Keyword)
-    private String appointmentRemark;
-
-    @ApiModelProperty(value = "安装/维修总数量")
-    @Field(value = "total_num", type = FieldType.Keyword)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "未完成数量")
-    @Field(value = "undone_num", type = FieldType.Keyword)
-    private Integer undoneNum;
-
-    @ApiModelProperty(value = "经度")
-    @Field(value = "lng", type = FieldType.Keyword)
-    private String lng;
-
-    @ApiModelProperty(value = "纬度")
-    @Field(value = "lat", type = FieldType.Keyword)
-    private String lat;
-
-    @ApiModelProperty(value = "师傅报完工时间")
-    @Field(value = "over_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String overTime;
-
-    @ApiModelProperty(value = "网点报完工时间")
-    @Field(value = "websit_over_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String websitOverTime;
-
-    @ApiModelProperty(value = "完工时间(精确到天)")
-    @Field(value = "over_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String overDate;
-
-    @ApiModelProperty(value = "正常关闭时间")
-    @Field(value = "close_time",type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String closeTime;
-
-    @ApiModelProperty(value = "创建时间(精确到天)")
-    @Field(value = "create_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String createDate;
-
-    @ApiModelProperty(value = "创建时间")
-    @Field(value = "create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String createTime;
-
-    @ApiModelProperty(value = "创建人手机")
-    @Field(value = "create_mobile", type = FieldType.Keyword)
-    private String createMobile;
-
-    @ApiModelProperty(value = "创建人")
-    @Field(value = "create_by", type = FieldType.Keyword)
-    private String createBy;
-
-    @ApiModelProperty(value = "创建人名称")
-    @Field(value = "create_name", type = FieldType.Keyword)
-    private String createName;
-
-    @ApiModelProperty(value = "修改时间")
-    @Field(value = "update_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    @Field(value = "update_by", type = FieldType.Keyword)
-    private String updateBy;
-
-    @ApiModelProperty(value = "首次评价(A:好评,B:中评,C:差评,N:未评价,O:其他")
-    @Field(value = "appraise_status", type = FieldType.Keyword)
-    private String appraiseStatus;
-
-    @ApiModelProperty(value = "首次评价内容")
-    @Field(value = "appraise_content", type = FieldType.Keyword)
-    private String appraiseContent;
-
-    @ApiModelProperty(value = "首次评价时间")
-    @Field(value = "appraise_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appraiseTime;
-
-    @ApiModelProperty(value = "评价来源 1=用户评价 2=商家评价")
-    @Field(value = "appraise_source", type = FieldType.Keyword)
-    private Integer appraiseSource;
-
-    @ApiModelProperty(value = "多个图片逗号隔开")
-    @Field(value = "appraise_img_url", type = FieldType.Keyword)
-    private String appraiseImgUrl;
-
-    @ApiModelProperty(value = "师傅记事备注")
-    @Field(value = "worker_remark", type = FieldType.Keyword)
-    private String workerRemark;
-
-    @ApiModelProperty(value = "销售单位")
-    @Field(value = "sale_company", type = FieldType.Keyword)
-    private String saleCompany;
-
-    @ApiModelProperty(value = "最近一次操作预约/改约的时间")
-    @Field(value = "last_operator_appointment_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String lastOperatorAppointmentTime;
-
-    @ApiModelProperty(value = "工单渠道id")
-    @Field(value = "order_channel_id", type = FieldType.Keyword)
-    private String orderChannelId;
-
-    @ApiModelProperty(value = "工单渠道")
-    @Field(value = "order_channel_text", type = FieldType.Keyword)
-    private String orderChannelText;
-
-    @ApiModelProperty(value = "改约备注")
-    @Field(value = "change_remark", type = FieldType.Keyword)
-    private String changeRemark;
-
-    @ApiModelProperty(value = "销售单号")
-    @Field(value = "sale_order_id", type = FieldType.Keyword)
-    private String saleOrderId;
-
-    @ApiModelProperty(value = "销售单下单时间")
-    @Field(value = "sale_create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String saleCreateTime;
-
-    @ApiModelProperty(value = "销售单订单金额")
-    @Field(value = "sale_total_amount", type = FieldType.Keyword)
-    private BigDecimal saleTotalAmount;
-
-    @ApiModelProperty(value = "销售单备注")
-    @Field(value = "sale_remark", type = FieldType.Keyword)
-    private String saleRemark;
-
-    @ApiModelProperty(value = "内部来源")
-    @Field(value = "source", type = FieldType.Keyword)
-    private String source;
-
-    @ApiModelProperty(value = "完工反馈备注")
-    @Field(value = "over_remark", type = FieldType.Keyword)
-    private String overRemark;
-
-    @ApiModelProperty(value = "客户签名")
-    @Field(value = "user_sign", type = FieldType.Keyword)
-    private String userSign;
-
-    @ApiModelProperty(value = "是否为导入工单，true=是 false=否")
-    @Field(value = "is_import", type = FieldType.Keyword)
-    private Boolean isImport;
-
-    @ApiModelProperty(value = "是否已采集 YES 是 NO 否")
-    @Field(value = "is_gather", type = FieldType.Keyword)
-    private String isGather;
-
-    @ApiModelProperty(value = "是否异常工单 true/false")
-    @Field(value = "is_exception", type = FieldType.Keyword)
-    private Boolean isException;
-
-    @ApiModelProperty(value = "增置服务id")
-    @Field(value = "pg_incre_id", type = FieldType.Keyword)
-    private String pgIncreId;
-
-    @ApiModelProperty(value = "增置服务订单id")
-    @Field(value = "pg_incre_order_id", type = FieldType.Keyword)
-    private String pgIncreOrderId;
-
-    @ApiModelProperty(value = "增置服务明细id")
-    @Field(value = "pg_incre_item_id", type = FieldType.Keyword)
-    private String pgIncreItemId;
-
-    @ApiModelProperty(value = "增置服务售卖网点")
-    @Field(value = "pg_incre_websit_name", type = FieldType.Keyword)
-    private String pgIncreWebsitName;
-
-    @ApiModelProperty(value = "增置服务售卖网点id")
-    @Field(value = "pg_incre_websit_id", type = FieldType.Keyword)
-    private String pgIncreWebsitId;
-
-    @ApiModelProperty(value = "结算服务费用")
-    @Field(value = "settle_service_amount", type = FieldType.Keyword)
-    private BigDecimal settleServiceAmount;
-
-    @ApiModelProperty(value = "维保基础id")
-    @Field(value = "rp_project_repair_id", type = FieldType.Keyword)
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "工程维保名称")
-    @Field(value = "rp_project_repair_name", type = FieldType.Keyword)
-    private String rpProjectRepairName;
-
-    @ApiModelProperty(value = "费用支付方式 EXAMINE=审批后结算 SITE=现场支付")
-    @Field(value = "fee_pay_method", type = FieldType.Keyword)
-    private String feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用 YES=是 NO=否")
-    @Field(value = "is_all_fee", type = FieldType.Keyword)
-    private String isAllFee;
-
-    @ApiModelProperty(value = "销售类型 1=零售 2=工程 3=延保 4=工程维保")
-    @Field(value = "sale_type", type = FieldType.Keyword)
-    private Integer saleType;
-
-    @ApiModelProperty(value = "工程编号")
-    @Field(value = "project_no", type = FieldType.Keyword)
-    private String projectNo;
-
-    @ApiModelProperty(value = "工程名称")
-    @Field(value = "project_name", type = FieldType.Keyword)
-    private String projectName;
-
-    @ApiModelProperty(value = "是否开启抢单")
-    @Field(value = "is_qd", type = FieldType.Keyword)
-    private Boolean isQd;
-
-    @ApiModelProperty(value = "是否已产生通知 true=是 false=否")
-    @Field(value = "is_qd_notice", type = FieldType.Keyword)
-    private Boolean isQdNotice;
-
-    @ApiModelProperty(value = "是否为拆机")
-    @Field(value = "is_cj", type = FieldType.Keyword)
-    private Boolean isCj;
-
-    @ApiModelProperty(value = "是否为租赁单 true/false")
-    @Field(value = "is_zl", type = FieldType.Keyword)
-    private Boolean isZl;
-
-
-
-    @ApiModelProperty(value = "是否为工单导入 true/false")
-    @Field(value = "is_import_excel", type = FieldType.Keyword)
-    private Boolean isImportExcel;
-
-    @ApiModelProperty(value = "服务状态")
-    @Field(value = "service_status", type = FieldType.Keyword)
-    private String serviceStatus;
-
-    @ApiModelProperty(value = "投诉等级")
-    @Field(value = "complaint", type = FieldType.Keyword)
-    private String complaint;
-
-    @ApiModelProperty(value = "紧急程度")
-    @Field(value = "urgent", type = FieldType.Keyword)
-    private String urgent;
-
-    @ApiModelProperty(value = "评价结果")
-    @Field(value = "evaluate", type = FieldType.Keyword)
-    private String evaluate;
-
-    @ApiModelProperty(value = "销售平台")
-    @Field(value = "sales_platform", type = FieldType.Keyword)
-    private String salesPlatform;
-
-    @ApiModelProperty(value = "购买单位")
-    @Field(value = "buy_name", type = FieldType.Keyword)
-    private String buyName;
-
-    @ApiModelProperty(value = "销售类型")
-    @Field(value = "sales_type_name", type = FieldType.Keyword)
-    private String salesTypeName;
-
-    @ApiModelProperty(value = "要求状态")
-    @Field(value = "req_status", type = FieldType.Keyword)
-    private String reqStatus;
-
-    @ApiModelProperty(value = "要求类型")
-    @Field(value = "req_type", type = FieldType.Keyword)
-    private String reqType;
-
-    @ApiModelProperty(value = "要求内容")
-    @Field(value = "req_text", type = FieldType.Keyword)
-    private String reqText;
-
-    @ApiModelProperty(value = "服务单号")
-    @Field(value = "service_order_id", type = FieldType.Keyword)
-    private String serviceOrderId;
-
-    @ApiModelProperty(value = "销售单号")
-    @Field(value = "sales_order_id", type = FieldType.Keyword)
-    private String salesOrderId;
-
-    @ApiModelProperty(value = "管理组织")
-    @Field(value = "manager_name", type = FieldType.Keyword)
-    private String managerName;
-
-    @ApiModelProperty(value = "运营主体")
-    @Field(value = "operate_entity", type = FieldType.Keyword)
-    private String operateEntity;
-
-    @ApiModelProperty(value = "大类名称")
-    @Field(value = "main_name", type = FieldType.Keyword)
-    private String mainName;
-
-
-
-    @ApiModelProperty(value = "师傅编号")
-    @Field(value = "worker_number", type = FieldType.Keyword)
-    private String workerNumber;
-
-
-
-    @ApiModelProperty(value = "上午下午")
-    @Field(value = "time_name", type = FieldType.Keyword)
-    private String timeName;
-
-    @ApiModelProperty(value = "所属公司")
-    @Field(value = "belong_company", type = FieldType.Keyword)
-    private String belongCompany;
-
-    @ApiModelProperty(value = "销售网点编号")
-    @Field(value = "sales_websit_number", type = FieldType.Keyword)
-    private String salesWebsitNumber;
-
-    @ApiModelProperty(value = "销售网点名称")
-    @Field(value = "sales_websit", type = FieldType.Keyword)
-    private String salesWebsit;
-
-    @ApiModelProperty(value = "创建人编号")
-    @Field(value = "create_number", type = FieldType.Keyword)
-    private String createNumber;
-
-    @ApiModelProperty(value = "评价标签")
-    @Field(value = "appraise_label", type = FieldType.Keyword)
-    private String appraiseLabel;
-
-    @ApiModelProperty(value = "是否是工单3.0同步true/false")
-    @Field(value = "is_three_order", type = FieldType.Keyword)
-    private Boolean isThreeOrder;
-
-    @ApiModelProperty(value = "故障类型")
-    @Field(value = "trouble_value", type = FieldType.Keyword)
-    private String troubleValue;
-
-    @ApiModelProperty(value = "需求类别")
-    @Field(value = "type", type = FieldType.Keyword)
-    private String type;
-
-    @ApiModelProperty(value = "需求小类")
-    @Field(value = "small_type", type = FieldType.Keyword)
-    private String smallType;
-
-    @ApiModelProperty(value = "1 已接单 0未接单")
-    @Field(value = "is_meet", type = FieldType.Keyword)
-    private Boolean isMeet;
-
-    @ApiModelProperty(value = "申请状态 ING=申请中 END=到货反馈 CANCEL=取消申请")
-    @Field(value = "parts_apply_status", type = FieldType.Keyword)
-    private String partsApplyStatus;
-
-    @ApiModelProperty(value = "首次派工时间")
-    @Field(value = "first_dispatch_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String firstDispatchTime;
-
-    @ApiModelProperty(value = "首次预约时间")
-    @Field(value = "first_appointment_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String firstAppointmentTime;
-
-    @ApiModelProperty(value = "取消时间")
-    @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String cancelTime;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/OrderBase2023Es.java

@@ -1,551 +1,17 @@
 package com.gree.mall.manager.bean.es;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
+import lombok.EqualsAndHashCode;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-import java.math.BigDecimal;
 
 /**
  * @author qinrongjun
  * @description
  * @date 2023/6/19 10:39 星期一
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Document(indexName = "pg_order_base2023")
-public class OrderBase2023Es {
-
-    @Id
-    @Field(value = "id", type = FieldType.Keyword)
-    private String id;
-
-    @ApiModelProperty(value = "服务说明(例如：家用空调x1,洗衣机x1)")
-    @Field(value = "order_title", type = FieldType.Keyword)
-    private String orderTitle;
-
-    @ApiModelProperty(value = "所属业务线   INSTALL=安装 REPAIR=维修")
-    @Field(value = "order_type", type = FieldType.Keyword)
-    private String orderType;
-
-    @ApiModelProperty(value = "所属业务线名称")
-    @Field(value = "order_type_text", type = FieldType.Keyword)
-    private String orderTypeText;
-
-    @ApiModelProperty(value = "工单类型")
-    @Field(value = "order_small_type", type = FieldType.Keyword)
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型名称")
-    @Field(value = "order_small_type_text", type = FieldType.Keyword)
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "商户id")
-    @Field(value = "company_wechat_id", type = FieldType.Keyword)
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    @Field(value = "company_wechat_name", type = FieldType.Keyword)
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "主要师傅id")
-    @Field(value = "worker_id", type = FieldType.Keyword)
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    @Field(value = "worker_name", type = FieldType.Keyword)
-    private String workerName;
-
-    @ApiModelProperty(value = "师傅电话")
-    @Field(value = "worker_mobile", type = FieldType.Keyword)
-    private String workerMobile;
-
-    @ApiModelProperty(value = "师傅身份证")
-    @Field(value = "worker_idcard", type = FieldType.Keyword)
-    private String workerIdcard;
-
-    @ApiModelProperty(value = "所有师傅的id(冗余字段)，实际请看order_worker")
-    @Field(value = "worker_id_list", type = FieldType.Keyword)
-    private String workerIdList;
-
-    @ApiModelProperty(value = "工单状态 DYY=待预约 DSHPG=待商户派工 DWDPG=待网点派工 DQD=待抢单 DJD=待接单 FWZ=服务中 YCD=异常单 YWG=已完工待结算 YJS=已结算 YQX=已取消")
-    @Field(value = "order_status", type = FieldType.Keyword)
-    private String orderStatus;
-
-    @ApiModelProperty(value = "工单状态中文名称")
-    @Field(value = "order_status_text", type = FieldType.Keyword)
-    private String orderStatusText;
-
-    @ApiModelProperty(value = "派单给师傅的时间")
-    @Field(value = "dispatch_time", type = FieldType.Date,format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String dispatchTime;
-
-    @ApiModelProperty(value = "师傅接单时间")
-    @Field(value = "worker_rece_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String workerReceTime;
-
-    @ApiModelProperty(value = "派工网点时间")
-    @Field(value = "dispatch_websit_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String dispatchWebsitTime;
-
-    @ApiModelProperty(value = "客户id(客户建单才有)")
-    @Field(value = "user_id", type = FieldType.Keyword)
-    private String userId;
-
-    @ApiModelProperty(value = "客户名称")
-    @Field(value = "user_name", type = FieldType.Keyword)
-    private String userName;
-
-    @ApiModelProperty(value = "联系人")
-    @Field(value = "link_name", type = FieldType.Keyword)
-    private String linkName;
-
-    @ApiModelProperty(value = "客户电话")
-    @Field(value = "user_mobile", type = FieldType.Keyword)
-    private String userMobile;
-
-    @ApiModelProperty(value = "客户电话2")
-    @Field(value = "user_mobile2", type = FieldType.Keyword)
-    private String userMobile2;
-
-    @ApiModelProperty(value = "省")
-    @Field(value = "province", type = FieldType.Keyword)
-    private String province;
-
-    @ApiModelProperty(value = "省id")
-    @Field(value = "province_id", type = FieldType.Keyword)
-    private String provinceId;
-
-    @ApiModelProperty(value = "市")
-    @Field(value = "city", type = FieldType.Keyword)
-    private String city;
-
-    @ApiModelProperty(value = "市id")
-    @Field(value = "city_id", type = FieldType.Keyword)
-    private String cityId;
-
-    @ApiModelProperty(value = "区")
-    @Field(value = "area", type = FieldType.Keyword)
-    private String area;
-
-    @ApiModelProperty(value = "区id")
-    @Field(value = "area_id", type = FieldType.Keyword)
-    private String areaId;
-
-    @ApiModelProperty(value = "街道")
-    @Field(value = "street", type = FieldType.Keyword)
-    private String street;
-
-    @ApiModelProperty(value = "街道id")
-    @Field(value = "street_id", type = FieldType.Keyword)
-    private String streetId;
-
-    @ApiModelProperty(value = "详细地址")
-    @Field(value = "address", type = FieldType.Keyword)
-    private String address;
-
-    @ApiModelProperty(value = "备注")
-    @Field(value = "remark", type = FieldType.Keyword)
-    private String remark;
-
-    @ApiModelProperty(value = "安装或维修网点名称（售后网点）")
-    @Field(value = "websit_name", type = FieldType.Keyword)
-    private String websitName;
-
-    @ApiModelProperty(value = "安装或维修网点编号（售后网点）")
-    @Field(value = "websit_id", type = FieldType.Keyword)
-    private String websitId;
-
-    @ApiModelProperty(value = "售后网点联系电话")
-    @Field(value = "websit_phone", type = FieldType.Keyword)
-    private String websitPhone;
-
-    @ApiModelProperty(value = "创建网点编号")
-    @Field(value = "create_websit_id", type = FieldType.Keyword)
-    private String createWebsitId;
-
-    @ApiModelProperty(value = "创建网点名称")
-    @Field(value = "create_websit_name", type = FieldType.Keyword)
-    private String createWebsitName;
-
-    @ApiModelProperty(value = "gps地址信息")
-    @Field(value = "gps_address", type = FieldType.Keyword)
-    private String gpsAddress;
-
-    @ApiModelProperty(value = "最新反馈记录")
-    @Field(value = "last_operator", type = FieldType.Keyword)
-    private String lastOperator;
-
-    @ApiModelProperty(value = "最近操作网点")
-    @Field(value = "last_operator_websit", type = FieldType.Keyword)
-    private String lastOperatorWebsit;
-
-    @ApiModelProperty(value = "最近操作网点编号")
-    @Field(value = "last_operator_by", type = FieldType.Keyword)
-    private String lastOperatorBy;
-
-    @ApiModelProperty(value = "最近操作时间")
-    @Field(value = "last_operator_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String lastOperatorTime;
-
-    @ApiModelProperty(value = "预约安装/维修时间")
-    @Field(value = "appointment_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appointmentTime;
-
-    @ApiModelProperty(value = "预约结束时间")
-    @Field(value = "appointment_end_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appointmentEndTime;
-
-    @ApiModelProperty(value = "预约备注")
-    @Field(value = "appointment_remark", type = FieldType.Keyword)
-    private String appointmentRemark;
-
-    @ApiModelProperty(value = "安装/维修总数量")
-    @Field(value = "total_num", type = FieldType.Keyword)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "未完成数量")
-    @Field(value = "undone_num", type = FieldType.Keyword)
-    private Integer undoneNum;
-
-    @ApiModelProperty(value = "经度")
-    @Field(value = "lng", type = FieldType.Keyword)
-    private String lng;
-
-    @ApiModelProperty(value = "纬度")
-    @Field(value = "lat", type = FieldType.Keyword)
-    private String lat;
-
-    @ApiModelProperty(value = "师傅报完工时间")
-    @Field(value = "over_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String overTime;
-
-    @ApiModelProperty(value = "网点报完工时间")
-    @Field(value = "websit_over_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String websitOverTime;
-
-    @ApiModelProperty(value = "完工时间(精确到天)")
-    @Field(value = "over_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String overDate;
-
-    @ApiModelProperty(value = "正常关闭时间")
-    @Field(value = "close_time",type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String closeTime;
-
-    @ApiModelProperty(value = "创建时间(精确到天)")
-    @Field(value = "create_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String createDate;
-
-    @ApiModelProperty(value = "创建时间")
-    @Field(value = "create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String createTime;
-
-    @ApiModelProperty(value = "创建人手机")
-    @Field(value = "create_mobile", type = FieldType.Keyword)
-    private String createMobile;
-
-    @ApiModelProperty(value = "创建人")
-    @Field(value = "create_by", type = FieldType.Keyword)
-    private String createBy;
-
-    @ApiModelProperty(value = "创建人名称")
-    @Field(value = "create_name", type = FieldType.Keyword)
-    private String createName;
-
-    @ApiModelProperty(value = "修改时间")
-    @Field(value = "update_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    @Field(value = "update_by", type = FieldType.Keyword)
-    private String updateBy;
-
-    @ApiModelProperty(value = "首次评价(A:好评,B:中评,C:差评,N:未评价,O:其他")
-    @Field(value = "appraise_status", type = FieldType.Keyword)
-    private String appraiseStatus;
-
-    @ApiModelProperty(value = "首次评价内容")
-    @Field(value = "appraise_content", type = FieldType.Keyword)
-    private String appraiseContent;
-
-    @ApiModelProperty(value = "首次评价时间")
-    @Field(value = "appraise_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appraiseTime;
-
-    @ApiModelProperty(value = "评价来源 1=用户评价 2=商家评价")
-    @Field(value = "appraise_source", type = FieldType.Keyword)
-    private Integer appraiseSource;
-
-    @ApiModelProperty(value = "多个图片逗号隔开")
-    @Field(value = "appraise_img_url", type = FieldType.Keyword)
-    private String appraiseImgUrl;
-
-    @ApiModelProperty(value = "师傅记事备注")
-    @Field(value = "worker_remark", type = FieldType.Keyword)
-    private String workerRemark;
-
-    @ApiModelProperty(value = "销售单位")
-    @Field(value = "sale_company", type = FieldType.Keyword)
-    private String saleCompany;
-
-    @ApiModelProperty(value = "最近一次操作预约/改约的时间")
-    @Field(value = "last_operator_appointment_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String lastOperatorAppointmentTime;
-
-    @ApiModelProperty(value = "工单渠道id")
-    @Field(value = "order_channel_id", type = FieldType.Keyword)
-    private String orderChannelId;
-
-    @ApiModelProperty(value = "工单渠道")
-    @Field(value = "order_channel_text", type = FieldType.Keyword)
-    private String orderChannelText;
-
-    @ApiModelProperty(value = "改约备注")
-    @Field(value = "change_remark", type = FieldType.Keyword)
-    private String changeRemark;
-
-    @ApiModelProperty(value = "销售单号")
-    @Field(value = "sale_order_id", type = FieldType.Keyword)
-    private String saleOrderId;
-
-    @ApiModelProperty(value = "销售单下单时间")
-    @Field(value = "sale_create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String saleCreateTime;
-
-    @ApiModelProperty(value = "销售单订单金额")
-    @Field(value = "sale_total_amount", type = FieldType.Keyword)
-    private BigDecimal saleTotalAmount;
-
-    @ApiModelProperty(value = "销售单备注")
-    @Field(value = "sale_remark", type = FieldType.Keyword)
-    private String saleRemark;
-
-    @ApiModelProperty(value = "内部来源")
-    @Field(value = "source", type = FieldType.Keyword)
-    private String source;
-
-    @ApiModelProperty(value = "完工反馈备注")
-    @Field(value = "over_remark", type = FieldType.Keyword)
-    private String overRemark;
-
-    @ApiModelProperty(value = "客户签名")
-    @Field(value = "user_sign", type = FieldType.Keyword)
-    private String userSign;
-
-    @ApiModelProperty(value = "是否为导入工单，true=是 false=否")
-    @Field(value = "is_import", type = FieldType.Keyword)
-    private Boolean isImport;
-
-    @ApiModelProperty(value = "是否已采集 YES 是 NO 否")
-    @Field(value = "is_gather", type = FieldType.Keyword)
-    private String isGather;
-
-    @ApiModelProperty(value = "是否异常工单 true/false")
-    @Field(value = "is_exception", type = FieldType.Keyword)
-    private Boolean isException;
-
-    @ApiModelProperty(value = "增置服务id")
-    @Field(value = "pg_incre_id", type = FieldType.Keyword)
-    private String pgIncreId;
-
-    @ApiModelProperty(value = "增置服务订单id")
-    @Field(value = "pg_incre_order_id", type = FieldType.Keyword)
-    private String pgIncreOrderId;
-
-    @ApiModelProperty(value = "增置服务明细id")
-    @Field(value = "pg_incre_item_id", type = FieldType.Keyword)
-    private String pgIncreItemId;
-
-    @ApiModelProperty(value = "增置服务售卖网点")
-    @Field(value = "pg_incre_websit_name", type = FieldType.Keyword)
-    private String pgIncreWebsitName;
-
-    @ApiModelProperty(value = "增置服务售卖网点id")
-    @Field(value = "pg_incre_websit_id", type = FieldType.Keyword)
-    private String pgIncreWebsitId;
-
-    @ApiModelProperty(value = "结算服务费用")
-    @Field(value = "settle_service_amount", type = FieldType.Keyword)
-    private BigDecimal settleServiceAmount;
-
-    @ApiModelProperty(value = "维保基础id")
-    @Field(value = "rp_project_repair_id", type = FieldType.Keyword)
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "工程维保名称")
-    @Field(value = "rp_project_repair_name", type = FieldType.Keyword)
-    private String rpProjectRepairName;
-
-    @ApiModelProperty(value = "费用支付方式 EXAMINE=审批后结算 SITE=现场支付")
-    @Field(value = "fee_pay_method", type = FieldType.Keyword)
-    private String feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用 YES=是 NO=否")
-    @Field(value = "is_all_fee", type = FieldType.Keyword)
-    private String isAllFee;
-
-    @ApiModelProperty(value = "销售类型 1=零售 2=工程 3=延保 4=工程维保")
-    @Field(value = "sale_type", type = FieldType.Keyword)
-    private Integer saleType;
-
-    @ApiModelProperty(value = "工程编号")
-    @Field(value = "project_no", type = FieldType.Keyword)
-    private String projectNo;
-
-    @ApiModelProperty(value = "工程名称")
-    @Field(value = "project_name", type = FieldType.Keyword)
-    private String projectName;
-
-    @ApiModelProperty(value = "是否开启抢单")
-    @Field(value = "is_qd", type = FieldType.Keyword)
-    private Boolean isQd;
-
-    @ApiModelProperty(value = "是否已产生通知 true=是 false=否")
-    @Field(value = "is_qd_notice", type = FieldType.Keyword)
-    private Boolean isQdNotice;
-
-    @ApiModelProperty(value = "是否为拆机")
-    @Field(value = "is_cj", type = FieldType.Keyword)
-    private Boolean isCj;
-
-    @ApiModelProperty(value = "是否为租赁单 true/false")
-    @Field(value = "is_zl", type = FieldType.Keyword)
-    private Boolean isZl;
-
-
-
-    @ApiModelProperty(value = "是否为工单导入 true/false")
-    @Field(value = "is_import_excel", type = FieldType.Keyword)
-    private Boolean isImportExcel;
-
-    @ApiModelProperty(value = "服务状态")
-    @Field(value = "service_status", type = FieldType.Keyword)
-    private String serviceStatus;
-
-    @ApiModelProperty(value = "投诉等级")
-    @Field(value = "complaint", type = FieldType.Keyword)
-    private String complaint;
-
-    @ApiModelProperty(value = "紧急程度")
-    @Field(value = "urgent", type = FieldType.Keyword)
-    private String urgent;
-
-    @ApiModelProperty(value = "评价结果")
-    @Field(value = "evaluate", type = FieldType.Keyword)
-    private String evaluate;
-
-    @ApiModelProperty(value = "销售平台")
-    @Field(value = "sales_platform", type = FieldType.Keyword)
-    private String salesPlatform;
-
-    @ApiModelProperty(value = "购买单位")
-    @Field(value = "buy_name", type = FieldType.Keyword)
-    private String buyName;
-
-    @ApiModelProperty(value = "销售类型")
-    @Field(value = "sales_type_name", type = FieldType.Keyword)
-    private String salesTypeName;
-
-    @ApiModelProperty(value = "要求状态")
-    @Field(value = "req_status", type = FieldType.Keyword)
-    private String reqStatus;
-
-    @ApiModelProperty(value = "要求类型")
-    @Field(value = "req_type", type = FieldType.Keyword)
-    private String reqType;
-
-    @ApiModelProperty(value = "要求内容")
-    @Field(value = "req_text", type = FieldType.Keyword)
-    private String reqText;
-
-    @ApiModelProperty(value = "服务单号")
-    @Field(value = "service_order_id", type = FieldType.Keyword)
-    private String serviceOrderId;
-
-    @ApiModelProperty(value = "销售单号")
-    @Field(value = "sales_order_id", type = FieldType.Keyword)
-    private String salesOrderId;
-
-    @ApiModelProperty(value = "管理组织")
-    @Field(value = "manager_name", type = FieldType.Keyword)
-    private String managerName;
-
-    @ApiModelProperty(value = "运营主体")
-    @Field(value = "operate_entity", type = FieldType.Keyword)
-    private String operateEntity;
-
-    @ApiModelProperty(value = "大类名称")
-    @Field(value = "main_name", type = FieldType.Keyword)
-    private String mainName;
-
-
-
-    @ApiModelProperty(value = "师傅编号")
-    @Field(value = "worker_number", type = FieldType.Keyword)
-    private String workerNumber;
-
-
-
-    @ApiModelProperty(value = "上午下午")
-    @Field(value = "time_name", type = FieldType.Keyword)
-    private String timeName;
-
-    @ApiModelProperty(value = "所属公司")
-    @Field(value = "belong_company", type = FieldType.Keyword)
-    private String belongCompany;
-
-    @ApiModelProperty(value = "销售网点编号")
-    @Field(value = "sales_websit_number", type = FieldType.Keyword)
-    private String salesWebsitNumber;
-
-    @ApiModelProperty(value = "销售网点名称")
-    @Field(value = "sales_websit", type = FieldType.Keyword)
-    private String salesWebsit;
-
-    @ApiModelProperty(value = "创建人编号")
-    @Field(value = "create_number", type = FieldType.Keyword)
-    private String createNumber;
-
-    @ApiModelProperty(value = "评价标签")
-    @Field(value = "appraise_label", type = FieldType.Keyword)
-    private String appraiseLabel;
-
-    @ApiModelProperty(value = "是否是工单3.0同步true/false")
-    @Field(value = "is_three_order", type = FieldType.Keyword)
-    private Boolean isThreeOrder;
-
-    @ApiModelProperty(value = "故障类型")
-    @Field(value = "trouble_value", type = FieldType.Keyword)
-    private String troubleValue;
-
-    @ApiModelProperty(value = "需求类别")
-    @Field(value = "type", type = FieldType.Keyword)
-    private String type;
-
-    @ApiModelProperty(value = "需求小类")
-    @Field(value = "small_type", type = FieldType.Keyword)
-    private String smallType;
-
-    @ApiModelProperty(value = "1 已接单 0未接单")
-    @Field(value = "is_meet", type = FieldType.Keyword)
-    private Boolean isMeet;
-
-    @ApiModelProperty(value = "申请状态 ING=申请中 END=到货反馈 CANCEL=取消申请")
-    @Field(value = "parts_apply_status", type = FieldType.Keyword)
-    private String partsApplyStatus;
-
-    @ApiModelProperty(value = "首次派工时间")
-    @Field(value = "first_dispatch_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String firstDispatchTime;
-
-    @ApiModelProperty(value = "首次预约时间")
-    @Field(value = "first_appointment_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String firstAppointmentTime;
+public class OrderBase2023Es extends OrderBaseEs {
 
-    @ApiModelProperty(value = "取消时间")
-    @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String cancelTime;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/OrderBase2024Es.java

@@ -1,551 +1,17 @@
 package com.gree.mall.manager.bean.es;
 
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.data.annotation.Id;
-import org.springframework.data.elasticsearch.annotations.DateFormat;
+import lombok.EqualsAndHashCode;
 import org.springframework.data.elasticsearch.annotations.Document;
-import org.springframework.data.elasticsearch.annotations.Field;
-import org.springframework.data.elasticsearch.annotations.FieldType;
-
-import java.math.BigDecimal;
 
 /**
  * @author qinrongjun
  * @description
  * @date 2023/6/19 10:39 星期一
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Document(indexName = "pg_order_base2024")
-public class OrderBase2024Es {
-
-    @Id
-    @Field(value = "id", type = FieldType.Keyword)
-    private String id;
-
-    @ApiModelProperty(value = "服务说明(例如：家用空调x1,洗衣机x1)")
-    @Field(value = "order_title", type = FieldType.Keyword)
-    private String orderTitle;
-
-    @ApiModelProperty(value = "所属业务线   INSTALL=安装 REPAIR=维修")
-    @Field(value = "order_type", type = FieldType.Keyword)
-    private String orderType;
-
-    @ApiModelProperty(value = "所属业务线名称")
-    @Field(value = "order_type_text", type = FieldType.Keyword)
-    private String orderTypeText;
-
-    @ApiModelProperty(value = "工单类型")
-    @Field(value = "order_small_type", type = FieldType.Keyword)
-    private String orderSmallType;
-
-    @ApiModelProperty(value = "工单类型名称")
-    @Field(value = "order_small_type_text", type = FieldType.Keyword)
-    private String orderSmallTypeText;
-
-    @ApiModelProperty(value = "商户id")
-    @Field(value = "company_wechat_id", type = FieldType.Keyword)
-    private String companyWechatId;
-
-    @ApiModelProperty(value = "商户名称")
-    @Field(value = "company_wechat_name", type = FieldType.Keyword)
-    private String companyWechatName;
-
-    @ApiModelProperty(value = "主要师傅id")
-    @Field(value = "worker_id", type = FieldType.Keyword)
-    private String workerId;
-
-    @ApiModelProperty(value = "师傅名称")
-    @Field(value = "worker_name", type = FieldType.Keyword)
-    private String workerName;
-
-    @ApiModelProperty(value = "师傅电话")
-    @Field(value = "worker_mobile", type = FieldType.Keyword)
-    private String workerMobile;
-
-    @ApiModelProperty(value = "师傅身份证")
-    @Field(value = "worker_idcard", type = FieldType.Keyword)
-    private String workerIdcard;
-
-    @ApiModelProperty(value = "所有师傅的id(冗余字段)，实际请看order_worker")
-    @Field(value = "worker_id_list", type = FieldType.Keyword)
-    private String workerIdList;
-
-    @ApiModelProperty(value = "工单状态 DYY=待预约 DSHPG=待商户派工 DWDPG=待网点派工 DQD=待抢单 DJD=待接单 FWZ=服务中 YCD=异常单 YWG=已完工待结算 YJS=已结算 YQX=已取消")
-    @Field(value = "order_status", type = FieldType.Keyword)
-    private String orderStatus;
-
-    @ApiModelProperty(value = "工单状态中文名称")
-    @Field(value = "order_status_text", type = FieldType.Keyword)
-    private String orderStatusText;
-
-    @ApiModelProperty(value = "派单给师傅的时间")
-    @Field(value = "dispatch_time", type = FieldType.Date,format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String dispatchTime;
-
-    @ApiModelProperty(value = "师傅接单时间")
-    @Field(value = "worker_rece_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String workerReceTime;
-
-    @ApiModelProperty(value = "派工网点时间")
-    @Field(value = "dispatch_websit_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String dispatchWebsitTime;
-
-    @ApiModelProperty(value = "客户id(客户建单才有)")
-    @Field(value = "user_id", type = FieldType.Keyword)
-    private String userId;
-
-    @ApiModelProperty(value = "客户名称")
-    @Field(value = "user_name", type = FieldType.Keyword)
-    private String userName;
-
-    @ApiModelProperty(value = "联系人")
-    @Field(value = "link_name", type = FieldType.Keyword)
-    private String linkName;
-
-    @ApiModelProperty(value = "客户电话")
-    @Field(value = "user_mobile", type = FieldType.Keyword)
-    private String userMobile;
-
-    @ApiModelProperty(value = "客户电话2")
-    @Field(value = "user_mobile2", type = FieldType.Keyword)
-    private String userMobile2;
-
-    @ApiModelProperty(value = "省")
-    @Field(value = "province", type = FieldType.Keyword)
-    private String province;
-
-    @ApiModelProperty(value = "省id")
-    @Field(value = "province_id", type = FieldType.Keyword)
-    private String provinceId;
-
-    @ApiModelProperty(value = "市")
-    @Field(value = "city", type = FieldType.Keyword)
-    private String city;
-
-    @ApiModelProperty(value = "市id")
-    @Field(value = "city_id", type = FieldType.Keyword)
-    private String cityId;
-
-    @ApiModelProperty(value = "区")
-    @Field(value = "area", type = FieldType.Keyword)
-    private String area;
-
-    @ApiModelProperty(value = "区id")
-    @Field(value = "area_id", type = FieldType.Keyword)
-    private String areaId;
-
-    @ApiModelProperty(value = "街道")
-    @Field(value = "street", type = FieldType.Keyword)
-    private String street;
-
-    @ApiModelProperty(value = "街道id")
-    @Field(value = "street_id", type = FieldType.Keyword)
-    private String streetId;
-
-    @ApiModelProperty(value = "详细地址")
-    @Field(value = "address", type = FieldType.Keyword)
-    private String address;
-
-    @ApiModelProperty(value = "备注")
-    @Field(value = "remark", type = FieldType.Keyword)
-    private String remark;
-
-    @ApiModelProperty(value = "安装或维修网点名称（售后网点）")
-    @Field(value = "websit_name", type = FieldType.Keyword)
-    private String websitName;
-
-    @ApiModelProperty(value = "安装或维修网点编号（售后网点）")
-    @Field(value = "websit_id", type = FieldType.Keyword)
-    private String websitId;
-
-    @ApiModelProperty(value = "售后网点联系电话")
-    @Field(value = "websit_phone", type = FieldType.Keyword)
-    private String websitPhone;
-
-    @ApiModelProperty(value = "创建网点编号")
-    @Field(value = "create_websit_id", type = FieldType.Keyword)
-    private String createWebsitId;
-
-    @ApiModelProperty(value = "创建网点名称")
-    @Field(value = "create_websit_name", type = FieldType.Keyword)
-    private String createWebsitName;
-
-    @ApiModelProperty(value = "gps地址信息")
-    @Field(value = "gps_address", type = FieldType.Keyword)
-    private String gpsAddress;
-
-    @ApiModelProperty(value = "最新反馈记录")
-    @Field(value = "last_operator", type = FieldType.Keyword)
-    private String lastOperator;
-
-    @ApiModelProperty(value = "最近操作网点")
-    @Field(value = "last_operator_websit", type = FieldType.Keyword)
-    private String lastOperatorWebsit;
-
-    @ApiModelProperty(value = "最近操作网点编号")
-    @Field(value = "last_operator_by", type = FieldType.Keyword)
-    private String lastOperatorBy;
-
-    @ApiModelProperty(value = "最近操作时间")
-    @Field(value = "last_operator_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String lastOperatorTime;
-
-    @ApiModelProperty(value = "预约安装/维修时间")
-    @Field(value = "appointment_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appointmentTime;
-
-    @ApiModelProperty(value = "预约结束时间")
-    @Field(value = "appointment_end_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appointmentEndTime;
-
-    @ApiModelProperty(value = "预约备注")
-    @Field(value = "appointment_remark", type = FieldType.Keyword)
-    private String appointmentRemark;
-
-    @ApiModelProperty(value = "安装/维修总数量")
-    @Field(value = "total_num", type = FieldType.Keyword)
-    private Integer totalNum;
-
-    @ApiModelProperty(value = "未完成数量")
-    @Field(value = "undone_num", type = FieldType.Keyword)
-    private Integer undoneNum;
-
-    @ApiModelProperty(value = "经度")
-    @Field(value = "lng", type = FieldType.Keyword)
-    private String lng;
-
-    @ApiModelProperty(value = "纬度")
-    @Field(value = "lat", type = FieldType.Keyword)
-    private String lat;
-
-    @ApiModelProperty(value = "师傅报完工时间")
-    @Field(value = "over_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String overTime;
-
-    @ApiModelProperty(value = "网点报完工时间")
-    @Field(value = "websit_over_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String websitOverTime;
-
-    @ApiModelProperty(value = "完工时间(精确到天)")
-    @Field(value = "over_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String overDate;
-
-    @ApiModelProperty(value = "正常关闭时间")
-    @Field(value = "close_time",type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String closeTime;
-
-    @ApiModelProperty(value = "创建时间(精确到天)")
-    @Field(value = "create_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String createDate;
-
-    @ApiModelProperty(value = "创建时间")
-    @Field(value = "create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String createTime;
-
-    @ApiModelProperty(value = "创建人手机")
-    @Field(value = "create_mobile", type = FieldType.Keyword)
-    private String createMobile;
-
-    @ApiModelProperty(value = "创建人")
-    @Field(value = "create_by", type = FieldType.Keyword)
-    private String createBy;
-
-    @ApiModelProperty(value = "创建人名称")
-    @Field(value = "create_name", type = FieldType.Keyword)
-    private String createName;
-
-    @ApiModelProperty(value = "修改时间")
-    @Field(value = "update_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String updateTime;
-
-    @ApiModelProperty(value = "修改人")
-    @Field(value = "update_by", type = FieldType.Keyword)
-    private String updateBy;
-
-    @ApiModelProperty(value = "首次评价(A:好评,B:中评,C:差评,N:未评价,O:其他")
-    @Field(value = "appraise_status", type = FieldType.Keyword)
-    private String appraiseStatus;
-
-    @ApiModelProperty(value = "首次评价内容")
-    @Field(value = "appraise_content", type = FieldType.Keyword)
-    private String appraiseContent;
-
-    @ApiModelProperty(value = "首次评价时间")
-    @Field(value = "appraise_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
-    private String appraiseTime;
-
-    @ApiModelProperty(value = "评价来源 1=用户评价 2=商家评价")
-    @Field(value = "appraise_source", type = FieldType.Keyword)
-    private Integer appraiseSource;
-
-    @ApiModelProperty(value = "多个图片逗号隔开")
-    @Field(value = "appraise_img_url", type = FieldType.Keyword)
-    private String appraiseImgUrl;
-
-    @ApiModelProperty(value = "师傅记事备注")
-    @Field(value = "worker_remark", type = FieldType.Keyword)
-    private String workerRemark;
-
-    @ApiModelProperty(value = "销售单位")
-    @Field(value = "sale_company", type = FieldType.Keyword)
-    private String saleCompany;
-
-    @ApiModelProperty(value = "最近一次操作预约/改约的时间")
-    @Field(value = "last_operator_appointment_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String lastOperatorAppointmentTime;
-
-    @ApiModelProperty(value = "工单渠道id")
-    @Field(value = "order_channel_id", type = FieldType.Keyword)
-    private String orderChannelId;
-
-    @ApiModelProperty(value = "工单渠道")
-    @Field(value = "order_channel_text", type = FieldType.Keyword)
-    private String orderChannelText;
-
-    @ApiModelProperty(value = "改约备注")
-    @Field(value = "change_remark", type = FieldType.Keyword)
-    private String changeRemark;
-
-    @ApiModelProperty(value = "销售单号")
-    @Field(value = "sale_order_id", type = FieldType.Keyword)
-    private String saleOrderId;
-
-    @ApiModelProperty(value = "销售单下单时间")
-    @Field(value = "sale_create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String saleCreateTime;
-
-    @ApiModelProperty(value = "销售单订单金额")
-    @Field(value = "sale_total_amount", type = FieldType.Keyword)
-    private BigDecimal saleTotalAmount;
-
-    @ApiModelProperty(value = "销售单备注")
-    @Field(value = "sale_remark", type = FieldType.Keyword)
-    private String saleRemark;
-
-    @ApiModelProperty(value = "内部来源")
-    @Field(value = "source", type = FieldType.Keyword)
-    private String source;
-
-    @ApiModelProperty(value = "完工反馈备注")
-    @Field(value = "over_remark", type = FieldType.Keyword)
-    private String overRemark;
-
-    @ApiModelProperty(value = "客户签名")
-    @Field(value = "user_sign", type = FieldType.Keyword)
-    private String userSign;
-
-    @ApiModelProperty(value = "是否为导入工单，true=是 false=否")
-    @Field(value = "is_import", type = FieldType.Keyword)
-    private Boolean isImport;
-
-    @ApiModelProperty(value = "是否已采集 YES 是 NO 否")
-    @Field(value = "is_gather", type = FieldType.Keyword)
-    private String isGather;
-
-    @ApiModelProperty(value = "是否异常工单 true/false")
-    @Field(value = "is_exception", type = FieldType.Keyword)
-    private Boolean isException;
-
-    @ApiModelProperty(value = "增置服务id")
-    @Field(value = "pg_incre_id", type = FieldType.Keyword)
-    private String pgIncreId;
-
-    @ApiModelProperty(value = "增置服务订单id")
-    @Field(value = "pg_incre_order_id", type = FieldType.Keyword)
-    private String pgIncreOrderId;
-
-    @ApiModelProperty(value = "增置服务明细id")
-    @Field(value = "pg_incre_item_id", type = FieldType.Keyword)
-    private String pgIncreItemId;
-
-    @ApiModelProperty(value = "增置服务售卖网点")
-    @Field(value = "pg_incre_websit_name", type = FieldType.Keyword)
-    private String pgIncreWebsitName;
-
-    @ApiModelProperty(value = "增置服务售卖网点id")
-    @Field(value = "pg_incre_websit_id", type = FieldType.Keyword)
-    private String pgIncreWebsitId;
-
-    @ApiModelProperty(value = "结算服务费用")
-    @Field(value = "settle_service_amount", type = FieldType.Keyword)
-    private BigDecimal settleServiceAmount;
-
-    @ApiModelProperty(value = "维保基础id")
-    @Field(value = "rp_project_repair_id", type = FieldType.Keyword)
-    private String rpProjectRepairId;
-
-    @ApiModelProperty(value = "工程维保名称")
-    @Field(value = "rp_project_repair_name", type = FieldType.Keyword)
-    private String rpProjectRepairName;
-
-    @ApiModelProperty(value = "费用支付方式 EXAMINE=审批后结算 SITE=现场支付")
-    @Field(value = "fee_pay_method", type = FieldType.Keyword)
-    private String feePayMethod;
-
-    @ApiModelProperty(value = "是否包含全部费用 YES=是 NO=否")
-    @Field(value = "is_all_fee", type = FieldType.Keyword)
-    private String isAllFee;
-
-    @ApiModelProperty(value = "销售类型 1=零售 2=工程 3=延保 4=工程维保")
-    @Field(value = "sale_type", type = FieldType.Keyword)
-    private Integer saleType;
-
-    @ApiModelProperty(value = "工程编号")
-    @Field(value = "project_no", type = FieldType.Keyword)
-    private String projectNo;
-
-    @ApiModelProperty(value = "工程名称")
-    @Field(value = "project_name", type = FieldType.Keyword)
-    private String projectName;
-
-    @ApiModelProperty(value = "是否开启抢单")
-    @Field(value = "is_qd", type = FieldType.Keyword)
-    private Boolean isQd;
-
-    @ApiModelProperty(value = "是否已产生通知 true=是 false=否")
-    @Field(value = "is_qd_notice", type = FieldType.Keyword)
-    private Boolean isQdNotice;
-
-    @ApiModelProperty(value = "是否为拆机")
-    @Field(value = "is_cj", type = FieldType.Keyword)
-    private Boolean isCj;
-
-    @ApiModelProperty(value = "是否为租赁单 true/false")
-    @Field(value = "is_zl", type = FieldType.Keyword)
-    private Boolean isZl;
-
-
-
-    @ApiModelProperty(value = "是否为工单导入 true/false")
-    @Field(value = "is_import_excel", type = FieldType.Keyword)
-    private Boolean isImportExcel;
-
-    @ApiModelProperty(value = "服务状态")
-    @Field(value = "service_status", type = FieldType.Keyword)
-    private String serviceStatus;
-
-    @ApiModelProperty(value = "投诉等级")
-    @Field(value = "complaint", type = FieldType.Keyword)
-    private String complaint;
-
-    @ApiModelProperty(value = "紧急程度")
-    @Field(value = "urgent", type = FieldType.Keyword)
-    private String urgent;
-
-    @ApiModelProperty(value = "评价结果")
-    @Field(value = "evaluate", type = FieldType.Keyword)
-    private String evaluate;
-
-    @ApiModelProperty(value = "销售平台")
-    @Field(value = "sales_platform", type = FieldType.Keyword)
-    private String salesPlatform;
-
-    @ApiModelProperty(value = "购买单位")
-    @Field(value = "buy_name", type = FieldType.Keyword)
-    private String buyName;
-
-    @ApiModelProperty(value = "销售类型")
-    @Field(value = "sales_type_name", type = FieldType.Keyword)
-    private String salesTypeName;
-
-    @ApiModelProperty(value = "要求状态")
-    @Field(value = "req_status", type = FieldType.Keyword)
-    private String reqStatus;
-
-    @ApiModelProperty(value = "要求类型")
-    @Field(value = "req_type", type = FieldType.Keyword)
-    private String reqType;
-
-    @ApiModelProperty(value = "要求内容")
-    @Field(value = "req_text", type = FieldType.Keyword)
-    private String reqText;
-
-    @ApiModelProperty(value = "服务单号")
-    @Field(value = "service_order_id", type = FieldType.Keyword)
-    private String serviceOrderId;
-
-    @ApiModelProperty(value = "销售单号")
-    @Field(value = "sales_order_id", type = FieldType.Keyword)
-    private String salesOrderId;
-
-    @ApiModelProperty(value = "管理组织")
-    @Field(value = "manager_name", type = FieldType.Keyword)
-    private String managerName;
-
-    @ApiModelProperty(value = "运营主体")
-    @Field(value = "operate_entity", type = FieldType.Keyword)
-    private String operateEntity;
-
-    @ApiModelProperty(value = "大类名称")
-    @Field(value = "main_name", type = FieldType.Keyword)
-    private String mainName;
-
-
-
-    @ApiModelProperty(value = "师傅编号")
-    @Field(value = "worker_number", type = FieldType.Keyword)
-    private String workerNumber;
-
-
-
-    @ApiModelProperty(value = "上午下午")
-    @Field(value = "time_name", type = FieldType.Keyword)
-    private String timeName;
-
-    @ApiModelProperty(value = "所属公司")
-    @Field(value = "belong_company", type = FieldType.Keyword)
-    private String belongCompany;
-
-    @ApiModelProperty(value = "销售网点编号")
-    @Field(value = "sales_websit_number", type = FieldType.Keyword)
-    private String salesWebsitNumber;
-
-    @ApiModelProperty(value = "销售网点名称")
-    @Field(value = "sales_websit", type = FieldType.Keyword)
-    private String salesWebsit;
-
-    @ApiModelProperty(value = "创建人编号")
-    @Field(value = "create_number", type = FieldType.Keyword)
-    private String createNumber;
-
-    @ApiModelProperty(value = "评价标签")
-    @Field(value = "appraise_label", type = FieldType.Keyword)
-    private String appraiseLabel;
-
-    @ApiModelProperty(value = "是否是工单3.0同步true/false")
-    @Field(value = "is_three_order", type = FieldType.Keyword)
-    private Boolean isThreeOrder;
-
-    @ApiModelProperty(value = "故障类型")
-    @Field(value = "trouble_value", type = FieldType.Keyword)
-    private String troubleValue;
-
-    @ApiModelProperty(value = "需求类别")
-    @Field(value = "type", type = FieldType.Keyword)
-    private String type;
-
-    @ApiModelProperty(value = "需求小类")
-    @Field(value = "small_type", type = FieldType.Keyword)
-    private String smallType;
-
-    @ApiModelProperty(value = "1 已接单 0未接单")
-    @Field(value = "is_meet", type = FieldType.Keyword)
-    private Boolean isMeet;
-
-    @ApiModelProperty(value = "申请状态 ING=申请中 END=到货反馈 CANCEL=取消申请")
-    @Field(value = "parts_apply_status", type = FieldType.Keyword)
-    private String partsApplyStatus;
-
-    @ApiModelProperty(value = "首次派工时间")
-    @Field(value = "first_dispatch_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String firstDispatchTime;
-
-    @ApiModelProperty(value = "首次预约时间")
-    @Field(value = "first_appointment_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String firstAppointmentTime;
+public class OrderBase2024Es extends OrderBaseEs {
 
-    @ApiModelProperty(value = "取消时间")
-    @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
-    private String cancelTime;
 }

mall-server-api/src/main/java/com/gree/mall/manager/bean/es/OrderBaseEs.java

@@ -1,13 +1,5 @@
 package com.gree.mall.manager.bean.es;
 
-import com.alibaba.excel.annotation.format.DateTimeFormat;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.gree.mall.manager.plus.entity.PgOrderBase;
-
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.data.annotation.Id;
@@ -16,11 +8,7 @@ import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
 
-
-
 import java.math.BigDecimal;
-import java.time.Instant;
-import java.util.Date;
 
 /**
  * @author qinrongjun
@@ -29,7 +17,7 @@ import java.util.Date;
  */
 @Data
 @Document(indexName = "pg_order_base")
-public class OrderBaseEs   {
+public class OrderBaseEs {
 
     @Id
     @Field(value = "id", type = FieldType.Keyword)
@@ -92,15 +80,15 @@ public class OrderBaseEs   {
     private String orderStatusText;
 
     @ApiModelProperty(value = "派单给师傅的时间")
-    @Field(value = "dispatch_time", type = FieldType.Date,format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "dispatch_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String dispatchTime;
 
     @ApiModelProperty(value = "师傅接单时间")
-    @Field(value = "worker_rece_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "worker_rece_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String workerReceTime;
 
     @ApiModelProperty(value = "派工网点时间")
-    @Field(value = "dispatch_websit_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "dispatch_websit_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String dispatchWebsitTime;
 
     @ApiModelProperty(value = "客户id(客户建单才有)")
@@ -200,15 +188,15 @@ public class OrderBaseEs   {
     private String lastOperatorBy;
 
     @ApiModelProperty(value = "最近操作时间")
-    @Field(value = "last_operator_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "last_operator_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String lastOperatorTime;
 
     @ApiModelProperty(value = "预约安装/维修时间")
-    @Field(value = "appointment_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "appointment_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String appointmentTime;
 
     @ApiModelProperty(value = "预约结束时间")
-    @Field(value = "appointment_end_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "appointment_end_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String appointmentEndTime;
 
     @ApiModelProperty(value = "预约备注")
@@ -232,27 +220,27 @@ public class OrderBaseEs   {
     private String lat;
 
     @ApiModelProperty(value = "师傅报完工时间")
-    @Field(value = "over_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "over_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String overTime;
 
     @ApiModelProperty(value = "网点报完工时间")
-    @Field(value = "websit_over_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "websit_over_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String websitOverTime;
 
     @ApiModelProperty(value = "完工时间(精确到天)")
-    @Field(value = "over_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "over_date", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String overDate;
 
     @ApiModelProperty(value = "正常关闭时间")
-    @Field(value = "close_time",type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "close_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String closeTime;
 
     @ApiModelProperty(value = "创建时间(精确到天)")
-    @Field(value = "create_date", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "create_date", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String createDate;
 
     @ApiModelProperty(value = "创建时间")
-    @Field(value = "create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "create_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String createTime;
 
     @ApiModelProperty(value = "创建人手机")
@@ -268,7 +256,7 @@ public class OrderBaseEs   {
     private String createName;
 
     @ApiModelProperty(value = "修改时间")
-    @Field(value = "update_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "update_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String updateTime;
 
     @ApiModelProperty(value = "修改人")
@@ -284,7 +272,7 @@ public class OrderBaseEs   {
     private String appraiseContent;
 
     @ApiModelProperty(value = "首次评价时间")
-    @Field(value = "appraise_time", type = FieldType.Date, format = DateFormat.custom,pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "appraise_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String appraiseTime;
 
     @ApiModelProperty(value = "评价来源 1=用户评价 2=商家评价")
@@ -304,7 +292,7 @@ public class OrderBaseEs   {
     private String saleCompany;
 
     @ApiModelProperty(value = "最近一次操作预约/改约的时间")
-    @Field(value = "last_operator_appointment_time",type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "last_operator_appointment_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String lastOperatorAppointmentTime;
 
     @ApiModelProperty(value = "工单渠道id")
@@ -324,7 +312,7 @@ public class OrderBaseEs   {
     private String saleOrderId;
 
     @ApiModelProperty(value = "销售单下单时间")
-    @Field(value = "sale_create_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "sale_create_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String saleCreateTime;
 
     @ApiModelProperty(value = "销售单订单金额")
@@ -428,7 +416,6 @@ public class OrderBaseEs   {
     private Boolean isZl;
 
 
-
     @ApiModelProperty(value = "是否为工单导入 true/false")
     @Field(value = "is_import_excel", type = FieldType.Keyword)
     private Boolean isImportExcel;
@@ -494,13 +481,11 @@ public class OrderBaseEs   {
     private String mainName;
 
 
-
     @ApiModelProperty(value = "师傅编号")
     @Field(value = "worker_number", type = FieldType.Keyword)
     private String workerNumber;
 
 
-
     @ApiModelProperty(value = "上午下午")
     @Field(value = "time_name", type = FieldType.Keyword)
     private String timeName;
@@ -550,14 +535,14 @@ public class OrderBaseEs   {
     private String partsApplyStatus;
 
     @ApiModelProperty(value = "首次派工时间")
-    @Field(value = "first_dispatch_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "first_dispatch_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String firstDispatchTime;
 
     @ApiModelProperty(value = "首次预约时间")
-    @Field(value = "first_appointment_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "first_appointment_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String firstAppointmentTime;
 
     @ApiModelProperty(value = "取消时间")
-    @Field(value = "cancel_time", type = FieldType.Date,format = DateFormat.custom, pattern ="yyyy-MM-dd HH:mm:ss")
+    @Field(value = "cancel_time", type = FieldType.Date, format = DateFormat.custom, pattern = "yyyy-MM-dd HH:mm:ss")
     private String cancelTime;
 }

mall-server-api/src/main/java/com/gree/mall/manager/logic/workorder/OrderBaseEsLogic.java

@@ -80,6 +80,7 @@ public class OrderBaseEsLogic {
 
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
+        // year当前年份会是空字符串
         String year = CommonUtils.getYear(request);
 
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
@@ -127,64 +128,18 @@ public class OrderBaseEsLogic {
         List<OrderBaseEs> orderBaseEs = new ArrayList<>();
         IPage<OrderBaseVO> page = new Page<>();
 
+        // 统一查询处理逻辑
+        SearchHits<? extends OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, CommonUtils.getYearEsClass(year));
+        SearchPage<? extends OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
 
+        orderBaseEs = searchHits.getContent().stream()
+                .map(hit -> BeanUtil.toBean(hit.getContent(), OrderBaseEs.class))
+                .collect(Collectors.toList());
 
-        if (year.equals("2023")) {
-            SearchHits<OrderBase2023Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2023Es.class);
-            SearchPage<OrderBase2023Es> searchHits2023 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
-
-            for (SearchHit<OrderBase2023Es> searchHit : searchHits2023.getContent()) {
-                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(),OrderBaseEs.class));
-            }
-
-
-            page.setTotal(searchHits2023.getSearchHits().getTotalHits());
-            page.setCurrent(zfireParamBean.getPageNum());
-            page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }else
-
-        if (year.equals("2024")) {
-            SearchHits<OrderBase2024Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2024Es.class);
-            SearchPage<OrderBase2024Es> searchHits2024 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
-
-            for (SearchHit<OrderBase2024Es> searchHit : searchHits2024.getContent()) {
-                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(),OrderBaseEs.class));
-            }
-
-
-            page.setTotal(searchHits2024.getSearchHits().getTotalHits());
-            page.setCurrent(zfireParamBean.getPageNum());
-            page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }else
-
-
-        if (year.equals("2022") || (StringUtils.isNotBlank(year) && Convert.toInt(year) < 2022)) {
-            SearchHits<OrderBase2022Es> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBase2022Es.class);
-            SearchPage<OrderBase2022Es> searchHits2022 = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
-
-            for (SearchHit<OrderBase2022Es> searchHit : searchHits2022.getContent()) {
-                orderBaseEs.add(BeanUtil.toBean(searchHit.getContent(),OrderBaseEs.class));
-            }
-
-
-            page.setTotal(searchHits2022.getSearchHits().getTotalHits());
-            page.setCurrent(zfireParamBean.getPageNum());
-            page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }else {
-            SearchHits<OrderBaseEs> orderBaseEsSearchHits = elasticsearchRestTemplate.search(build, OrderBaseEs.class);
-            SearchPage<OrderBaseEs> searchHits = SearchHitSupport.searchPageFor(orderBaseEsSearchHits, build.getPageable());
-
-            for (SearchHit<OrderBaseEs> searchHit : searchHits.getContent()) {
-                orderBaseEs.add(searchHit.getContent());
-            }
-            page.setTotal(searchHits.getSearchHits().getTotalHits());
-            page.setCurrent(zfireParamBean.getPageNum());
-            page.setSize(zfireParamBean.getPageSize());
-            page.setRecords(BeanUtil.copyToList(orderBaseEs,OrderBaseVO.class));
-        }
+        page.setTotal(searchHits.getSearchHits().getTotalHits());
+        page.setCurrent(zfireParamBean.getPageNum());
+        page.setSize(zfireParamBean.getPageSize());
+        page.setRecords(BeanUtil.copyToList(orderBaseEs, OrderBaseVO.class));
 
         List<OperatorLogBean> operatorList = null;
         if (page.getSize() > 0) {

mall-server-api/src/main/java/com/gree/mall/manager/utils/CommonUtils.java

@@ -4,6 +4,10 @@ package com.gree.mall.manager.utils;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.gree.mall.manager.bean.admin.AdminWebsitBean;
+import com.gree.mall.manager.bean.es.OrderBase2022Es;
+import com.gree.mall.manager.bean.es.OrderBase2023Es;
+import com.gree.mall.manager.bean.es.OrderBase2024Es;
+import com.gree.mall.manager.bean.es.OrderBaseEs;
 import com.gree.mall.manager.commonmapper.WebsitMapper;
 import com.gree.mall.manager.constant.DailyConstant;
 import com.gree.mall.manager.plus.entity.AdminUser;
@@ -126,15 +130,12 @@ public class CommonUtils {
      */
     public static String getYear(HttpServletRequest request){
         String orderYear = request.getHeader("orderYear");
-        if(StringUtils.isBlank(orderYear)){
-            return "2025";
-        }
-       /* if(StrUtil.isBlankOrUndefined(orderYear)){
+        if(StrUtil.isBlankOrUndefined(orderYear)){
             return "";
         }
         if (String.valueOf(DateUtil.year(DateUtil.date())).equals(orderYear)) {
             orderYear = "";
-        }*/
+        }
         return orderYear;
     }
 
@@ -489,4 +490,17 @@ public class CommonUtils {
     public static String getCurDateFileName(String name, String fileSuffix) {
         return name + DateUtils.formatDate1(new Date()) + "." + fileSuffix;
     }
+
+    public static Class<? extends OrderBaseEs> getYearEsClass(String year) {
+        // 动态年份-ES类映射（可扩展）
+        Map<String, Class<? extends OrderBaseEs>> yearEsClassMap = new HashMap<>();
+        yearEsClassMap.put("2022", OrderBase2022Es.class);
+        yearEsClassMap.put("2023", OrderBase2023Es.class);
+        yearEsClassMap.put("2024", OrderBase2024Es.class);
+        // 未来新增年份时只需在这里添加映射：yearEsClassMap.put("2025", OrderBase2025Es.class);
+
+        // 获取对应年份的ES类（默认使用基础类）
+        Class<? extends OrderBaseEs> targetEsClass = yearEsClassMap.getOrDefault(year, OrderBaseEs.class);
+        return targetEsClass;
+    }
 }