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

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

@@ -25,4 +25,9 @@ public class RecommendEngineersReq {
      * 待补充doc
      * 待补充doc
      */
      */
     private String userId;
     private String userId;
+
+    /**
+     * 是否属于搜索查询， 用于满足PRD标签判定
+     */
+    private boolean search;
 }
 }

project-order/src/main/java/com/dituhui/pea/order/enums/TestimonialsEngineerTag.java

@@ -18,5 +18,9 @@ public enum TestimonialsEngineerTag {
     /**
     /**
      * 搜索， 通过搜索出来的人
      * 搜索， 通过搜索出来的人
      */
      */
-    SEARCH;
+    SEARCH,
+    /**
+     * 不显示标签
+     */
+    NONE;
 }
 }

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

@@ -390,7 +390,8 @@ public class EngineerServiceImpl implements EngineerService {
 
 
             items.add(item);
             items.add(item);
         }
         }
-        return items;
+        return items.stream().sorted(Comparator.comparing(EngineerInfoListResp.EngineerInfo::getGroupName, Comparator.reverseOrder())
+                    .thenComparing(EngineerInfoListResp.EngineerInfo::getName, Comparator.reverseOrder())).collect(Collectors.toList());
     }
     }
 
 
     private List<EngineerSkillListResp.EngineerSkill> packEngineerSkills(List<EngineerInfoEntity> engineers) {
     private List<EngineerSkillListResp.EngineerSkill> packEngineerSkills(List<EngineerInfoEntity> engineers) {

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

@@ -191,8 +191,10 @@ public class OrderAssignImpl implements OrderAssign {
                 engineerTag = TestimonialsEngineerTag.TEAM;
                 engineerTag = TestimonialsEngineerTag.TEAM;
             } else if (tempEngineer.getDistance().compareTo(judgeDistance) <= 0) {
             } else if (tempEngineer.getDistance().compareTo(judgeDistance) <= 0) {
                 engineerTag = TestimonialsEngineerTag.PERIPHERAL;
                 engineerTag = TestimonialsEngineerTag.PERIPHERAL;
-            } else {
+            } else  if (req.isSearch()){
                 engineerTag = TestimonialsEngineerTag.SEARCH;
                 engineerTag = TestimonialsEngineerTag.SEARCH;
+            } else {
+                engineerTag = TestimonialsEngineerTag.NONE;
             }
             }
 
 
             item.setEngineerCode(engineerCode);
             item.setEngineerCode(engineerCode);