From b2cbf09902f8d1b3a697f55e9788af23fe508351 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Thu, 30 Jul 2026 08:38:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(dashboard):=20=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../primeport/command/query/DashboardQueryExe.java    |  2 +-
 .../resources/mapper/ClosedAreaCarApplyMapper.xml     |  4 +++-
 .../resources/mapper/ClosedAreaPersonApplyMapper.xml  |  4 +++-
 .../src/main/resources/mapper/PersonApplyDO.xml       |  4 +++-
 .../src/main/resources/mapper/VehicleApplyDO.xml      | 11 +++++++----
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java
index 99216ed..f035e1d 100644
--- a/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java
+++ b/web-app/src/main/java/com/zcloud/primeport/command/query/DashboardQueryExe.java
@@ -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);
diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
index ee5167a..0235594 100644
--- a/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaCarApplyMapper.xml
@@ -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>
diff --git a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
index dd8f223..a9eed60 100644
--- a/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/ClosedAreaPersonApplyMapper.xml
@@ -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>
diff --git a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml
index 8b7bf18..e917715 100644
--- a/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml
+++ b/web-infrastructure/src/main/resources/mapper/PersonApplyDO.xml
@@ -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>
diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
index 448530b..7466948 100644
--- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
+++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml
@@ -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>

From 19fb2f0d4337f9c3e531c7b3655b14fa68b15f74 Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Sat, 1 Aug 2026 09:54:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(dashboard):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E5=99=A8=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 为
---
 .../java/com/zcloud/primeport/web/DashboardController.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java b/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java
index 3730bd9..cbc0edb 100644
--- a/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java
+++ b/web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java
@@ -22,15 +22,20 @@ import org.springframework.web.bind.annotation.RestController;
 public class DashboardController {
     private final DashboardServiceI dashboardService;
 
+    //统计当天的进出数量 人和车
     @ApiOperation("可视化大屏-记录统计")
     @PostMapping("/recordStat")
     public SingleResponse<DashboardRecordStatCO> recordStat(@RequestBody DashboardRecordStatCmd cmd) {
         return dashboardService.recordStat(cmd);
     }
-
+    // 统计当天的口门进入进出记录数量，根据口门统计
     @ApiOperation("可视化大屏-口门进入进出记录统计")
     @PostMapping("/mkmjRecord")
     public MultiResponse<DashboardMkmjRecordCO> mkmjRecord(@RequestBody DashboardMkmjRecordCmd cmd) {
         return dashboardService.mkmjRecord(cmd);
     }
+
+    //口门进出记录，人员通道和车辆通道
+
+    //一个或多个企业的，进入了，没有出去的车数量和人的数量
 }