Merge remote-tracking branch 'origin/develop' into develop

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

@@ -1,12 +1,17 @@
 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;
+import org.springframework.data.elasticsearch.annotations.DateFormat;
 import org.springframework.data.elasticsearch.annotations.Document;
 import org.springframework.data.elasticsearch.annotations.Field;
 import org.springframework.data.elasticsearch.annotations.FieldType;
@@ -14,6 +19,7 @@ import org.springframework.data.elasticsearch.annotations.FieldType;
 
 
 import java.math.BigDecimal;
+import java.time.Instant;
 import java.util.Date;
 
 /**
@@ -86,15 +92,18 @@ public class OrderBaseEs   {
     private String orderStatusText;
 
     @ApiModelProperty(value = "派单给师傅的时间")
-    @Field(value = "dispatch_time", type = FieldType.Keyword)
+    @Field(value = "dispatch_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date dispatchTime;
 
     @ApiModelProperty(value = "师傅接单时间")
-    @Field(value = "worker_rece_time", type = FieldType.Keyword)
+    @Field(value = "worker_rece_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date workerReceTime;
 
     @ApiModelProperty(value = "派工网点时间")
-    @Field(value = "dispatch_websit_time", type = FieldType.Keyword)
+    @Field(value = "dispatch_websit_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date dispatchWebsitTime;
 
     @ApiModelProperty(value = "客户id(客户建单才有)")
@@ -194,15 +203,18 @@ public class OrderBaseEs   {
     private String lastOperatorBy;
 
     @ApiModelProperty(value = "最近操作时间")
-    @Field(value = "last_operator_time", type = FieldType.Keyword)
+    @Field(value = "last_operator_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date lastOperatorTime;
 
     @ApiModelProperty(value = "预约安装/维修时间")
-    @Field(value = "appointment_time", type = FieldType.Keyword)
+    @Field(value = "appointment_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date appointmentTime;
 
     @ApiModelProperty(value = "预约结束时间")
-    @Field(value = "appointment_end_time", type = FieldType.Keyword)
+    @Field(value = "appointment_end_time",type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date appointmentEndTime;
 
     @ApiModelProperty(value = "预约备注")
@@ -226,27 +238,33 @@ public class OrderBaseEs   {
     private String lat;
 
     @ApiModelProperty(value = "师傅报完工时间")
-    @Field(value = "over_time", type = FieldType.Keyword)
+    @Field(value = "over_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date overTime;
 
     @ApiModelProperty(value = "网点报完工时间")
-    @Field(value = "websit_over_time", type = FieldType.Keyword)
+    @Field(value = "websit_over_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date websitOverTime;
 
     @ApiModelProperty(value = "完工时间(精确到天)")
-    @Field(value = "over_date", type = FieldType.Keyword)
+    @Field(value = "over_date", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date overDate;
 
     @ApiModelProperty(value = "正常关闭时间")
-    @Field(value = "close_time", type = FieldType.Keyword)
+    @Field(value = "close_time",type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date closeTime;
 
     @ApiModelProperty(value = "创建时间(精确到天)")
-    @Field(value = "create_date", type = FieldType.Keyword)
+    @Field(value = "create_date", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date createDate;
 
     @ApiModelProperty(value = "创建时间")
-    @Field(value = "create_time", type = FieldType.Keyword)
+    @Field(value = "create_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date createTime;
 
     @ApiModelProperty(value = "创建人手机")
@@ -262,7 +280,8 @@ public class OrderBaseEs   {
     private String createName;
 
     @ApiModelProperty(value = "修改时间")
-    @Field(value = "update_time", type = FieldType.Keyword)
+    @Field(value = "update_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date updateTime;
 
     @ApiModelProperty(value = "修改人")
@@ -278,7 +297,8 @@ public class OrderBaseEs   {
     private String appraiseContent;
 
     @ApiModelProperty(value = "首次评价时间")
-    @Field(value = "appraise_time", type = FieldType.Keyword)
+    @Field(value = "appraise_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date appraiseTime;
 
     @ApiModelProperty(value = "评价来源 1=用户评价 2=商家评价")
@@ -298,7 +318,8 @@ public class OrderBaseEs   {
     private String saleCompany;
 
     @ApiModelProperty(value = "最近一次操作预约/改约的时间")
-    @Field(value = "last_operator_appointment_time", type = FieldType.Keyword)
+    @Field(value = "last_operator_appointment_time",type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date lastOperatorAppointmentTime;
 
     @ApiModelProperty(value = "工单渠道id")
@@ -318,7 +339,8 @@ public class OrderBaseEs   {
     private String saleOrderId;
 
     @ApiModelProperty(value = "销售单下单时间")
-    @Field(value = "sale_create_time", type = FieldType.Keyword)
+    @Field(value = "sale_create_time", type = FieldType.Date, pattern ="yyyy-MM-dd HH:mm:ss")
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern ="yyyy-MM-dd HH:mm:ss", timezone ="GMT+8")
     private Date saleCreateTime;
 
     @ApiModelProperty(value = "销售单订单金额")
@@ -488,4 +510,60 @@ 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;
+
+    @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;
+
+
 }