From cce38a856fab4f151cd92ab9d576fcaf091a79f1 Mon Sep 17 00:00:00 2001 From: zhaokai Date: Wed, 19 Aug 2026 17:56:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(statistics):=20=E6=B7=BB=E5=8A=A0=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E7=B1=BB=E5=9E=8B=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E5=88=B0=E7=BB=9F=E8=AE=A1=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fire/check/command/query/FireCheckRecordQueryExe.java | 5 ++++- .../zcloud/fire/check/command/query/FireDeviceQueryExe.java | 5 ++++- .../com/zcloud/fire/check/dto/CorpStatisticsPageQry.java | 3 +++ .../fire/check/dto/clientobject/CorpCheckStatisticsCO.java | 3 +++ .../zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java | 3 +++ 5 files changed, 17 insertions(+), 2 deletions(-) diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java index 5d9d9b5..b987449 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java @@ -150,7 +150,10 @@ public class FireCheckRecordQueryExe { public PageResponse corpCheckRecordList(CorpStatisticsPageQry qry) { Map params = PageQueryHelper.toHashMap(qry); //企业端 - params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + List corpTypes = qry.getType() == null + ? CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode()) + : Collections.singletonList(qry.getType()); + params.put("inType", corpTypes); params.put("eqUseFlag", CommonFlagEnum.YES.getCode()); PageResponse pageResponse = corpInfoRepository.listPage(params); diff --git a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java index 8a8a52f..52aba2b 100644 --- a/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java +++ b/web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java @@ -180,7 +180,10 @@ public class FireDeviceQueryExe { public PageResponse corpStatisticslist(CorpStatisticsPageQry qry) { Map params = PageQueryHelper.toHashMap(qry); //企业端 - params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())); + List corpTypes = qry.getType() == null + ? CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode()) + : Collections.singletonList(qry.getType()); + params.put("inType", corpTypes); params.put("eqUseFlag", CommonFlagEnum.YES.getCode()); PageResponse pageResponse = corpInfoRepository.listPage(params); diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java index 56baf26..792e674 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java @@ -31,5 +31,8 @@ public class CorpStatisticsPageQry extends PageQuery { @ApiModelProperty(value = "公司名称", name = "likeCorpName") private String likeCorpName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + } diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java index 4aecda6..6c729ad 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java @@ -21,6 +21,9 @@ public class CorpCheckStatisticsCO implements Serializable { @ApiModelProperty(value = "公司名称") private String corpName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + //检查次数 @ApiModelProperty(value = "检查次数") private Integer checkCount; diff --git a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java index ad12f9b..3bdabca 100644 --- a/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java @@ -24,6 +24,9 @@ public class CorpStatisticsCO implements Serializable { @ApiModelProperty(value = "公司名称") private String corpName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + //消防区域数量 @ApiModelProperty(value = "消防区域数量") private Integer fireRegionCount;