From 1e1495044162ed9f52819a5c6e1c48cdd32d041a Mon Sep 17 00:00:00 2001 From: zhn <947514737@qq.com> Date: Wed, 25 Oct 2023 14:43:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=A1=B9=E6=94=B6=E9=9B=86?= =?UTF-8?q?=E6=B8=85=E5=8D=95-->=E6=9F=90=E4=B8=AA=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B4=A3=E4=BB=BB=E9=A2=86=E5=9F=9F=E4=B8=8B=E5=B7=A5=E7=A8=8B?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ParamsCollectManifestEOController.java | 14 +++++++++++ .../IParamsCollectManifestEOService.java | 2 ++ .../ParamsCollectManifestEOServiceImpl.java | 24 +++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java index c13b31fa6..bc3aab407 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/controller/ParamsCollectManifestEOController.java @@ -706,4 +706,18 @@ public class ParamsCollectManifestEOController extends JeroController queryDutyTerritory(@RequestParam(name="id",required=true) String id) { return this.paramsCollectManifestEOService.queryDutyTerritory(id); } + + /** + * 某个项目责任领域下-工程接口人 + * + * @return + */ + @AutoLog(value = "某个项目责任领域下-工程接口人") + @ApiOperation(value="某个项目责任领域下-工程接口人", notes="某个项目责任领域下-工程接口人") + @GetMapping(value = "/getSdtList") + public Result>> getSdtList(String projectId,String projectVersion,String dutyTerritory) { + List> sdtList = paramsCollectManifestEOService.getSdtList(projectId,projectVersion,dutyTerritory); + return Result.OK(sdtList); + } + } diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java index b45dd037e..1ac6ed770 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/IParamsCollectManifestEOService.java @@ -113,6 +113,8 @@ public interface IParamsCollectManifestEOService extends IService> querySdtList(ParamsCollectManifestVO paramsCollectManifestVO); + List> getSdtList(String projectId,String projectVersion,String dutyTerritory); + List> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut); Map isCollectFinished(String paramsManifestId); diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java index 0a652e278..6a6ad78ef 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/cert/collect/service/impl/ParamsCollectManifestEOServiceImpl.java @@ -2032,6 +2032,30 @@ public class ParamsCollectManifestEOServiceImpl extends ServiceImpl> getSdtList(String projectId,String projectVersion,String dutyTerritory) { + // 根据主项目ID 查询 相关项目版本的项目ID + String projectVersionId = projectLibraryBaseService.getIdByVersionAndParentId(projectVersion, projectId); + + List> sdtList = new ArrayList<>(); + ProjectRelatedPersonnel projectRelatedPersonnel = projectRelatedPersonnelService.queryByProjectIdAndDutyTerritory(projectVersionId, dutyTerritory); + if (ObjectUtil.isNotEmpty(projectRelatedPersonnel)) { + String sdtIds = projectRelatedPersonnel.getEngineeringInterfacePerson(); + if (StringUtils.isNotBlank(sdtIds)) { + String[] sdtIdStr = sdtIds.split(","); + for (int i = 0; i < sdtIdStr.length; i++) { + SysUser sysUser = sysUserService.getById(sdtIdStr[i]); + if (ObjectUtil.isNotEmpty(sysUser)) { + Map userMap = new HashMap<>(); + userMap.put("userName", sysUser.getUsername()); + userMap.put("id", sysUser.getId()); + sdtList.add(userMap); + } + } + } + } + return sdtList; + } @Override public List> getLoginUserTypes(ParamsCollectManifestVO paramsCollectManifestVO, String cut) {