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

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

@@ -244,7 +244,6 @@ public class BeanRemoteServiceImpl {
         engineerInfo.setGender(userDetailInfo.getGender());
         engineerInfo.setGender(userDetailInfo.getGender());
         engineerInfo.setBirth(StringUtils.isBlank(userDetailInfo.getBirthday()) ? "" : getYear(userDetailInfo.getBirthday()));
         engineerInfo.setBirth(StringUtils.isBlank(userDetailInfo.getBirthday()) ? "" : getYear(userDetailInfo.getBirthday()));
 
 
-        engineerInfo.setAddress("");
         engineerInfo.setPhone(userDetailInfo.getCellPhone());
         engineerInfo.setPhone(userDetailInfo.getCellPhone());
         engineerInfo.setKind(1 == userDetailInfo.getPartTimeRepair() ? 2 : 1);
         engineerInfo.setKind(1 == userDetailInfo.getPartTimeRepair() ? 2 : 1);
         engineerInfo.setGrade(Objects.isNull(userDetailInfo.getGrade()) ? "" : userDetailInfo.getGrade());
         engineerInfo.setGrade(Objects.isNull(userDetailInfo.getGrade()) ? "" : userDetailInfo.getGrade());
@@ -256,7 +255,10 @@ public class BeanRemoteServiceImpl {
 
 
         //fixme 工作地址存贮
         //fixme 工作地址存贮
         if (Objects.nonNull(address)) {
         if (Objects.nonNull(address)) {
+            engineerInfo.setAddress(address.getAddress());
             engineerInfo.setWorkAddress(address.getAddress());
             engineerInfo.setWorkAddress(address.getAddress());
+            engineerInfo.setWorkX(Objects.isNull(address.getLongitude()) ? "" : String.valueOf(address.getLongitude()));
+            engineerInfo.setWorkY(Objects.isNull(address.getLatitude()) ? "" : String.valueOf(address.getLatitude()));
         } else {
         } else {
             engineerInfo.setWorkAddress("");
             engineerInfo.setWorkAddress("");
         }
         }

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

@@ -243,9 +243,9 @@ public class OrderAssignImpl implements OrderAssign {
         }
         }
         entity = entityResult.getResult();
         entity = entityResult.getResult();
 
 
-        if (req.getIsSub()){
+        if (req.getIsSub()) {
             entity.setEngineerCodeSub(engineer.getEngineerCode());
             entity.setEngineerCodeSub(engineer.getEngineerCode());
-        }else {
+        } else {
             entity.setEngineerCode(engineer.getEngineerCode());
             entity.setEngineerCode(engineer.getEngineerCode());
             entity.setEngineerName(engineer.getName());
             entity.setEngineerName(engineer.getName());
             entity.setEngineerPhone(engineer.getPhone());
             entity.setEngineerPhone(engineer.getPhone());
@@ -280,6 +280,9 @@ public class OrderAssignImpl implements OrderAssign {
         Integer cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), orgTeam.getWorkOff());
         Integer cutoff = CommonUtil.isCutoff(order.getExpectTimeBegin(), orgTeam.getWorkOff());
         order.setAppointmentStatus(OrderFlowEnum.INIT.name());
         order.setAppointmentStatus(OrderFlowEnum.INIT.name());
         order.setServiceStatus(OrderFlowEnum.INIT.name());
         order.setServiceStatus(OrderFlowEnum.INIT.name());
+        order.setPlanStartTime(order.getExpectTimeBegin());
+        order.setPlanEndTime(order.getExpectTimeEnd());
+        order = OrderUtil.handleSubOrder(order);
         if (cutoff > 0) {
         if (cutoff > 0) {
             // cutoff更新order_request表为人工指派
             // cutoff更新order_request表为人工指派
             order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());
             order.setAppointmentMethod(AppointmentMethodEnum.MANUAL.name());

project-order/src/main/java/com/dituhui/pea/order/utils/OrderUtil.java

@@ -29,6 +29,20 @@ public class OrderUtil {
         order.setEngineerCode(null);
         order.setEngineerCode(null);
         return order;
         return order;
     }
     }
+    /**
+     * 分处理辅助工程师数据
+     *
+     * @param order
+     * @return
+     */
+    public static OrderInfoEntity handleSubOrder(OrderInfoEntity order) {
+        order.setSubPlanStartTime(null);
+        order.setSubPlanEndTime(null);
+        order.setSubDistance(0);
+        order.setSubElapsed(0);
+        order.setEngineerCodeSub(null);
+        return order;
+    }
 
 
     /**
     /**
      * 分单，超派，特殊时间等处理工单指派工程师，网点等数据
      * 分单，超派，特殊时间等处理工单指派工程师，网点等数据