fix:排班结果详情修改

project-dispatch/src/main/java/com/dituhui/pea/dispatch/pojo/Location.java

@@ -171,12 +171,15 @@ public class Location {
 
 
     @Override
     @Override
     public boolean equals(Object obj) {
     public boolean equals(Object obj) {
-        if (obj == null)
+        if (obj == null) {
             return false;
             return false;
-        if (!(obj instanceof Location))
+        }
+        if (!(obj instanceof Location)) {
             return false;
             return false;
-        if (obj == this)
+        }
+        if (obj == this) {
             return true;
             return true;
+        }
         return this.id == ((Location) obj).getId();
         return this.id == ((Location) obj).getId();
     }
     }
 
 

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

 package com.dituhui.pea.order.service.impl;
 package com.dituhui.pea.order.service.impl;
 
 
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
@@ -19,6 +21,7 @@ import org.springframework.stereotype.Service;
 
 
 import javax.persistence.criteria.Predicate;
 import javax.persistence.criteria.Predicate;
 import java.time.LocalDate;
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
 
 
@@ -204,12 +207,16 @@ public class ScheduleServiceImpl implements ScheduleService {
             item.setSkill(o.getSkill());
             item.setSkill(o.getSkill());
             item.setOrderStatus(o.getAppointmentStatus());
             item.setOrderStatus(o.getAppointmentStatus());
             item.setOrderStatusName("");
             item.setOrderStatusName("");
-            item.setDistance(3000);
+            item.setDistance(o.getArriveDistance());
             item.setTimeType("auto");
             item.setTimeType("auto");
-            item.setExpectArriveDuration("10分钟");
-            item.setArriveTime("10分钟");
-            item.setExpectWorkDuration("30分钟");
-            item.setWorkDuration("30分钟");
+            item.setExpectArriveDuration(o.getArriveElapsed() + "分钟");
+            item.setArriveTime(null);
+            if (ObjectUtil.isAllNotEmpty(o.getPlanStartTime(), o.getPlanEndTime())) {
+                item.setExpectWorkDuration(LocalDateTimeUtil.between(o.getPlanStartTime(), o.getPlanEndTime(), ChronoUnit.MINUTES) + "分钟");
+            }
+            if (ObjectUtil.isAllNotEmpty(o.getActualStartTime(), o.getActualEndTime())) {
+                item.setWorkDuration(LocalDateTimeUtil.between(o.getActualStartTime(), o.getActualEndTime(), ChronoUnit.MINUTES) + "分钟");
+            }
 
 
             orders.add(item);
             orders.add(item);
         }
         }