diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java index 88aa352..cc2da6b 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/PersonApplyQueryExe.java @@ -71,7 +71,7 @@ public class PersonApplyQueryExe { if (!examCenterCOS.isEmpty()) { examCenterCOS.forEach(item -> { item.setCurrentUserCanAudit(2); - if (item.getAuditUserId().equals(userId)) { + if (userId.equals(item.getAuditUserId())) { item.setCurrentUserCanAudit(1); } }); diff --git a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java index 984085c..f114f4a 100644 --- a/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java +++ b/web-app/src/main/java/com/zcloud/primeport/command/query/VehicleAuditQueryExe.java @@ -57,8 +57,7 @@ public class VehicleAuditQueryExe { Map parmas = PageQueryHelper.toHashMap(qry); PageResponse vehicleAuditDOPageResponse = vehicleAuditRepository.carApprovalLogByvehicleApplyIdList(parmas); List vehicleAuditCOS = vehicleAuditCoConvertor.converDOsToCOs(vehicleAuditDOPageResponse.getData()); - return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(), - vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex()); + return PageResponse.of(vehicleAuditCOS, vehicleAuditDOPageResponse.getTotalCount(), vehicleAuditDOPageResponse.getPageSize(), vehicleAuditDOPageResponse.getPageIndex()); } public VehicleAuditCO getInfoById(Long id) { 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 6dac373..09edb2e 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 @@ -292,7 +292,9 @@ 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"); + 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"); private final String path; private final String menuKey; diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java index bd35c38..d84269d 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/VehicleApplyRepositoryImpl.java @@ -63,9 +63,10 @@ public class VehicleApplyRepositoryImpl extends BaseRepositoryImpl AND f.employee_vehicle_user_id = #{params.employeeVehicleUserId} + order by f.id desc