Merge branch 'dev_visual_page' into dev

web-adapter/src/main/java/com/zcloud/primeport/web/DashboardController.java

@@ -0,0 +1,36 @@
+package com.zcloud.primeport.web;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.primeport.api.DashboardServiceI;
+import com.zcloud.primeport.dto.DashboardMkmjRecordCmd;
+import com.zcloud.primeport.dto.DashboardRecordStatCmd;
+import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO;
+import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@Api(tags = "可视化大屏-信息统计")
+@RequestMapping("/${application.gateway}/dashboard")
+@RestController
+@AllArgsConstructor
+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

@@ -0,0 +1,69 @@
+package com.zcloud.primeport.command.query;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.primeport.dto.DashboardMkmjRecordCmd;
+import com.zcloud.primeport.dto.DashboardRecordStatCmd;
+import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO;
+import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO;
+import com.zcloud.primeport.persistence.dataobject.MkmjDO;
+import com.zcloud.primeport.persistence.repository.ClosedAreaCarApplyRepository;
+import com.zcloud.primeport.persistence.repository.ClosedAreaPersonApplyRepository;
+import com.zcloud.primeport.persistence.repository.MkmjRepository;
+import com.zcloud.primeport.persistence.repository.PersonApplyRepository;
+import com.zcloud.primeport.persistence.repository.VehicleApplyRepository;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Component
+@AllArgsConstructor
+public class DashboardQueryExe {
+    private final PersonApplyRepository personApplyRepository;
+    private final VehicleApplyRepository vehicleApplyRepository;
+    private final ClosedAreaPersonApplyRepository closedAreaPersonApplyRepository;
+    private final ClosedAreaCarApplyRepository closedAreaCarApplyRepository;
+    private final MkmjRepository mkmjRepository;
+
+    public SingleResponse<DashboardRecordStatCO> recordStat(DashboardRecordStatCmd cmd) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("corpinfoId", cmd.getCorpinfoId());
+        params.put("portArea", cmd.getPortArea());
+
+        DashboardRecordStatCO co = new DashboardRecordStatCO();
+        // TODO 进出统计待后续接入
+        co.setOneLevelInoutPersonCount(0);
+        co.setOneLevelInoutCarCount(0);
+        co.setClosedAreaInoutPersonCount(0);
+        co.setClosedAreaInoutCarCount(0);
+        co.setOneLevelApprovalPersonCount(personApplyRepository.countDashboardApproval(params));
+        co.setOneLevelApprovalCarCount(vehicleApplyRepository.countDashboardApproval(params));
+        co.setClosedAreaApprovalPersonCount(closedAreaPersonApplyRepository.countDashboardApproval(params));
+        co.setClosedAreaApprovalCarCount(closedAreaCarApplyRepository.countDashboardApproval(params));
+        return SingleResponse.of(co);
+    }
+
+    public MultiResponse<DashboardMkmjRecordCO> mkmjRecord(DashboardMkmjRecordCmd cmd) {
+        Map<String, Object> params = new HashMap<>();
+        params.put("corpinfoId", cmd.getCorpinfoId());
+        params.put("portArea", cmd.getPortArea());
+        params.put("mkmjLevel", cmd.getMkmjLevel());
+        params.put("mkmjType", cmd.getMkmjType());
+
+        List<MkmjDO> dataList = mkmjRepository.listDashboardRecord(params);
+        List<DashboardMkmjRecordCO> result = new ArrayList<>();
+        for (MkmjDO data : dataList) {
+            DashboardMkmjRecordCO co = new DashboardMkmjRecordCO();
+            BeanUtils.copyProperties(data, co);
+            co.setInCount(0);
+            co.setOutCount(0);
+            result.add(co);
+        }
+        return MultiResponse.of(result);
+    }
+}

web-app/src/main/java/com/zcloud/primeport/service/DashboardServiceImpl.java

