diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/MajorHazardSources.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/MajorHazardSources.java index 1963b32..e670e59 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/MajorHazardSources.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/MajorHazardSources.java @@ -61,8 +61,8 @@ public class MajorHazardSources extends BaseEntity @Excel(name = "危险源统一编码") private String unifiedCoding; - /** 单元类型 */ - private String unitType; + /** 单元类型 0-生产单元 1-存储单元*/ + private int unitType; /** 当前存储量 */ private String memorySpace; @@ -186,11 +186,11 @@ public class MajorHazardSources extends BaseEntity this.unifiedCoding = unifiedCoding; } - public String getUnitType() { + public int getUnitType() { return unitType; } - public void setUnitType(String unitType) { + public void setUnitType(int unitType) { this.unitType = unitType; } diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java index 0e69e33..dceacd0 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/service/impl/MajorHazardSourcesServiceImpl.java @@ -117,12 +117,12 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService // 获取生产单元数量 int productionUnit = (int) list.stream() - .filter(s -> s.getUnitType().equals("生产单元")).count(); + .filter(s -> s.getUnitType() == 0).count(); map.put("productionUnit", productionUnit); // 获取存储单元数量 int storageCell = (int) list.stream() - .filter(s -> s.getUnitType().equals("存储单元")).count(); + .filter(s -> s.getUnitType() == 0).count(); map.put("storageCell", storageCell); return JSONObject.toJSONString(map);