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

feat(): 添加editFlag查询条件，移除固定摄像头corpinfoId过滤

main
lishiwei 2026-08-08 09:05:36 +08:00
parent b6f6cc31c2
commit 431b05bf94
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
web-app/src/main/java/com/zcloud/key/project/command/query/project/KeyProjectQueryExe.java
View File

@ -264,6 +264,7 @@ public class KeyProjectQueryExe {
penaltyParams.put("pageIndex", 1); penaltyParams.put("pageIndex", 1);
penaltyParams.put("pageSize", 1); penaltyParams.put("pageSize", 1);
penaltyParams.put("fineFlag", "0"); penaltyParams.put("fineFlag", "0");
penaltyParams.put("editFlag", "0");
penaltyParams.put("currentUserId", id); penaltyParams.put("currentUserId", id);
int pCount = hiddenPenaltyRepository.listPage(penaltyParams).getTotalCount(); int pCount = hiddenPenaltyRepository.listPage(penaltyParams).getTotalCount();
Long penaltyCount = (long) pCount; Long penaltyCount = (long) pCount;

3
web-infrastructure/src/main/resources/mapper/HiddenPenaltyMapper.xml
View File

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

3
web-infrastructure/src/main/resources/mapper/KeyProjectCameraMapper.xml
View File

@ -75,9 +75,6 @@
SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType SELECT mc.fixed_camera_id as cameraId, mc.video_name as cameraName, 1 as cameraType
FROM fixed_camera mc FROM fixed_camera mc
WHERE mc.delete_enum = 'FALSE' WHERE mc.delete_enum = 'FALSE'
<if test="params.corpinfoId != null">
AND mc.corpinfo_id = #{params.corpinfoId}
</if>
UNION ALL UNION ALL
SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType SELECT mc.mobile_camera_id as cameraId, mc.video_name as cameraName, 2 as cameraType
FROM mobile_camera mc FROM mobile_camera mc