@@ -0,0 +1,28 @@
+package com.zcloud.primeport.service;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.primeport.api.DashboardServiceI;
+import com.zcloud.primeport.command.query.DashboardQueryExe;
+import com.zcloud.primeport.dto.DashboardMkmjRecordCmd;
+import com.zcloud.primeport.dto.DashboardRecordStatCmd;
+import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO;
+import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO;
+import lombok.AllArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class DashboardServiceImpl implements DashboardServiceI {
+    private final DashboardQueryExe dashboardQueryExe;
+
+    @Override
+    public SingleResponse<DashboardRecordStatCO> recordStat(DashboardRecordStatCmd cmd) {
+        return dashboardQueryExe.recordStat(cmd);
+    }
+
+    @Override
+    public MultiResponse<DashboardMkmjRecordCO> mkmjRecord(DashboardMkmjRecordCmd cmd) {
+        return dashboardQueryExe.mkmjRecord(cmd);
+    }
+}

web-client/src/main/java/com/zcloud/primeport/api/DashboardServiceI.java

@@ -0,0 +1,14 @@
+package com.zcloud.primeport.api;
+
+import com.alibaba.cola.dto.MultiResponse;
+import com.alibaba.cola.dto.SingleResponse;
+import com.zcloud.primeport.dto.DashboardMkmjRecordCmd;
+import com.zcloud.primeport.dto.DashboardRecordStatCmd;
+import com.zcloud.primeport.dto.clientobject.DashboardMkmjRecordCO;
+import com.zcloud.primeport.dto.clientobject.DashboardRecordStatCO;
+
+public interface DashboardServiceI {
+    SingleResponse<DashboardRecordStatCO> recordStat(DashboardRecordStatCmd cmd);
+
+    MultiResponse<DashboardMkmjRecordCO> mkmjRecord(DashboardMkmjRecordCmd cmd);
+}

web-client/src/main/java/com/zcloud/primeport/dto/DashboardMkmjRecordCmd.java

@@ -0,0 +1,20 @@
+package com.zcloud.primeport.dto;
+
+import com.alibaba.cola.dto.Command;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DashboardMkmjRecordCmd extends Command {
+    @ApiModelProperty(value = "企业id", name = "corpinfoId")
+    private Long corpinfoId;
+
+    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
+    private Integer portArea;
+
+    @ApiModelProperty(value = "口门级别 1-一级 2-二级", name = "mkmjLevel")
+    private Integer mkmjLevel;
+
+    @ApiModelProperty(value = "口门类型 1-人行 2-车行 3-综合", name = "mkmjType")
+    private String mkmjType;
+}

web-client/src/main/java/com/zcloud/primeport/dto/DashboardRecordStatCmd.java

@@ -0,0 +1,14 @@
+package com.zcloud.primeport.dto;
+
+import com.alibaba.cola.dto.Command;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DashboardRecordStatCmd extends Command {
+    @ApiModelProperty(value = "企业id", name = "corpinfoId")
+    private Long corpinfoId;
+
+    @ApiModelProperty(value = "港区，1:秦皇岛港区,2:秦皇岛东,3:秦皇岛西", name = "portArea")
+    private Integer portArea;
+}

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardMkmjRecordCO.java

@@ -0,0 +1,38 @@
+package com.zcloud.primeport.dto.clientobject;
+
+import com.alibaba.cola.dto.ClientObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DashboardMkmjRecordCO extends ClientObject {
+    @ApiModelProperty(value = "口门id")
+    private Long id;
+
+    @ApiModelProperty(value = "所属港区编码")
+    private String hgAuthArea;
+
+    @ApiModelProperty(value = "所属港区名称")
+    private String hgAuthAreaName;
+
+    @ApiModelProperty(value = "口门名称")
+    private String mkmjName;
+
+    @ApiModelProperty(value = "口门级别")
+    private Integer mkmjLevel;
+
+    @ApiModelProperty(value = "口门类型")
+    private String mkmjType;
+
+    @ApiModelProperty(value = "口门类型名称")
+    private String mkmjTypeName;
+
+    @ApiModelProperty(value = "管辖企业id")
+    private Long mkmjAreaJurisdictionalCorpId;
+
+    @ApiModelProperty(value = "进入数量")
+    private Integer inCount;
+
+    @ApiModelProperty(value = "进出数量")
+    private Integer outCount;
+}

