feat:添加工单多人上门，排除/指定工程师

project-order/src/main/java/com/dituhui/pea/order/dto/OrderServiceList.java

@@ -37,5 +37,21 @@ public class OrderServiceList {
      */
      */
     private String beanPriority;
     private String beanPriority;
 
 
+    /**
+     * 是否重物搬运（双人上门） 0：否 1：是 默认0
+     */
+    private Integer isMultiple;
+
+    /**
+     * 是否指定某个工程师/是否排除某个工程师 0：否 1：指定 2：排除 默认0
+     */
+    private Integer isAppointEngineer;
+
+
+    /**
+     * 指定某个工程师/排除某个工程师 codes 多个,分割
+     */
+    private String appointEngineerCodes;
+
 
 
 }
 }

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

@@ -7,56 +7,72 @@ import java.time.LocalDate;
 
 
 @Data
 @Data
 public class OrderInfo {
 public class OrderInfo {
-	private Long id;
-	private String orderId;
-	private LocalDate dt;
-	private String subId;
-	private String name;
-	private String phone;
-	private String address;
-	private String x;
-	private String y;
-	private String province;
-	private String city;
-	private String county;
-	private String brand;
-	private String type;
-	private String skill;
-	private Integer takeTime;
-	private Integer isWorkshop;
-	private String applyNote;
-	private String faultDescribe;
-	private Timestamp expectTimeBegin;
-	private Timestamp expectTimeEnd;
-	private String expectTimeDesc;
-	private String source;
-	private String beanPriority;
-	private String beanTags;
-	private String beanStatus;
-	private String beanSubStatus;
-	private String areaId;
-	private String orgClusterId;
-	private String orgBranchId;
-	private String orgGroupId;
-	private String orgTeamId;
-	private Integer priority;
-	private String tags;
-	private String appointmentMethod;
-	private String appointmentStatus;
-	private String dispatcher;
-	private String orderStatus;
-	private String serviceStatus;
-	private String engineerCode;
-	private String engineerName;
-	private String engineerPhone;
-	private String engineerCodeSub;
-	private Timestamp planStartTime;
-	private Timestamp planEndTime;
-	private Integer arriveElapsed;
-	private Integer arriveDistance;
-	private Timestamp actualStartTime;
-	private Timestamp actualEndTime;
-	private String description;
-	private Timestamp createTime;
-	private Timestamp updateTime;
+    private Long id;
+    private String orderId;
+    private LocalDate dt;
+    private String subId;
+    private String name;
+    private String phone;
+    private String address;
+    private String x;
+    private String y;
+    private String province;
+    private String city;
+    private String county;
+    private String brand;
+    private String type;
+    private String skill;
+    private Integer takeTime;
+    private Integer isWorkshop;
+    private String applyNote;
+    private String faultDescribe;
+    private Timestamp expectTimeBegin;
+    private Timestamp expectTimeEnd;
+    private String expectTimeDesc;
+    private String source;
+    private String beanPriority;
+    private String beanTags;
+    private String beanStatus;
+    private String beanSubStatus;
+    private String areaId;
+    private String orgClusterId;
+    private String orgBranchId;
+    private String orgGroupId;
+    private String orgTeamId;
+    private Integer priority;
+    private String tags;
+    private String appointmentMethod;
+    private String appointmentStatus;
+    private String dispatcher;
+    private String orderStatus;
+    private String serviceStatus;
+    private String engineerCode;
+    private String engineerName;
+    private String engineerPhone;
+    private String engineerCodeSub;
+    private Timestamp planStartTime;
+    private Timestamp planEndTime;
+    private Integer arriveElapsed;
+    private Integer arriveDistance;
+    private Timestamp actualStartTime;
+    private Timestamp actualEndTime;
+    private String description;
+    private Timestamp createTime;
+    private Timestamp updateTime;
+
+    /**
+     * 是否重物搬运（双人上门） 0：否 1：是 默认0
+     */
+    private Integer isMultiple;
+
+    /**
+     * 是否指定某个工程师/是否排除某个工程师 0：否 1：指定 2：排除 默认0
+     */
+    private Integer isAppointEngineer;
+
+
+    /**
+     * 指定某个工程师/排除某个工程师 codes 多个,分割
+     */
+    private String appointEngineerCodes;
 }
 }
\ No newline at end of file

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

@@ -44,10 +44,10 @@ public class OrderInfoEntity {
     private String address;
     private String address;
 
 
     @Column(name = "x", nullable = false, length = 20)
     @Column(name = "x", nullable = false, length = 20)
-    private String x="0";
+    private String x = "0";
 
 
     @Column(name = "y", nullable = false, length = 20)
     @Column(name = "y", nullable = false, length = 20)
-    private String y="0";
+    private String y = "0";
 
 
     @Column(name = "bean_brand", nullable = false, length = 20)
     @Column(name = "bean_brand", nullable = false, length = 20)
     private String beanBrand;
     private String beanBrand;
@@ -176,4 +176,25 @@ public class OrderInfoEntity {
     private LocalDateTime updateTime = LocalDateTime.now();
     private LocalDateTime updateTime = LocalDateTime.now();
 
 
     // Getters and setters (omitted for brevity)
     // Getters and setters (omitted for brevity)
+
+
+    /**
+     * 是否重物搬运（双人上门） 0：否 1：是 默认0
+     */
+    @Column(name = "is_multiple")
+    private Integer isMultiple = 0;
+
+
+    /**
+     * 是否指定某个工程师/是否排除某个工程师 0：否 1：指定 2：排除 默认0
+     */
+    @Column(name = "is_appoint_engineer")
+    private Integer isAppointEngineer = 0;
+
+
+    /**
+     * 指定某个工程师/排除某个工程师 codes 多个,分割
+     */
+    @Column(name = "appoint_engineer_codes")
+    private String appointEngineerCodes;
 }
 }

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrderServiceListServiceImpl.java

@@ -140,6 +140,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
             record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
             record.setCreateTime(TimeUtils.IsoTimestamp2DateTime(o.getCreateTime()));
 
 
             record.setBeanPriority(o.getBeanPriority());
             record.setBeanPriority(o.getBeanPriority());
+            record.setIsMultiple(o.getIsMultiple());
+            record.setIsAppointEngineer(o.getIsAppointEngineer());
+            record.setAppointEngineerCodes(o.getAppointEngineerCodes());
 
 
             content.add(record);
             content.add(record);
         }
         }