From c3b0bc977c10798c8ca52aafb444af14b678b228 Mon Sep 17 00:00:00 2001 From: dearLin <1261008090@qq.com> Date: Fri, 20 Mar 2026 09:57:32 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B0=81=E9=97=AD=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E4=BA=BA=E5=91=98=E7=94=B3=E8=AF=B7=E3=80=81=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E3=80=81=E6=8E=88=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../command/query/PersonApplyQueryExe.java | 30 +++++++++-------- .../command/query/VehicleAuditQueryExe.java | 17 ++++++---- .../mapper/ClosedAreaFgsPersonAreaMapper.java | 11 ++++--- .../ClosedAreaFgsPersonAreaRepository.java | 1 - ...ClosedAreaFgsPersonAreaRepositoryImpl.java | 33 +++++++++++++++++++ 5 files changed, 66 insertions(+), 26 deletions(-) create mode 100644 web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaFgsPersonAreaRepositoryImpl.java 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 8d11a8e..58d9a38 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 @@ -49,14 +49,16 @@ public class PersonApplyQueryExe { PageResponse pageResponse = xgfPersonApplyRepository.listPage(parmas); List examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData()); Long userId = AuthContext.getUserId(); - examCenterCOS.forEach(item -> { - item.setCurrentUserCanAudit(2); - if (item.getAuditFlag() == 1) { - if (item.getAuditUserId().equals(userId)) { - item.setCurrentUserCanAudit(1); + if (!examCenterCOS.isEmpty()) { + examCenterCOS.forEach(item -> { + item.setCurrentUserCanAudit(2); + if (item.getAuditFlag() == 1) { + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } } - } - }); + }); + } return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } @@ -65,12 +67,14 @@ public class PersonApplyQueryExe { PageResponse pageResponse = xgfPersonApplyRepository.xgfPersonAuditList(parmas); List examCenterCOS = xgfApplyPersonCoConvertor.converDOsToCOs(pageResponse.getData()); Long userId = AuthContext.getUserId(); - examCenterCOS.forEach(item -> { - item.setCurrentUserCanAudit(2); - if (item.getAuditUserId().equals(userId)) { - item.setCurrentUserCanAudit(1); - } - }); + if (!examCenterCOS.isEmpty()) { + examCenterCOS.forEach(item -> { + item.setCurrentUserCanAudit(2); + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } + }); + } return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } 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 00ccb38..984085c 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 @@ -39,14 +39,17 @@ public class VehicleAuditQueryExe { PageResponse pageResponse = vehicleAuditRepository.listPage(parmas); List examCenterCOS = vehicleAuditCoConvertor.converDOsToCOs(pageResponse.getData()); Long userId = AuthContext.getUserId(); - examCenterCOS.forEach(item -> { - item.setCurrentUserCanAudit(2); - if (item.getAuditStatus() == 1) { - if (item.getAuditUserId().equals(userId)) { - item.setCurrentUserCanAudit(1); + if (!examCenterCOS.isEmpty()) { + examCenterCOS.forEach(item -> { + item.setCurrentUserCanAudit(2); + if (item.getAuditStatus() == 1) { + if (item.getAuditUserId().equals(userId)) { + item.setCurrentUserCanAudit(1); + } } - } - }); + }); + } + return PageResponse.of(examCenterCOS, pageResponse.getTotalCount(), pageResponse.getPageSize(), pageResponse.getPageIndex()); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaFgsPersonAreaMapper.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaFgsPersonAreaMapper.java index 6aef5fa..a5b89c9 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaFgsPersonAreaMapper.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/mapper/ClosedAreaFgsPersonAreaMapper.java @@ -5,12 +5,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; /** -* web-infrastructure -* @Author dearLin -* @Date 2026-03-19 17:38:37 -*/ + * web-infrastructure + * + * @Author dearLin + * @Date 2026-03-19 17:38:37 + */ @Mapper public interface ClosedAreaFgsPersonAreaMapper extends BaseMapper { - } +} diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaFgsPersonAreaRepository.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaFgsPersonAreaRepository.java index ac5a979..cc989e2 100644 --- a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaFgsPersonAreaRepository.java +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/ClosedAreaFgsPersonAreaRepository.java @@ -11,6 +11,5 @@ import java.util.Map; * @Date 2026-03-19 17:38:38 */ public interface ClosedAreaFgsPersonAreaRepository extends BaseRepository { - PageResponse listPage(Map params); } diff --git a/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaFgsPersonAreaRepositoryImpl.java b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaFgsPersonAreaRepositoryImpl.java new file mode 100644 index 0000000..c6c36d0 --- /dev/null +++ b/web-infrastructure/src/main/java/com/zcloud/primeport/persistence/repository/impl/ClosedAreaFgsPersonAreaRepositoryImpl.java @@ -0,0 +1,33 @@ +package com.zcloud.primeport.persistence.repository.impl; + +import com.alibaba.cola.dto.PageResponse; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.jjb.saas.framework.repository.common.PageHelper; +import com.jjb.saas.framework.repository.repo.impl.BaseRepositoryImpl; +import com.zcloud.gbscommon.utils.PageQueryHelper; +import com.zcloud.gbscommon.utils.Query; +import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAreaDO; +import com.zcloud.primeport.persistence.dataobject.ClosedAreaFgsPersonAuthDO; +import com.zcloud.primeport.persistence.mapper.ClosedAreaFgsPersonAreaMapper; +import com.zcloud.primeport.persistence.mapper.ClosedAreaFgsPersonAuthMapper; +import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAreaRepository; +import com.zcloud.primeport.persistence.repository.ClosedAreaFgsPersonAuthRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Map; + +/** +* web-infrastructure +* @Author dearLin +* @Date 2026-03-19 17:37:04 +*/ +@Service +@RequiredArgsConstructor +public class ClosedAreaFgsPersonAreaRepositoryImpl extends BaseRepositoryImpl implements ClosedAreaFgsPersonAreaRepository { + private final ClosedAreaFgsPersonAreaMapper closedAreaFgsPersonAreaMapper; + + +} +