From c4ed15d8e4a4b5e53c91fe112095bbdf0b71f8ba Mon Sep 17 00:00:00 2001 From: zhanglei Date: Tue, 4 Aug 2026 16:01:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82,=E8=B5=84=E8=B4=A8?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E4=B8=8B=E5=8F=91app=E7=AD=BE=E5=AD=97?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapter/web/OrgPersonnelController.java | 7 +++++++ .../app/AppQualFilingCommitmentController.java | 5 ++++- .../app/executor/OrgPersonnelExecutor.java | 17 +++++++++++++++++ .../safetyeval/client/api/OrgPersonnelApi.java | 5 +++++ 4 files changed, 33 insertions(+), 1 deletion(-) diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java index 8157cf9..cebccfd 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/OrgPersonnelController.java @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; +import java.util.List; /** * 人员信息适配层（Controller） @@ -75,4 +76,10 @@ public class OrgPersonnelController { public SingleResponse importTemplate() { return orgPersonnelApi.importTemplate(); } + + @ApiOperation("人员查询") + @GetMapping("/getOrgPersonnel") + public SingleResponse> getOrgPersonnel() { + return orgPersonnelApi.getOrgPersonnel(); + } } diff --git a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/app/AppQualFilingCommitmentController.java b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/app/AppQualFilingCommitmentController.java index d49f5c4..dce9a04 100644 --- a/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/app/AppQualFilingCommitmentController.java +++ b/safety-eval-adapter/src/main/java/org/qinan/safetyeval/adapter/web/institution/app/AppQualFilingCommitmentController.java @@ -16,6 +16,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.Objects; /** * 法定代表人承诺书适配层（Controller） @@ -33,7 +34,9 @@ public class AppQualFilingCommitmentController { @ApiOperation("分页查询法定代表人承诺书") @GetMapping("/page") public PageResponse page(@Validated QualFilingCommitmentPageQuery query) { - query.setLegalRepPersonnelId(AuthUserContextAdapter.getCurrentUserId()); + if (Objects.isNull(query.getLegalRepPersonnelId())) { + query.setLegalRepPersonnelId(AuthUserContextAdapter.getCurrentUserId()); + } return qualFilingCommitmentApi.page(query); } diff --git a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java index 22a1977..6c8622d 100644 --- a/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java +++ b/safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/OrgPersonnelExecutor.java @@ -26,9 +26,12 @@ import org.qinan.safetyeval.domain.service.OrgPositionDomainService; import org.qinan.safetyeval.infrastructure.adapter.ThreadLocalUserInfoAdapter; import org.qinan.safetyeval.infrastructure.adapter.auth.AuthUserContextAdapter; import org.qinan.safetyeval.infrastructure.adapter.gbs.GbsUserFacadeClient; +import org.qinan.safetyeval.infrastructure.dataobject.OrgPersonnelDO; +import org.qinan.safetyeval.infrastructure.mapper.OrgPersonnelMapper; import org.qinan.safetyeval.infrastructure.support.UserOrgIdResolver; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Lazy; @@ -41,6 +44,7 @@ import java.math.BigDecimal; import java.util.Collections; import java.util.List; import java.util.Objects; +import java.util.stream.Collectors; /** * 人员信息执行器（App层） @@ -92,6 +96,8 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { private boolean gbsUserSyncFailFast; @Value("${template.personnel.import.url:}") private String personImportTemplateUrl; + @Autowired + private OrgPersonnelMapper orgPersonnelMapper; @Override @@ -295,4 +301,15 @@ public class OrgPersonnelExecutor implements OrgPersonnelApi { public SingleResponse importTemplate() { return SingleResponse.success(personImportTemplateUrl); } + + @Override + public SingleResponse> getOrgPersonnel() { + List orgPersonnelDOS = orgPersonnelMapper.selectList(null); + List orgPersonnelCOS = orgPersonnelDOS.stream().map(item -> { + OrgPersonnelCO orgPersonnelCO = new OrgPersonnelCO(); + BeanUtils.copyProperties(item, orgPersonnelCO); + return orgPersonnelCO; + }).collect(Collectors.toList()); + return SingleResponse.success(orgPersonnelCOS); + } } diff --git a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java index 8eeaf26..c332350 100644 --- a/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java +++ b/safety-eval-client/src/main/java/org/qinan/safetyeval/client/api/OrgPersonnelApi.java @@ -12,6 +12,7 @@ import org.qinan.safetyeval.client.dto.OrgPersonnelUpdateOriginFaceCmd; import org.springframework.web.multipart.MultipartFile; import java.math.BigDecimal; +import java.util.List; /** * 人员信息接口定义（Client层） @@ -50,4 +51,8 @@ public interface OrgPersonnelApi { * @return 模版下载地址 */ SingleResponse importTemplate(); + + SingleResponse> getOrgPersonnel(); + + }