Merge branch 'dev_change0814_page' into dev

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<KeyProjectLargeScreenVideoCO> largeScreenVideoPage(KeyProjectLargeScreenVideoPageQry qry) {
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
-        params.put("corpinfoId", AuthContext.getTenantId());
         params.put("cameraType", KeyProjectCameraTypeEnum.FIXED_CAMERA.getCode());
         PageResponse<KeyProjectLargeScreenVideoDO> pageResponse = keyProjectRepository.largeScreenVideoPage(params);
         List<KeyProjectLargeScreenVideoCO> result = pageResponse.getData().stream().map(data -> {

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;
 

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

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

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;
 

web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml

@@ -104,6 +104,9 @@
             <if test="params.fineFlag != null and params.fineFlag != ''">
                 AND hp.fine_flag = #{params.fineFlag}
             </if>
+            <if test="params.editFlag != null and params.editFlag != ''">
+                AND hp.edit_flag = #{params.editFlag}
+            </if>
             <if test="params.currentUserId != null">
                 AND (
                     hp.create_id = #{params.currentUserId}

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'
-        <if test="params.corpinfoId != null">
-            AND mc.corpinfo_id = #{params.corpinfoId}
-        </if>
         UNION ALL
         SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType
         FROM mobile_camera mc

web-infrastructure/src/main/resources/mapper/KeyProjectMapper.xml

@@ -221,6 +221,7 @@
     <select id="corpStatistics" resultType="com.zcloud.key.project.persistence.dataobject.project.CorpStatisticsDO">
         SELECT cp.id AS corpinfoId,
             cp.corp_name AS corpinfoName,
+            cp.type AS type,
             COUNT(distinct kp.id) AS totalProjectCount,
             COUNT(DISTINCT CASE WHEN kp.apply_status in (4) THEN kp.id END) AS startCount,
             COUNT(DISTINCT CASE WHEN kp.apply_status = 6 THEN kp.id END) AS completeCount,
@@ -267,7 +268,14 @@
             ) hz ON hz.find_corp_id = cp.id
         WHERE cp.delete_enum = 'FALSE'
             AND cp.use_flag = 1
+            <choose>
+                <when test="params.type != null">
+                    AND cp.type = #{params.type}
+                </when>
+                <otherwise>
                     AND cp.type IN (0, 1, 2, 6)
+                </otherwise>
+            </choose>
             <if test="params.corpinfoName != null and params.corpinfoName != ''">
                 AND cp.corp_name like concat('%',#{params.corpinfoName},'%')
             </if>
@@ -683,9 +691,16 @@
             AND kpc.camera_type = #{params.cameraType}
         INNER JOIN fixed_camera fc ON kpc.camera_id = fc.fixed_camera_id
             AND fc.delete_enum = 'FALSE'
+        LEFT JOIN corp_info cp ON kp.jurisdiction_corpinfo_id = cp.id
         WHERE kp.delete_enum = 'FALSE'
           AND kp.apply_status IN (2, 4, 5)
+         
+        <if test="params.corpinfoId != null">
             AND kp.jurisdiction_corpinfo_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND cp.port_area = #{params.portArea}
+        </if>
         ORDER BY kp.apply_status ASC, kp.create_time DESC, kpc.create_time DESC
     </select>