Merge remote-tracking branch 'origin/dev' into dev_dahua_department

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);
     }
+
+    //口门进出记录，人员通道和车辆通道
+
+    //一个或多个企业的，进入了，没有出去的车数量和人的数量
 }

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

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>

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>

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>

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>