web-client/src/main/java/com/zcloud/primeport/dto/clientobject/DashboardRecordStatCO.java

@@ -0,0 +1,32 @@
+package com.zcloud.primeport.dto.clientobject;
+
+import com.alibaba.cola.dto.ClientObject;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class DashboardRecordStatCO extends ClientObject {
+    @ApiModelProperty(value = "一级口门进出统计-人")
+    private Integer oneLevelInoutPersonCount;
+
+    @ApiModelProperty(value = "一级口门进出统计-车")
+    private Integer oneLevelInoutCarCount;
+
+    @ApiModelProperty(value = "一级口门进出审批-人")
+    private Integer oneLevelApprovalPersonCount;
+
+    @ApiModelProperty(value = "一级口门进出审批-车")
+    private Integer oneLevelApprovalCarCount;
+
+    @ApiModelProperty(value = "封闭区域进出统计-人")
+    private Integer closedAreaInoutPersonCount;
+
+    @ApiModelProperty(value = "封闭区域进出统计-车")
+    private Integer closedAreaInoutCarCount;
+
+    @ApiModelProperty(value = "封闭区域进出审批-人")
+    private Integer closedAreaApprovalPersonCount;
+
+    @ApiModelProperty(value = "封闭区域进出审批-车")
+    private Integer closedAreaApprovalCarCount;
+}

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaCarApplyMapper.java

@@ -27,6 +27,8 @@ public interface ClosedAreaCarApplyMapper extends BaseMapper<ClosedAreaCarApplyD
 
     IPage<ClosedAreaCarApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
 
+    Integer countDashboardApproval(@Param("params") Map<String, Object> params);
+
     IPage<ClosedAreaCarApplyDO> screenList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params);
 
     List<TwoLevelCar> getFgsCarToDay(String licenceNo);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaPersonApplyMapper.java

@@ -33,6 +33,8 @@ public interface ClosedAreaPersonApplyMapper extends BaseMapper<ClosedAreaPerson
 
     IPage<ClosedAreaPersonApplyDO> screenList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params);
 
+    Integer countDashboardApproval(@Param("params") Map<String, Object> params);
+
     List<TwoLevelUser> getDockAuthInfoById(Long applyId);
 
     List<ClosedAreaPersonApplyDeptDO> deptList();

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/MkmjMapper.java

