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

Merge branch 'main' of 81.70.119.104:xxhjsb/wit-park-backend

main
fengxiaoyu 2023-02-17 15:29:42 +08:00
parent 60351f2096 709d2fdd14
commit bba025e47d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/HiddenDanger.java
View File

@ -51,9 +51,9 @@ public class HiddenDanger extends BaseEntity
@Excel(name = "隐患整改措施") @Excel(name = "隐患整改措施")
private String reformMeasures; private String reformMeasures;
/** 隐患状态 */ /** 隐患状态 */
@Excel(name = "隐患状态") @Excel(name = "隐患状态")
private String reformStatus; private int reformStatus;
/** 超期状态 0-正常 1-超期 */ /** 超期状态 0-正常 1-超期 */
@Excel(name = "超期状态") @Excel(name = "超期状态")
@ -144,12 +144,12 @@ public class HiddenDanger extends BaseEntity
{ {
return reformMeasures; return reformMeasures;
} }
public void setReformStatus(String reformStatus) public void setReformStatus(int reformStatus)
{ {
this.reformStatus = reformStatus; this.reformStatus = reformStatus;
} }
public String getReformStatus() public int getReformStatus()
{ {
return reformStatus; return reformStatus;
} }

8
hbt-safety-supervision/hbt-safety-supervision-biz/src/main/java/com/hbt/safety/supervision/pojo/MajorHazardSources.java
View File

@ -61,8 +61,8 @@ public class MajorHazardSources extends BaseEntity
@Excel(name = "危险源统一编码") @Excel(name = "危险源统一编码")
private String unifiedCoding; private String unifiedCoding;
/** 单元类型 */ /** 单元类型 0-生产单元 1-存储单元*/
private String unitType; private int unitType;
/** 当前存储量 */ /** 当前存储量 */
private String memorySpace; private String memorySpace;
@ -186,11 +186,11 @@ public class MajorHazardSources extends BaseEntity
this.unifiedCoding = unifiedCoding; this.unifiedCoding = unifiedCoding;
} }
public String getUnitType() { public int getUnitType() {
return unitType; return unitType;
} }
public void setUnitType(String unitType) { public void setUnitType(int unitType) {
this.unitType = unitType; this.unitType = unitType;
} }

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

@ -117,12 +117,12 @@ public class MajorHazardSourcesServiceImpl implements IMajorHazardSourcesService
// 获取生产单元数量 // 获取生产单元数量
int productionUnit = (int) list.stream() int productionUnit = (int) list.stream()
.filter(s -> s.getUnitType().equals("生产单元")).count(); .filter(s -> s.getUnitType() == 0).count();
map.put("productionUnit", productionUnit); map.put("productionUnit", productionUnit);
// 获取存储单元数量 // 获取存储单元数量
int storageCell = (int) list.stream() int storageCell = (int) list.stream()
.filter(s -> s.getUnitType().equals("存储单元")).count(); .filter(s -> s.getUnitType() == 0).count();
map.put("storageCell", storageCell); map.put("storageCell", storageCell);
return JSONObject.toJSONString(map); return JSONObject.toJSONString(map);