fix(ID1004112): 搜索后仅显示搜索标签

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

@@ -11,39 +11,13 @@ import com.dituhui.pea.order.common.Stapial4jUtil;
 import com.dituhui.pea.order.common.TimeUtils;
 import com.dituhui.pea.order.common.TimeUtils;
 import com.dituhui.pea.order.common.jackson.DateUtil;
 import com.dituhui.pea.order.common.jackson.DateUtil;
 import com.dituhui.pea.order.common.jackson.JsonUtil;
 import com.dituhui.pea.order.common.jackson.JsonUtil;
-import com.dituhui.pea.order.dao.EngineerInfoDao;
-import com.dituhui.pea.order.dao.EngineerSkillGroupDao;
-import com.dituhui.pea.order.dao.OrderInfoDao;
-import com.dituhui.pea.order.dao.OrgTeamDao;
-import com.dituhui.pea.order.dao.OrgTeamEngineerDao;
-import com.dituhui.pea.order.dao.SkillInfoDao;
-import com.dituhui.pea.order.dto.LabelValueDTO;
-import com.dituhui.pea.order.dto.MsgDTO;
-import com.dituhui.pea.order.dto.OrderAssignRecommendResp;
-import com.dituhui.pea.order.dto.OrderAssignReq;
-import com.dituhui.pea.order.dto.OrderReschedule;
-import com.dituhui.pea.order.dto.TimeLineDTO;
+import com.dituhui.pea.order.dao.*;
+import com.dituhui.pea.order.dto.*;
 import com.dituhui.pea.order.dto.param.RecommendEngineersReq;
 import com.dituhui.pea.order.dto.param.RecommendEngineersReq;
 import com.dituhui.pea.order.dto.param.TLocation;
 import com.dituhui.pea.order.dto.param.TLocation;
-import com.dituhui.pea.order.entity.EngineerInfoEntity;
-import com.dituhui.pea.order.entity.EngineerSkillGroupEntity;
-import com.dituhui.pea.order.entity.OrderInfoEntity;
-import com.dituhui.pea.order.entity.OrgTeamEngineerEntity;
-import com.dituhui.pea.order.entity.OrgTeamEntity;
-import com.dituhui.pea.order.entity.SkillInfoEntity;
-import com.dituhui.pea.order.enums.AppointmentMethodEnum;
-import com.dituhui.pea.order.enums.LocationType;
-import com.dituhui.pea.order.enums.OrderEventEnum;
-import com.dituhui.pea.order.enums.OrderFlowEnum;
-import com.dituhui.pea.order.enums.OrderStatusEnum;
-import com.dituhui.pea.order.enums.ServiceStatusEnum;
-import com.dituhui.pea.order.enums.TestimonialsEngineerTag;
-import com.dituhui.pea.order.service.CommonService;
-import com.dituhui.pea.order.service.EngineerBusinessService;
-import com.dituhui.pea.order.service.EngineerCalendarService;
-import com.dituhui.pea.order.service.MsgService;
-import com.dituhui.pea.order.service.OrderAssign;
-import com.dituhui.pea.order.service.OrderInfoService;
+import com.dituhui.pea.order.entity.*;
+import com.dituhui.pea.order.enums.*;
+import com.dituhui.pea.order.service.*;
 import com.dituhui.pea.order.utils.CommonUtil;
 import com.dituhui.pea.order.utils.CommonUtil;
 import com.dituhui.pea.order.utils.OrderUtil;
 import com.dituhui.pea.order.utils.OrderUtil;
 import com.dituhui.pea.pojo.user.OrgInfo;
 import com.dituhui.pea.pojo.user.OrgInfo;
@@ -172,14 +146,17 @@ public class OrderAssignImpl implements OrderAssign {
             //判定当前工程师是否在队内， 否则判定是否在10KM内， 否则
             //判定当前工程师是否在队内， 否则判定是否在10KM内， 否则
             TempEngineer tempEngineer = engineerDistanceMap.get(engineerCode);
             TempEngineer tempEngineer = engineerDistanceMap.get(engineerCode);
             item.setLocations(tempEngineer.getLocations());
             item.setLocations(tempEngineer.getLocations());
-            if (Objects.nonNull(orgTeamEngineerDao.findByTeamIdAndEngineerCode(orgTeamId, engineerCode))) {
-                engineerTag = TestimonialsEngineerTag.TEAM;
-            } else if (tempEngineer.getDistance().compareTo(judgeDistance) <= 0) {
-                engineerTag = TestimonialsEngineerTag.PERIPHERAL;
-            } else if (req.isSearch()) {
+
+            if (req.isSearch()) {
                 engineerTag = TestimonialsEngineerTag.SEARCH;
                 engineerTag = TestimonialsEngineerTag.SEARCH;
             } else {
             } else {
-                engineerTag = TestimonialsEngineerTag.NONE;
+                if (Objects.nonNull(orgTeamEngineerDao.findByTeamIdAndEngineerCode(orgTeamId, engineerCode))) {
+                    engineerTag = TestimonialsEngineerTag.TEAM;
+                } else if (tempEngineer.getDistance().compareTo(judgeDistance) <= 0) {
+                    engineerTag = TestimonialsEngineerTag.PERIPHERAL;
+                } else {
+                    engineerTag = TestimonialsEngineerTag.NONE;
+                }
             }
             }
 
 
             item.setEngineerCode(engineerCode);
             item.setEngineerCode(engineerCode);