From 35efb0118860fbece229c5a38bc0fd9d419e6a1d Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Thu, 26 Mar 2026 18:05:01 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=A9=BB=E6=B8=AF=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- start/src/main/resources/templates/primeport.html | 4 ++-- .../zcloud/primeport/domain/enums/MenuEnum.java | 14 ++++++++++++-- .../persistence/mapper/VehicleApplyMapper.java | 2 +- .../impl/VehicleViolationsRepositoryImpl.java | 2 +- .../src/main/resources/mapper/VehicleApplyDO.xml | 2 +- 5 files changed, 17 insertions(+), 7 deletions(-) diff --git a/start/src/main/resources/templates/primeport.html b/start/src/main/resources/templates/primeport.html index 4e282c8..23671e2 100644 --- a/start/src/main/resources/templates/primeport.html +++ b/start/src/main/resources/templates/primeport.html @@ -1,4 +1,4 @@ ---
\ No newline at end of file + })();
\ No newline at end of file diff --git a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java index 09edb2e..784a651 100644 --- a/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java +++ b/web-domain/src/main/java/com/zcloud/primeport/domain/enums/MenuEnum.java @@ -293,8 +293,18 @@ public enum MenuEnum { * 车辆封闭区域申请记录 */ XGS_CHE_LIANG_FENG_BI_QU_YU_SHEN_QING_JI_LU("/primeport/container/stakeholder/enclosedArea/apply/vehicleRecords/list", "xgs-che-liang-feng-bi-qu-yu-shen-qing-ji-lu"), - ZGDW_LSRYGL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list", "zgdw-lsrygljl"), - ZGDW_LSCLGL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list", "zgdw-lsclgljl"); + + ZGDW_MJSPR("/primeport/container/stakeholder/firstLevelDoor/approverUser", "zgdw-mjspr"), + ZGDW_RYJCLGL("/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/stockPersonnelAndVehicles/list", "zgdw-ryjclgl"), + ZGDW_GRCLGL("/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/personalVehicle/list", "zgdw-grclgl"), + ZGDW_CLWGGL("/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehiclesViolation/list", "zgdw-clwggl"), + ZGDW_CLHMDGL("/primeport/container/stakeholder/firstLevelDoor/importAndExportPortInfo/vehiclesViolation/vehicleBlacklist/list", "zgdw-clhmdgl"), + ZGDW_JGSP_CLSP("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehicles", "zgdw-jgsp-clsp"), + ZGDW_CLSPJL("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/longTermVehicleApproval/shareVehiclesRecords", "zgdw-clspjl"), + ZGDW_LSRYGL("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnel/list", "zgdw-lsrygl"), + ZGDW_LSCLGL("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicle/list", "zgdw-lsclgl"), + ZGDW_LSRYGLJL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryPersonnelRecords/list", "zgdw-lsrygljl-record"), + ZGDW_LSCLGLJL_RECORD("/primeport/container/stakeholder/firstLevelDoor/portEntryApproval/temporaryVisitor/temporaryVehicleRecords/list", "zgdw-lsclgljl-record"); private final String path; private final String menuKey; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java index b6529d9..ac74191 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/VehicleApplyMapper.java @@ -27,7 +27,7 @@ public interface VehicleApplyMapper extends BaseMapper { IPage listPage(Page> page, @Param("params") Map params, String menuPerms); - IPage fgsCount(Page> page, HashMap qry); + IPage fgsCount(Page> page, @Param("params") HashMap qry); VehicleApplyDO getInfoById(Long id); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java index 228fa88..18135a3 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleViolationsRepositoryImpl.java @@ -37,7 +37,7 @@ public class VehicleViolationsRepositoryImpl extends BaseRepositoryImpl iPage = new Query().getPage(params); QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper = PageQueryHelper.createPageQueryWrapper(queryWrapper, params); - queryWrapper.eq(Tools.isEmpty(params.get("violationType")),"violation_type",params.get("violationType")); + queryWrapper.eq(!Tools.isEmpty(params.get("violationType")),"violation_type",params.get("violationType")); queryWrapper.eq("licence_no",params.get("licenceNo")); queryWrapper.orderByDesc("create_time"); IPage result = vehicleViolationsMapper.selectPage(iPage, queryWrapper); diff --git a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml index c28b8a5..d94e4fa 100644 --- a/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml +++ b/web-infrastructure/src/main/resources/mapper/VehicleApplyDO.xml @@ -41,7 +41,7 @@ a.audit_dept_name, a.audit_corp_name, a.audit_corp_id, - f.remarks check_department_name, + f.remarks check_department_name FROM vehicle_apply AS f LEFT JOIN vehicle_audit AS a ON f.id = a.vehicle_apply_id