소스 검색

fix : 质量报告bug测试

lvxianyun 3 년 전
부모
커밋
d73faeb9a6
1개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 4
      src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

+ 2 - 4
src/main/java/com/persagy/proxy/report/controller/AdmReportEquipController.java

@@ -1102,17 +1102,15 @@ public class AdmReportEquipController {
     private List<ObjectInfoDefine> gatherDynamicInfoCode(Boolean visible, Set<String> classCodeSet, Boolean common){
         //获取信息点
         AdmQueryCriteria admQueryCriteria = new AdmQueryCriteria();
-        ObjectNode criteria = JsonNodeFactory.instance.objectNode();
-        ArrayNode arrayNode = criteria.putObject("classCode").putArray("$in");
-        classCodeSet.stream().forEach(classCode -> arrayNode.add(classCode));
         //静态信息点
         String filters = " category != 'STATIC'";
         if(visible){
             filters = filters + " and valid = '1' ";
         }
         if(common){
-            filters = filters +" projectId = '0' and groupCode = '0' ";
+            filters = filters +" and projectId = '0' and groupCode = '0' ";
         }
+        filters = filters +" and classCode in ['"+StrUtil.join("','",classCodeSet)+"']";
         admQueryCriteria.setFilters(filters);
         QueryCriteria queryCriteria = AdmQueryCriteriaHelper.toDmpCriteria(admQueryCriteria);
         List<ObjectInfoDefine> staticInfoCode = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);