zcloud_gbs
/
zcloud_gbs_fire_check_gwj
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(statistics): 添加企业类型筛选功能到统计查询

dev_change0814_page
zhaokai 2026-08-19 17:56:41 +08:00
parent 6408e4d8f2
commit cce38a856f
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web-app/src/main/java/com/zcloud/fire/check/command/query/FireCheckRecordQueryExe.java
View File

@ -150,7 +150,10 @@ public class FireCheckRecordQueryExe {
public PageResponse<CorpCheckStatisticsCO> corpCheckRecordList(CorpStatisticsPageQry qry) {
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
//企业端
params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode()));
List<Integer> corpTypes = qry.getType() == null
? CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())
: Collections.singletonList(qry.getType());
params.put("inType", corpTypes);
params.put("eqUseFlag", CommonFlagEnum.YES.getCode());
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(params);

5
web-app/src/main/java/com/zcloud/fire/check/command/query/FireDeviceQueryExe.java
View File

@ -180,7 +180,10 @@ public class FireDeviceQueryExe {
public PageResponse<CorpStatisticsCO> corpStatisticslist(CorpStatisticsPageQry qry) {
Map<String, Object> params = PageQueryHelper.toHashMap(qry);
//企业端
params.put("inType", CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode()));
List<Integer> corpTypes = qry.getType() == null
? CorpTypeEnum.getCodesByEnterpriseType(UserTypeEnum.QY.getCode())
: Collections.singletonList(qry.getType());
params.put("inType", corpTypes);
params.put("eqUseFlag", CommonFlagEnum.YES.getCode());
PageResponse<CorpInfoDO> pageResponse = corpInfoRepository.listPage(params);

3
web-client/src/main/java/com/zcloud/fire/check/dto/CorpStatisticsPageQry.java
View File

@ -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;
}

3
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpCheckStatisticsCO.java
View File

@ -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;

3
web-client/src/main/java/com/zcloud/fire/check/dto/clientobject/CorpStatisticsCO.java
View File

@ -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;