|
@@ -978,7 +978,7 @@ public class AdmReportEquipController {
|
|
|
|
|
|
if(CollUtil.isNotEmpty(objList)) {
|
|
|
for (int i = 0; i < objList.size(); i++) {
|
|
|
- JsonNode objectNode = objList.get(i);//JsonNodeUtils.toObjectNode(objList.get(i), "infos", null);
|
|
|
+ JsonNode objectNode = objList.get(i);
|
|
|
Iterator<ObjectInfoDefine> iterator1 = staticInfoPointCodes.iterator();
|
|
|
while (iterator1.hasNext()) {
|
|
|
ObjectInfoDefine infoDefine = iterator1.next();
|
|
@@ -1068,13 +1068,15 @@ public class AdmReportEquipController {
|
|
|
private Map<String,Object> calculateInfoPoints(String str, String type, List<ObjectInfoDefine> infoPointCodes) {
|
|
|
int counts = 0;
|
|
|
Map<String,Object> hashMap = new HashMap<String,Object>();
|
|
|
- Iterator<ObjectInfoDefine> iterator = infoPointCodes.iterator();
|
|
|
- while (iterator.hasNext()){
|
|
|
- ObjectInfoDefine nextInfo = iterator.next();
|
|
|
- if(str.contains(nextInfo.getCode()) && type.equals(nextInfo.getClassCode())){
|
|
|
- counts ++;
|
|
|
- hashMap.put("next", nextInfo);
|
|
|
- iterator.remove();
|
|
|
+ if(!str.equals("{}")){
|
|
|
+ Iterator<ObjectInfoDefine> iterator = infoPointCodes.iterator();
|
|
|
+ while (iterator.hasNext()){
|
|
|
+ ObjectInfoDefine nextInfo = iterator.next();
|
|
|
+ if(str.contains(nextInfo.getCode()) && type.equals(nextInfo.getClassCode())){
|
|
|
+ counts ++;
|
|
|
+ hashMap.put("next", nextInfo);
|
|
|
+ iterator.remove();
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
hashMap.put("counts", counts);
|