diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java index c36d6ff..429469f 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java @@ -264,6 +264,7 @@ public class KeyProjectQueryExe { penaltyParams.put("pageIndex", 1); penaltyParams.put("pageSize", 1); penaltyParams.put("fineFlag", "0"); + penaltyParams.put("editFlag", "0"); penaltyParams.put("currentUserId", id); int pCount = hiddenPenaltyRepository.listPage(penaltyParams).getTotalCount(); Long penaltyCount = (long) pCount; @@ -315,7 +316,6 @@ public class KeyProjectQueryExe { public PageResponse largeScreenVideoPage(KeyProjectLargeScreenVideoPageQry qry) { Map params = PageQueryHelper.toHashMap(qry); - params.put("corpinfoId", AuthContext.getTenantId()); params.put("cameraType", KeyProjectCameraTypeEnum.FIXED_CAMERA.getCode()); PageResponse pageResponse = keyProjectRepository.largeScreenVideoPage(params); List result = pageResponse.getData().stream().map(data -> { diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java index 416214b..543b4a7 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/clientobject/project/CorpStatisticsCO.java @@ -22,6 +22,9 @@ public class CorpStatisticsCO implements Serializable { @ApiModelProperty(value = "企业名称") private String corpinfoName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + @ApiModelProperty(value = "重点作业总数") private Integer totalProjectCount; diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java index a1f3d11..3340c4a 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/CorpStatisticsPageQry.java @@ -27,5 +27,8 @@ public class CorpStatisticsPageQry extends PageQuery { @ApiModelProperty(value = "公司名称") private String corpinfoName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + } diff --git a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java index 00d30ce..41e52ae 100644 --- a/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java +++ b/web-client/src/main/java/com/zcloud/key/project/dto/project/KeyProjectLargeScreenVideoPageQry.java @@ -2,6 +2,7 @@ package com.zcloud.key.project.dto.project; import com.alibaba.cola.dto.PageQuery; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; /** @@ -13,4 +14,10 @@ import lombok.Data; @Data @ApiModel("可视化大屏固定摄像头视频分页请求") public class KeyProjectLargeScreenVideoPageQry extends PageQuery { + + @ApiModelProperty(value = "企业id", name = "corpinfoId") + private Long corpinfoId; + + @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea") + private Integer portArea; } diff --git a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java index d3595f6..82042ba 100644 --- a/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java +++ b/web-infrastructure/src/main/java/com/zcloud/key/project/persistence/dataobject/project/CorpStatisticsDO.java @@ -21,6 +21,9 @@ public class CorpStatisticsDO implements Serializable { @ApiModelProperty(value = "企业名称") private String corpinfoName; + @ApiModelProperty(value = "企业类型(0-普通企业，1-集团单位，2-股份单位，3-相关方企业，4-货主单位，5-驻港单位)") + private Integer type; + @ApiModelProperty(value = "重点作业总数") private Integer totalProjectCount; diff --git a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml index 0a39c00..93cb52c 100644 --- a/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml @@ -104,6 +104,9 @@ AND hp.fine_flag = #{params.fineFlag} + + AND hp.edit_flag = #{params.editFlag} + AND ( hp.create_id = #{params.currentUserId} diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml index 610cb81..84d1437 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml @@ -75,9 +75,6 @@ SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType FROM fixed_camera mc WHERE mc.delete_enum = 'FALSE' - - AND mc.corpinfo_id = #{params.corpinfoId} - UNION ALL SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType FROM mobile_camera mc diff --git a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml index 2d43962..779adea 100644 --- a/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml +++ b/web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml @@ -221,6 +221,7 @@