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

project-order/src/main/java/com/dituhui/pea/order/dao/EngineerInfoDao.java

@@ -84,14 +84,14 @@ public interface EngineerInfoDao extends JpaRepository<EngineerInfoEntity, Integ
      * @param teamId           工作队ID
      * @return 工程师信息
      */
-    @Query(value = "SELECT ei.* FROM org_team_engineer ote  " +
-            " LEFT JOIN  " +
-            "  (SELECT esg.engineer_code AS engineer_code FROM engineer_skill_group esg  " +
-            "   WHERE esg.status = 1 AND  esg.skill_group_code  IN( :skillGroupCodes) group by esg.engineer_code having count(esg.skill_group_code) = :skillGroupNumber " +
-            "  ) AS  tabA ON tabA.engineer_code = ote.engineer_code  " +
-            " LEFT JOIN engineer_info ei  ON ei.engineer_code = tabA.engineer_code " +
-            " WHERE ote.team_id  = :teamId AND ote.status = 1 AND ei.id is not null" +
-            " order by ei.engineer_code  desc", nativeQuery = true)
+    @Query(value = "SELECT ei.* FROM " +
+            " (SELECT esg.engineer_code AS engineer_code FROM engineer_skill_group esg   " +
+            "               WHERE esg.status = 1 AND  esg.skill_group_code  IN( :skillGroupCodes) group by esg.engineer_code having count(esg.skill_group_code) = :skillGroupNumber  " +
+            "              ) AS  tabA" +
+            "            LEFT JOIN   org_team_engineer ote   ON tabA.engineer_code = ote.engineer_code " +
+            "            LEFT JOIN engineer_info ei  ON ei.engineer_code = tabA.engineer_code  " +
+            "WHERE ote.team_id  = :teamId AND ote.status = 1" +
+            "             order by ei.engineer_code  desc ", nativeQuery = true)
     Set<EngineerInfoEntity> listBySkillGroupCode(@Param("skillGroupCodes") Collection<String> skillGroupCodes, @Param("skillGroupNumber") int skillGroupNumber, @Param("teamId") String teamId);
 
     /**

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

@@ -188,7 +188,11 @@ public class CapacityQueryServiceImpl implements CapacityQueryService {
         //FIXME   CC测试需要GROUP ID与BEAN保持一致, 后期需移除本分支
         if ("gsuzhou".equals(groupId)){
             result.setGroupId("da30be3a890f68e9682fba2e8611ee98");
-        } else {
+        } else if ("379022fa9adb4b0eacdf9491c7d3c372".equals(groupId)) {
+            result.setGroupId("9a5e020e7b72ac0aa554270680985352");
+        }else if ("1B73724B508411EEBBA80242AC1F0002".equals(groupId)) {
+            result.setGroupId("f5e229bbb432839c96d6102e01e49b30");
+        }else {
 
             result.setGroupId(groupId);
         }