Merge branch 'refs/heads/feature-lihb-20250716' into test-merge

# Conflicts:
#	blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

blade-service/blade-manager/src/main/java/org/springblade/manager/service/impl/WbsSynchronousServiceImpl.java

@@ -636,23 +636,6 @@ public class WbsSynchronousServiceImpl {
                     //不能抛异常  不然就会中止程序  开发阶段先抛异常，后续统一处理
                     throw new ServiceException("当前节点不存在");
                 }
-
-                //获取所有表单的父节点
-                List<Long> pIds = startContacts.stream().filter(f -> f.getType() == 2).map(WbsTreeContract::getPId).collect(Collectors.toList());
-                HashMap<Long, Integer> informationQueryMap = new HashMap<>();
-                //查询质检合同节点填表信息
-                String sql = "SELECT  c.wbs_id, c.STATUS FROM u_information_query c" +
-                        " JOIN ( SELECT wbs_id, MAX( update_time ) AS max_update_time FROM u_information_query WHERE contract_id = " + contractInfo.getId() + " GROUP BY wbs_id ) subquery ON c.wbs_id = subquery.wbs_id " +
-                        " AND c.update_time = subquery.max_update_time WHERE  c.contract_id = " + contractInfo.getId() + " and c.is_deleted = 0  and c.wbs_id in(" + StringUtil.join(pIds,",") +")";
-
-                List<InformationQuery> informationQueries = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(InformationQuery.class));
-                //质检节点填报信息
-
-                for (InformationQuery informationQuery : informationQueries) {
-                    informationQueryMap.put(informationQuery.getWbsId(), informationQuery.getStatus());
-                }
-
-
                 for (WbsTreeContract wbsTreeContract : startContacts) {
                     //获取合同 当前节点的所有子节点数据
                     LambdaQueryWrapper<WbsTreeContract> wrapperContract = Wrappers.lambdaQuery();
@@ -667,6 +650,23 @@ public class WbsSynchronousServiceImpl {
                     wbsTreeContracts.add(wbsTreeContract);
 
 
+                    //获取所有表单的父节点
+                    List<Long> pIds = wbsTreeContracts.stream().filter(f -> f.getType() == 2).map(WbsTreeContract::getPId).collect(Collectors.toList());
+                    HashMap<Long, Integer> informationQueryMap = new HashMap<>();
+                    //查询质检合同节点填表信息
+                    String sql = "SELECT  c.wbs_id, c.STATUS FROM u_information_query c" +
+                            " JOIN ( SELECT wbs_id, MAX( update_time ) AS max_update_time FROM u_information_query WHERE contract_id = " + contractInfo.getId() + " GROUP BY wbs_id ) subquery ON c.wbs_id = subquery.wbs_id " +
+                            " AND c.update_time = subquery.max_update_time WHERE  c.contract_id = " + contractInfo.getId() + " and c.is_deleted = 0  and c.wbs_id in(" + StringUtil.join(pIds,",") +")";
+
+                    List<InformationQuery> informationQueries = jdbcTemplate.query(sql, new BeanPropertyRowMapper<>(InformationQuery.class));
+                    //质检节点填报信息
+
+                    for (InformationQuery informationQuery : informationQueries) {
+                        informationQueryMap.put(informationQuery.getWbsId(), informationQuery.getStatus());
+                    }
+
+
+
 
 
                     //合同段节点对应的项目id