Commit 85479cff authored by 刘林's avatar 刘林

fix(大屏):综合查询导出检验报告去掉"null"

parent 8c5ad623
......@@ -1005,6 +1005,12 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
}
dto.put("INFORMATION_SITUATION", informationSituation);
}
Optional.ofNullable(dto.getJSONArray("inspections"))
.ifPresent(arr -> arr.forEach(o -> {
JSONObject j = (JSONObject) o;
String v = j.getString("inspectReportNo");
j.put("inspectReportNo", (v == null || "null".equalsIgnoreCase(v)) ? "" : v);
}));
if (!ValidationUtil.isEmpty(dto.getString("CYLINDER_CATEGORY")) && dto.getString("EQU_CATEGORY_CODE").equals("2300")) {
String cylinderCategory = dto.getString("CYLINDER_CATEGORY");
boolean integer = isInteger(cylinderCategory);
......@@ -1012,6 +1018,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
cylinderCategory = CylinderCategoryEnum.getName(cylinderCategory);
}
dto.put("CYLINDER_CATEGORY", cylinderCategory);
}else{
dto.put("CYLINDER_CATEGORY", "");
}
dto.put("inspectStatus", inspectStatus);
list.add(dto);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment