zcloud_gbs
/
zcloud-gbs-primeport
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev_visual_page' into dev

dev
zhaokai 2026-07-30 08:38:44 +08:00
parent 1d93c0a201 b2cbf09902
commit 1ba3106787
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java
View File

@ -36,7 +36,7 @@ public class DashboardQueryExe {
params.put("portArea", cmd.getPortArea());
DashboardRecordStatCO co = new DashboardRecordStatCO();
// TODO 进出统计待后续接入
// TODO 进出统计待后续接入，统计纬度是当天的数据
co.setOneLevelInoutPersonCount(0);
co.setOneLevelInoutCarCount(0);
co.setClosedAreaInoutPersonCount(0);

4
web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
View File

@ -67,7 +67,9 @@
LEFT JOIN closed_area ca ON c.closed_area_id = ca.id AND ca.delete_enum = 'FALSE'
LEFT JOIN corp_info ci ON ca.jurisdictional_corp_id = ci.id AND ci.delete_enum = 'FALSE'
WHERE c.delete_enum = 'FALSE'
AND c.audit_flag = 1
AND c.audit_flag IN (2, 3)
AND c.audit_time IS NOT NULL
AND DATE(c.audit_time) = CURDATE()
<if test="params.corpinfoId != null">
AND ca.jurisdictional_corp_id = #{params.corpinfoId}
</if>

4
web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
View File

@ -128,7 +128,9 @@
LEFT JOIN closed_area ca ON c.closed_area_id = ca.id AND ca.delete_enum = 'FALSE'
LEFT JOIN corp_info ci ON ca.jurisdictional_corp_id = ci.id AND ci.delete_enum = 'FALSE'
WHERE c.delete_enum = 'FALSE'
AND c.audit_flag = 1
AND c.audit_flag IN (2, 3)
AND c.audit_time IS NOT NULL
AND DATE(c.audit_time) = CURDATE()
<if test="params.corpinfoId != null">
AND ca.jurisdictional_corp_id = #{params.corpinfoId}
</if>

4
web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml
View File

@ -11,7 +11,9 @@
LEFT JOIN xgf_apply_person xap ON pa.xgf_apply_person_id = xap.id AND xap.delete_enum = 'FALSE'
LEFT JOIN corp_info ci ON xap.apply_corp_id = ci.id AND ci.delete_enum = 'FALSE'
WHERE pa.delete_enum = 'FALSE'
AND xap.audit_flag = 1
AND xap.audit_flag IN (2, 3)
AND xap.audit_time IS NOT NULL
AND DATE(xap.audit_time) = CURDATE()
<if test="params.corpinfoId != null">
AND xap.apply_corp_id = #{params.corpinfoId}
</if>

11
web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
View File

@ -94,11 +94,14 @@
order by f.id desc
</select>
<select id="countDashboardApproval" resultType="java.lang.Integer">
SELECT COUNT(f.id)
FROM vehicle_apply f
SELECT COUNT(DISTINCT a.vehicle_apply_id)
FROM vehicle_audit a
LEFT JOIN vehicle_apply f ON a.vehicle_apply_id = f.id AND f.delete_enum = 'FALSE'
LEFT JOIN corp_info ci ON f.vehicle_corp_id = ci.id AND ci.delete_enum = 'FALSE'
WHERE f.delete_enum = 'FALSE'
AND f.audit_flag = 1
WHERE a.delete_enum = 'FALSE'
AND a.audit_status IN (2, 3)
AND a.audit_time IS NOT NULL
AND DATE(a.audit_time) = CURDATE()
<if test="params.corpinfoId != null">
AND f.vehicle_corp_id = #{params.corpinfoId}
</if>