Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

微调

Browse Source
This commit is contained in:
wr
2023-09-14 19:17:51 +08:00
parent 3aa0dc8eeb
commit 404a122fd7
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java
View File

@@ -421,7 +421,7 @@ public class CustomReportServiceImpl implements CustomReportService {
}); });
} }
if (CollUtil.isEmpty(endList)) { if (CollUtil.isNotEmpty(endList)) {
//数据单位信息 //数据单位信息
Map<String, String> unit = unitMap(reportSearchParam.getLineId()); Map<String, String> unit = unitMap(reportSearchParam.getLineId());
//进行反向赋值到模板 //进行反向赋值到模板
@@ -431,7 +431,6 @@ public class CustomReportServiceImpl implements CustomReportService {
jsonArray.forEach(item -> { jsonArray.forEach(item -> {
JSONObject jsonObject = (JSONObject) item; JSONObject jsonObject = (JSONObject) item;
JSONArray itemArr = (JSONArray) jsonObject.get("celldata"); JSONArray itemArr = (JSONArray) jsonObject.get("celldata");
String celldata = jsonObject.get("celldata").toString();
itemArr.forEach((it) -> { itemArr.forEach((it) -> {
if (Objects.nonNull(it) && !"null".equals(it.toString())) { if (Objects.nonNull(it) && !"null".equals(it.toString())) {
//获取到1列 //获取到1列