中车

mjava-zhongche/src/main/java/com/malk/zhongche/service/impl/ZhongcheServiceImpl.java

@@ -248,12 +248,11 @@ public class ZhongcheServiceImpl implements ZhongcheService {
         List<String> projectIds = searchProject();
 
         for (String projectId : projectIds) {
-            if (!"6969d8a34991ad9a71ce4ec5".equals(projectId)) continue;//宜搭测试项目
-
-            //查询项目下所有非顶级任务
-            List<Map> taskList = tbClient.queryProjectTaskList(projectId, UtilMap.map("q, pageSize", "taskLayer = exceptTopLevel", 1000), null);
+            if (!"69e1fcd4c41c37563c72888e".equals(projectId)) continue;
 
             String sfcId = "";//末级任务(企业)
+            String sfcId2 = "";//任务(企业)
+
             //获取项目任务类型
             List<Map> result = searchProjectSfc(projectId);
             for (Map resultMap : result) {
@@ -261,11 +260,15 @@ public class ZhongcheServiceImpl implements ZhongcheService {
                 String id = UtilMap.getString(resultMap, "id");
 
                 switch (name){
+                    case "任务（企业）":sfcId2 = id;break;
                     case "末级任务(企业)":sfcId = id;break;
                     default:break;
                 }
             }
 
+            //查询项目下所有非顶级任务且任务类型为任务（企业）
+            List<Map> taskList = tbClient.queryProjectTaskList(projectId, UtilMap.map("q, pageSize", "taskLayer = exceptTopLevel AND scenarioId = " + sfcId2, 1000), null);
+
             //遍历所有任务，查询末级任务
             for (Map task : taskList) {
                 String taskId = UtilMap.getString(task, "id");
@@ -278,6 +281,10 @@ public class ZhongcheServiceImpl implements ZhongcheService {
                     updateTaskSfc(taskId, sfcId);
                 }
             }
+
+
+
+
         }
     }