zhangyu
/
wit-park-backend
forked from xxhjsb/wit-park-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into main

main
zhangyu 2023-02-20 09:28:32 +08:00
parent 7f855e50eb 65b41d7ac7
commit 3d88cfe508
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/HazardousOperationServiceImpl.java
View File

@ -122,7 +122,7 @@ public class HazardousOperationServiceImpl implements IHazardousOperationService
statisticsVo.setCount(typeList.get(key).size());
operationTypeList.add(statisticsVo);
}
map.put("operationTypeList", operationTypeList);
map.put("operationTypeList", JSONObject.toJSONString(operationTypeList));
// 进行中的危险作业
List<HazardousOperation> hazardousOperations = list.stream()

2
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java
View File

@ -121,7 +121,7 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService
statisticsVo.setCount(typeList.get(key).size());
dangerLevelList.add(statisticsVo);
}
map.put("dangerLevelList", dangerLevelList);
map.put("dangerLevelList", JSONObject.toJSONString(dangerLevelList));
// 获取生产单元数量
int productionUnit = (int) list.stream()