From 94ab95b70f163085c1d7533e555358179ec2b07d Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 17 Feb 2023 14:50:49 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hbt/safety/supervision/pojo/MajorHazardSources.java | 8 ++++---- .../service/impl/MajorHazardSourcesServiceImpl.java | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) 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); From 709d2fdd14aad7f2b8fb440e342c9acf5a84f292 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 17 Feb 2023 15:14:56 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/hbt/safety/supervision/pojo/HiddenDanger.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java index 1b2705e..58e9aa6 100644 --- a/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java +++ b/hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java @@ -51,9 +51,9 @@ public class HiddenDanger extends BaseEntity @Excel(name = "隐患整改措施") private String reformMeasures; - /** 隐患状态 */ + /** 隐患状态 */ @Excel(name = "隐患状态") - private String reformStatus; + private int reformStatus; /** 超期状态 0-正常 1-超期 */ @Excel(name = "超期状态") @@ -144,12 +144,12 @@ public class HiddenDanger extends BaseEntity { return reformMeasures; } - public void setReformStatus(String reformStatus) + public void setReformStatus(int reformStatus) { this.reformStatus = reformStatus; } - public String getReformStatus() + public int getReformStatus() { return reformStatus; }