|
@@ -966,7 +966,7 @@ public class AdmReportEquipController {
|
|
|
classCodeSet = admObjectTypeMap.keySet();
|
|
|
}else {
|
|
|
List<AdmEquipment> equipmentList = JSONUtil.toList(admObjList.toString(), AdmEquipment.class);
|
|
|
- Map<String, AdmEquipment> admObjectTypeMap = CollUtil.fieldValueMap(equipmentList, "code");
|
|
|
+ Map<String, AdmEquipment> admObjectTypeMap = CollUtil.fieldValueMap(equipmentList, "classCode");
|
|
|
classCodeSet = admObjectTypeMap.keySet();
|
|
|
}
|
|
|
|
|
@@ -985,21 +985,18 @@ public class AdmReportEquipController {
|
|
|
criteria = JsonNodeFactory.instance.objectNode();
|
|
|
ArrayNode arrayNode = criteria.putObject("classCode").putArray("$in");
|
|
|
classCodeSet.stream().forEach(classCode -> arrayNode.add(classCode));
|
|
|
- criteria.put("type", "commo");
|
|
|
if(getInfoCounts){
|
|
|
- criteria.put("valid","['0','1']");
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
queryCriteria.setOnlyCount(true);
|
|
|
List<ObjectInfoDefine> totalInfo = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|
|
|
controlInfoCounts = totalInfo.size();
|
|
|
- criteria.remove("valid");
|
|
|
}
|
|
|
//静态信息点
|
|
|
criteria.put("category","STATIC");
|
|
|
if(visible){
|
|
|
criteria.put("valid", "1");
|
|
|
}else{
|
|
|
- criteria.put("valid","['0','1']");
|
|
|
+ criteria.remove("valid");
|
|
|
}
|
|
|
queryCriteria.setCriteria(criteria);
|
|
|
List<ObjectInfoDefine> staticInfoCode = DigitalObjectInfoFacade.query(AdmContextUtil.toDmpContext().getGroupCode(), AdmContextUtil.toDmpContext().getProjectId(), AdmCommonConstant.APP_ID,null,queryCriteria);
|