|
@@ -95,7 +95,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
|
|
|
attrs.add(qualifiedStandard);
|
|
|
// 不合格项目数
|
|
|
String unqualifiedProjectCountStr = unqualifiedProjectCount == null ?
|
|
|
- null : String.valueOf(unqualifiedProjectCount);
|
|
|
+ "0" : String.valueOf(unqualifiedProjectCount);
|
|
|
AttrValueVO unqualifiedCount = new AttrValueVO(
|
|
|
AreaIotContentCodes.unqualifiedCount.name(),
|
|
|
unqualifiedProjectCountStr, AttrValueTypeEnum.number);
|
|
@@ -144,7 +144,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
|
|
|
String unqualifiedProjectCount = null;
|
|
|
// 总项目数
|
|
|
List<SimpleProjectVO> simpleProjectList = reportOutlineService.queryRelatedProjects(reportOutline);
|
|
|
- String projectCountStr = simpleProjectList == null ? null : String.valueOf(simpleProjectList.size());
|
|
|
+ String projectCountStr = simpleProjectList == null ? "0" : String.valueOf(simpleProjectList.size());
|
|
|
|
|
|
List<ItemVO> items = paragraphContentVO.getItems();
|
|
|
Set<String> attrCodeSet = Sets.newSet(
|
|
@@ -157,7 +157,7 @@ public class AreaIotBuilder extends AreaIndicatorsParagraphBuilder {
|
|
|
List<AttrValueVO> attrs = item.getAttrs();
|
|
|
Map<String, AttrValueVO> attrMap = attrValueList2Map(attrCodeSet, attrs);
|
|
|
String itemUnqualifiedProjectCount = attrMap.get(AreaIotContentCodes.unqualifiedCount.name()).getValue();
|
|
|
- itemUnqualifiedProjectCount = itemUnqualifiedProjectCount == null ? "--" : itemUnqualifiedProjectCount;
|
|
|
+ itemUnqualifiedProjectCount = itemUnqualifiedProjectCount == null ? "0" : itemUnqualifiedProjectCount;
|
|
|
String itemInfo = item.getName() + itemUnqualifiedProjectCount + "个";
|
|
|
unqualifiedProjectCount = unqualifiedProjectCount == null ?
|
|
|
itemInfo : unqualifiedProjectCount + "," + itemInfo;
|