fix：订单相关添加返回字段

project-order/src/main/java/com/dituhui/pea/order/controller/TestController.java

@@ -23,4 +23,10 @@ public class TestController {
         return beanRemoteServiceImpl.allDepartment();
         return beanRemoteServiceImpl.allDepartment();
     }
     }
 
 
+
+    @GetMapping("/serviceOrgList")
+    public Result<?> serviceOrgList() {
+        return beanRemoteServiceImpl.serviceOrgList();
+    }
+
 }
 }

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

@@ -3,7 +3,6 @@ package com.dituhui.pea.order.dto;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.Data;
 
 
-import javax.validation.constraints.NotNull;
 import java.util.List;
 import java.util.List;
 
 
 @Data
 @Data
@@ -40,7 +39,50 @@ public class OrderServiceDetailResp {
 	/**
 	/**
 	 * bean优先级,例如:紧急、正常
 	 * bean优先级,例如:紧急、正常
 	 */
 	 */
-	private String beanPriority;;
+	private String beanPriority;
+
+	private String name;
+
+	private String phone;
+
+	private String beanBrand;
+
+	private String brand;
+
+	private String type;
+
+	private String skill;
+
+	private String faultDescribe;
+
+	private String expectTimeBegin;
+
+	private String expectTimeDesc;
+
+	private String source;
+
+	private String tags;
+
+	private String createTime;
+
+	private String applyNote;
+
+	/**
+	 * 是否是特殊时间段，0否 1是 默认0
+	 */
+	private Integer isSpecialTime;
+
+
+	/**
+	 * 是否是cutoff，0否 1是 默认0
+	 */
+	private Integer isCutoff ;
+
+
+	/**
+	 * 一家多单id，有则多条订单关联，没有则不是一家多单
+	 */
+	private String multipleOrders;
 
 
 	@Data
 	@Data
 	@JsonInclude(JsonInclude.Include.NON_NULL)
 	@JsonInclude(JsonInclude.Include.NON_NULL)

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

@@ -76,4 +76,14 @@ public class OrderServiceList {
      */
      */
     private Integer isSpecialTime;
     private Integer isSpecialTime;
 
 
+    /**
+     * 开始服务时间
+     */
+    private String actualStartTime;
+
+    /**
+     * 结束服务时间
+     */
+    private String actualEndTime;
+
 }
 }

project-order/src/main/java/com/dituhui/pea/order/feign/bean/enums/BeanOrgLevelEnum.java

@@ -5,13 +5,12 @@ import com.dituhui.pea.common.IResult;
 /**
 /**
  * boxi bean组织机构传输接口状态码枚举
  * boxi bean组织机构传输接口状态码枚举
  * bean doc url https://publink-hz.feishu.cn/wiki/L4d1wwuGGiQcDqkGh3LcDJPon1i
  * bean doc url https://publink-hz.feishu.cn/wiki/L4d1wwuGGiQcDqkGh3LcDJPon1i
- * 集团  CLIQUE
- * 大区  REGION
- * 分部 BRANCH
- * <p>
- * 分站 STATION
- * 外围 PERIPHERY
- * 寄修中心 REPAIR_CENTER
+ * 集团：CLIQUE
+ * 大区：REGION
+ * 分部：BRANCH
+ * 管理组：MANAGE_GROUP
+ * 分站：STATION
+ * 职能：FUNCTION
  */
  */
 public enum BeanOrgLevelEnum implements IResult {
 public enum BeanOrgLevelEnum implements IResult {
 
 
@@ -25,7 +24,9 @@ public enum BeanOrgLevelEnum implements IResult {
 
 
     PERIPHERY("PERIPHERY", "外围"),
     PERIPHERY("PERIPHERY", "外围"),
 
 
-    REPAIR_CENTER("REPAIR_CENTER", "寄修中心");
+    REPAIR_CENTER("REPAIR_CENTER", "寄修中心"),
+
+    FUNCTION("FUNCTION", "职能");
 
 
     private String code;
     private String code;
 
 

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

@@ -72,6 +72,21 @@ public class OrderServiceDetailImpl implements OrderServiceDetail {
         res.setIsAppointEngineer(order.getIsAppointEngineer());
         res.setIsAppointEngineer(order.getIsAppointEngineer());
         res.setAppointEngineerCodes(order.getAppointEngineerCodes());
         res.setAppointEngineerCodes(order.getAppointEngineerCodes());
         res.setBeanPriority(order.getBeanPriority());
         res.setBeanPriority(order.getBeanPriority());
+        res.setName(order.getName());
+        res.setPhone(order.getPhone());
+        res.setBrand(order.getBrand());
+        res.setType(order.getType());
+        res.setSkill(order.getSkill());
+        res.setFaultDescribe(order.getFaultDescribe());
+        res.setExpectTimeBegin(TimeUtils.IsoLocalDateTime2String(order.getExpectTimeBegin()));
+        res.setExpectTimeDesc(order.getExpectTimeDesc());
+        res.setSource(order.getSource());
+        res.setTags(order.getTags());
+        res.setCreateTime(TimeUtils.IsoLocalDateTime2String(order.getCreateTime()));
+        res.setApplyNote(order.getApplyNote());
+        res.setIsCutoff(order.getIsCutoff());
+        res.setIsSpecialTime(order.getIsSpecialTime());
+        res.setMultipleOrders(order.getMultipleOrders());
 
 
         return Result.success(res);
         return Result.success(res);
     }
     }

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

@@ -156,6 +156,9 @@ public class OrderServiceListServiceImpl implements OrderServiceListService {
             record.setMultipleOrders(o.getMultipleOrders());
             record.setMultipleOrders(o.getMultipleOrders());
             record.setTranscend(o.getTranscend());
             record.setTranscend(o.getTranscend());
             record.setIsSpecialTime(o.getIsSpecialTime());
             record.setIsSpecialTime(o.getIsSpecialTime());
+
+            record.setActualStartTime(TimeUtils.IsoTimestamp2DateTime(o.getActualStartTime()));
+            record.setActualEndTime(TimeUtils.IsoTimestamp2DateTime(o.getActualEndTime()));
             if (StringUtils.isNotEmpty(o.getMultipleOrders())) {
             if (StringUtils.isNotEmpty(o.getMultipleOrders())) {
                 List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
                 List<OrderInfoEntity> byMultipleOrders = orderInfoDao.findByMultipleOrdersAndOrderIdNot(o.getMultipleOrders(), o.getOrderId());
                 List<OrderServiceList> multipleItems = new ArrayList<>();
                 List<OrderServiceList> multipleItems = new ArrayList<>();