@@ -28,5 +28,7 @@ public interface MkmjMapper extends BaseMapper<MkmjDO> {
     IPage<MkmjDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
 
     List<MkmjStatisticsDO> listStatistics();
+
+    List<MkmjDO> listDashboardRecord(@Param("params") Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/PersonApplyMapper.java

@@ -28,6 +28,8 @@ public interface PersonApplyMapper extends BaseMapper<PersonApplyDO> {
 
     IPage<PersonApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
 
+    Integer countDashboardApproval(@Param("params") Map<String, Object> params);
+
     IPage<PersonApplyDO> xgfPersonPermissionsList(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
 
     IPage<PersonApplyDO> xgfPersonnelVehicleManagementList(Page<Map<String, Object>> page, Map<String, Object> params, String menuPerms);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java

@@ -31,6 +31,8 @@ public interface VehicleApplyMapper extends BaseMapper<VehicleApplyDO> {
 
     IPage<VehicleApplyDO> listPage(Page<Map<String, Object>> page, @Param("params") Map<String, Object> params, String menuPerms);
 
+    Integer countDashboardApproval(@Param("params") Map<String, Object> params);
+
     IPage<FgsVehicleCountDto> fgsCount(Page<Map<String, Object>> page, @Param("params") HashMap<String, Object> qry);
 
     VehicleApplyDO getInfoById(Long id);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaCarApplyRepository.java

@@ -17,6 +17,8 @@ import java.util.Map;
 public interface ClosedAreaCarApplyRepository extends BaseRepository<ClosedAreaCarApplyDO> {
     PageResponse<ClosedAreaCarApplyDO> listPage(Map<String, Object> params);
 
+    Integer countDashboardApproval(Map<String, Object> params);
+
     PageResponse<ClosedAreaCarApplyDO> screenList(Map<String, Object> params);
 
     List<TwoLevelCar> getFgsCarToDay(String licenceNo);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaPersonApplyRepository.java

@@ -21,6 +21,8 @@ import java.util.Map;
 public interface ClosedAreaPersonApplyRepository extends BaseRepository<ClosedAreaPersonApplyDO> {
     PageResponse<ClosedAreaPersonApplyDO> listPage(Map<String,Object> params);
 
+    Integer countDashboardApproval(Map<String, Object> params);
+
     List <ClosedAreaPersonApplyDeptDO> deptList();
 
     PageResponse<UserDto> getCorpUserList(Map<String, Object> params);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/MkmjRepository.java

@@ -14,5 +14,7 @@ public interface MkmjRepository extends BaseRepository<MkmjDO> {
     Boolean checkName(String mkmjName, Long excludeId);
 
     List<MkmjStatisticsDO> listStatistics();
+
+    List<MkmjDO> listDashboardRecord(Map<String, Object> params);
 }
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/PersonApplyRepository.java

@@ -14,6 +14,8 @@ import java.util.Map;
 public interface PersonApplyRepository extends BaseRepository<PersonApplyDO> {
     PageResponse<PersonApplyDO> listPage(Map<String, Object> params);
 
+    Integer countDashboardApproval(Map<String, Object> params);
+
     PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> params);
 
     PageResponse<PersonApplyDO> xgfPersonnelVehicleManagementList(Map<String, Object> parmas);

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/VehicleApplyRepository.java

@@ -20,6 +20,8 @@ import java.util.Map;
 public interface VehicleApplyRepository extends BaseRepository<VehicleApplyDO> {
     PageResponse<VehicleApplyDO> listPage(Map<String, Object> params);
 
+    Integer countDashboardApproval(Map<String, Object> params);
+
     PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, Object> qry);
 
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaCarApplyRepositoryImpl.java

@@ -41,6 +41,11 @@ public class ClosedAreaCarApplyRepositoryImpl extends BaseRepositoryImpl<ClosedA
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
+    @Override
+    public Integer countDashboardApproval(Map<String, Object> params) {
+        return closedAreaCarApplyMapper.countDashboardApproval(params);
+    }
+
     @Override
     public PageResponse<ClosedAreaCarApplyDO> screenList(Map<String, Object> params) {
         Page<Map<String, Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString()),

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaPersonApplyRepositoryImpl.java

@@ -50,6 +50,11 @@ public class ClosedAreaPersonApplyRepositoryImpl extends BaseRepositoryImpl<Clos
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
+    @Override
+    public Integer countDashboardApproval(Map<String, Object> params) {
+        return closedAreaPersonApplyMapper.countDashboardApproval(params);
+    }
+
 
     @Override
     public List <ClosedAreaPersonApplyDeptDO> deptList() {

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/MkmjRepositoryImpl.java

@@ -51,6 +51,11 @@ public class MkmjRepositoryImpl extends BaseRepositoryImpl<MkmjMapper, MkmjDO> i
     public List<MkmjStatisticsDO> listStatistics() {
         return mkmjMapper.listStatistics();
     }
+
+    @Override
+    public List<MkmjDO> listDashboardRecord(Map<String, Object> params) {
+        return mkmjMapper.listDashboardRecord(params);
+    }
 }
 
 

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/PersonApplyRepositoryImpl.java

@@ -44,6 +44,11 @@ public class PersonApplyRepositoryImpl extends BaseRepositoryImpl<PersonApplyMap
         return PageHelper.pageToResponse(iPage, iPage.getRecords());
     }
 
+    @Override
+    public Integer countDashboardApproval(Map<String, Object> params) {
+        return personApplyMapper.countDashboardApproval(params);
+    }
+
     @Override
     public PageResponse<PersonApplyDO> xgfPersonPermissionsList(Map<String, Object> params) {
         Page<Map<String, Object>> page = new Page<>(Integer.parseInt(params.get("pageIndex").toString())

web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java

@@ -49,6 +49,11 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl<VehicleApplyM
         return PageHelper.pageToResponse(result, result.getRecords());
     }
 
+    @Override
+    public Integer countDashboardApproval(Map<String, Object> params) {
+        return vehicleApplyMapper.countDashboardApproval(params);
+    }
+
     @Override
     public PageResponse<FgsVehicleCountDto> fgsCount(HashMap<String, Object> qry) {
         Page<Map<String, Object>> page = new Page<>(Integer.parseInt(qry.get("pageIndex").toString()),

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

@@ -61,6 +61,20 @@
         </if>
         order by c.id desc
     </select>
+    <select id="countDashboardApproval" resultType="java.lang.Integer">
+        SELECT COUNT(c.id)
+        FROM closed_area_car_apply c
+                 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
+        <if test="params.corpinfoId != null">
+            AND ca.jurisdictional_corp_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND ci.port_area = #{params.portArea}
+        </if>
+    </select>
     <select id="getFgsCarToDay" resultType="com.zcloud.primeport.plan.mjDevice.dto.TwoLevelCar">
         SELECT
             caca.licence_no,

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

@@ -122,6 +122,20 @@
         </if>
         order by c.id desc
     </select>
+    <select id="countDashboardApproval" resultType="java.lang.Integer">
+        SELECT COUNT(c.id)
+        FROM closed_area_person_apply c
+                 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
+        <if test="params.corpinfoId != null">
+            AND ca.jurisdictional_corp_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND ci.port_area = #{params.portArea}
+        </if>
+    </select>
 
     <select id="deptList" resultType="com.zcloud.primeport.persistence.dataobject.ClosedAreaPersonApplyDeptDO">
         SELECT DISTINCT

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

@@ -75,5 +75,32 @@
                      ELSE 3
                  END
     </select>
+    <select id="listDashboardRecord" resultType="com.zcloud.primeport.persistence.dataobject.MkmjDO">
+        SELECT
+            m.id,
+            m.hg_auth_area,
+            m.hg_auth_area_name,
+            m.mkmj_name,
+            m.mkmj_level,
+            m.mkmj_type,
+            m.mkmj_type_name,
+            m.mkmj_area_jurisdictional_corp_id
+        FROM mkmj m
+                 LEFT JOIN corp_info ci ON m.mkmj_area_jurisdictional_corp_id = ci.id AND ci.delete_enum = 'FALSE'
+        WHERE m.delete_enum = 'false'
+        <if test="params.corpinfoId != null">
+            AND m.mkmj_area_jurisdictional_corp_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND ci.port_area = #{params.portArea}
+        </if>
+        <if test="params.mkmjLevel != null">
+            AND m.mkmj_level = #{params.mkmjLevel}
+        </if>
+        <if test="params.mkmjType != null and params.mkmjType != ''">
+            AND m.mkmj_type = #{params.mkmjType}
+        </if>
+        ORDER BY m.create_time DESC
+    </select>
 </mapper>
 

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

@@ -5,6 +5,20 @@
 <mapper namespace="com.zcloud.primeport.persistence.mapper.PersonApplyMapper">
 
     <select id="listPage" resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO"></select>
+    <select id="countDashboardApproval" resultType="java.lang.Integer">
+        SELECT COUNT(pa.id)
+        FROM person_apply pa
+                 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
+        <if test="params.corpinfoId != null">
+            AND xap.apply_corp_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND ci.port_area = #{params.portArea}
+        </if>
+    </select>
     <select id="xgfPersonPermissionsList"
             resultType="com.zcloud.primeport.persistence.dataobject.PersonApplyDO">
         SELECT

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

@@ -93,6 +93,19 @@
         </if>
         order by f.id desc
     </select>
+    <select id="countDashboardApproval" resultType="java.lang.Integer">
+        SELECT COUNT(f.id)
+        FROM vehicle_apply f
+                 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
+        <if test="params.corpinfoId != null">
+            AND f.vehicle_corp_id = #{params.corpinfoId}
+        </if>
+        <if test="params.portArea != null">
+            AND ci.port_area = #{params.portArea}
+        </if>
+    </select>
     <select id="fgsCount" resultType="com.zcloud.primeport.persistence.dataobject.FgsVehicleCountDto">
         SELECT
             c.id corp_id,