Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop

project-order/src/main/java/com/dituhui/pea/order/dao/OrderInfoDao.java

+package com.dituhui.pea.order.dao;
+
+import com.dituhui.pea.order.entity.OrderInfoEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface OrderInfoDao extends JpaRepository<OrderInfoEntity, Long> {
+}

project-order/src/main/java/com/dituhui/pea/order/entity/OrderInfoEntity.java

+package com.dituhui.pea.order.entity;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "order_info")
+public class OrderInfoEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "id", nullable = false, columnDefinition = "bigint(20) unsigned")
+    private Long id;
+
+    @Column(name = "order_id", nullable = false, length = 50)
+    private String orderId;
+
+    @Column(name = "dt", nullable = false)
+    private LocalDate dt;
+
+    @Column(name = "sub_id", nullable = false, length = 50)
+    private String subId;
+
+    @Column(name = "name", nullable = false, length = 50)
+    private String name;
+
+    @Column(name = "phone", nullable = false, length = 20)
+    private String phone;
+
+    @Column(name = "province", nullable = false, length = 20)
+    private String province;
+
+    @Column(name = "city", nullable = false, length = 20)
+    private String city;
+
+    @Column(name = "county", nullable = false, length = 20)
+    private String county;
+
+    @Column(name = "address", nullable = false, length = 100)
+    private String address;
+
+    @Column(name = "x", nullable = false, length = 20)
+    private String x;
+
+    @Column(name = "y", nullable = false, length = 20)
+    private String y;
+
+    @Column(name = "brand", nullable = false, length = 20)
+    private String brand;
+
+    @Column(name = "type", nullable = false, length = 20)
+    private String type;
+
+    @Column(name = "skill", nullable = false, length = 100)
+    private String skill;
+
+    @Column(name = "take_time", nullable = false)
+    private int takeTime;
+
+    @Column(name = "is_workshop", nullable = false)
+    private boolean isWorkshop;
+
+    @Column(name = "fault_describe", length = 100)
+    private String faultDescribe;
+
+    @Column(name = "apply_note", length = 2000)
+    private String applyNote;
+
+    @Column(name = "expect_time_begin")
+    private LocalDateTime expectTimeBegin;
+
+    @Column(name = "expect_time_end")
+    private LocalDateTime expectTimeEnd;
+
+    @Column(name = "expect_time_desc", length = 50, columnDefinition = "varchar(50) default ''")
+    private String expectTimeDesc;
+
+    @Column(name = "source", nullable = false, length = 10, columnDefinition = "varchar(10) default ''")
+    private String source;
+
+    @Column(name = "bean_priority", length = 10)
+    private String beanPriority;
+
+    @Column(name = "bean_tags", length = 200)
+    private String beanTags;
+
+    @Column(name = "bean_status", nullable = false, length = 20, columnDefinition = "varchar(20) default 'OPEN'")
+    private String beanStatus;
+
+    @Column(name = "bean_sub_status", nullable = false, length = 20, columnDefinition = "varchar(20) default ''")
+    private String beanSubStatus;
+
+    @Column(name = "area_id", length = 32)
+    private String areaId;
+
+    @Column(name = "org_cluster_id", length = 32, columnDefinition = "varchar(32) default ''")
+    private String orgClusterId;
+
+    @Column(name = "org_branch_id", length = 32, columnDefinition = "varchar(32) default ''")
+    private String orgBranchId;
+
+    @Column(name = "org_group_id", length = 32, columnDefinition = "varchar(32) default ''")
+    private String orgGroupId;
+
+    @Column(name = "org_team_id", length = 32)
+    private String orgTeamId;
+
+    @Column(name = "priority", columnDefinition = "smallint(6) default '0'")
+    private int priority;
+
+    @Column(name = "tags", length = 50)
+    private String tags;
+
+    @Column(name = "appointment_method", length = 20, columnDefinition = "varchar(20) default 'AUTO_BATCH'")
+    private String appointmentMethod;
+
+    @Column(name = "appointment_status", nullable = false, length = 20, columnDefinition = "varchar(20) default 'INIT'")
+    private String appointmentStatus;
+
+    @Column(name = "order_status", length = 20, columnDefinition = "varchar(20) default 'NORMAL'")
+    private String orderStatus;
+
+    @Column(name = "service_status", nullable = false, length = 20, columnDefinition = "varchar(20) default 'INIT'")
+    private String serviceStatus;
+
+    @Column(name = "engineer_code", nullable = false, length = 32, columnDefinition = "varchar(32) default ''")
+    private String engineerCode;
+
+    @Column(name = "engineer_name", nullable = false, length = 20, columnDefinition = "varchar(20) default ''")
+    private String engineerName;
+
+    @Column(name = "engineer_phone", nullable = false, length = 20, columnDefinition = "varchar(20) default ''")
+    private String engineerPhone;
+
+    @Column(name = "engineer_code_sub", nullable = false, length = 32, columnDefinition = "varchar(32) default ''")
+    private String engineerCodeSub;
+
+    @Column(name = "plan_start_time")
+    private LocalDateTime planStartTime;
+
+    @Column(name = "plan_end_time")
+    private LocalDateTime planEndTime;
+
+    @Column(name = "arrive_elapsed", nullable = false, columnDefinition = "int(11) default '0'")
+    private int arriveElapsed;
+
+    @Column(name = "arrive_distance", nullable = false, columnDefinition = "int(11) default '0'")
+    private int arriveDistance;
+
+    @Column(name = "actual_start_time")
+    private LocalDateTime actualStartTime;
+
+    @Column(name = "actual_end_time")
+    private LocalDateTime actualEndTime;
+
+    @Column(name = "description", length = 500)
+    private String description;
+
+    @Column(name = "extra_info", columnDefinition = "json")
+    private String extraInfo;
+
+    @Column(name = "create_time", nullable = false, columnDefinition = "timestamp default current_timestamp")
+    private LocalDateTime createTime;
+
+    @Column(name = "update_time", nullable = false, columnDefinition = "timestamp default current_timestamp on update current_timestamp")
+    private LocalDateTime updateTime;
+
+    // Getters and setters (omitted for brevity)
+}