From e2dde98da417ade6a25ca7276f5652164b42d6f7 Mon Sep 17 00:00:00 2001 From: WendyYang Date: Fri, 18 Aug 2023 10:00:51 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=9B=9E=E9=81=BF=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9B=9E=E9=81=BF=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/meeting/entity/vo/InviteRuleDetailVO.java | 2 -- .../pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteRuleDetailVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteRuleDetailVO.java index e2f8e19..4e3f0ec 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteRuleDetailVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/InviteRuleDetailVO.java @@ -16,8 +16,6 @@ import java.util.List; @Data public class InviteRuleDetailVO { - private Integer inviteType; - @ApiModelProperty("随机邀请规则") private List randomRules; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java index 493613e..fcaddec 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java @@ -40,6 +40,7 @@ public class ExpertInviteAvoidRuleServiceImpl extends ServiceImpl Date: Fri, 18 Aug 2023 10:07:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9D=A1=E7=BA=BF?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=9F=A5=E8=AF=A2=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ningdatech/pmapi/gov/service/IBelongOrgService.java | 5 +++++ .../pmapi/gov/service/impl/BelongOrgServiceImpl.java | 13 +++++++++++++ .../com/ningdatech/pmapi/meeting/manage/MeetingManage.java | 6 +++--- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IBelongOrgService.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IBelongOrgService.java index 2a99871..8bc2a63 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IBelongOrgService.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IBelongOrgService.java @@ -3,6 +3,9 @@ package com.ningdatech.pmapi.gov.service; import com.baomidou.mybatisplus.extension.service.IService; import com.ningdatech.pmapi.gov.entity.BelongOrg; +import java.util.Collection; +import java.util.List; + /** *

* 服务类 @@ -13,4 +16,6 @@ import com.ningdatech.pmapi.gov.entity.BelongOrg; */ public interface IBelongOrgService extends IService { + List listNameByCodes(Collection stripCodes); + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/BelongOrgServiceImpl.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/BelongOrgServiceImpl.java index cf67454..71ceb58 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/BelongOrgServiceImpl.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/BelongOrgServiceImpl.java @@ -1,11 +1,17 @@ package com.ningdatech.pmapi.gov.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.ningdatech.basic.util.CollUtils; import com.ningdatech.pmapi.gov.entity.BelongOrg; import com.ningdatech.pmapi.gov.mapper.BelongOrgMapper; import com.ningdatech.pmapi.gov.service.IBelongOrgService; import org.springframework.stereotype.Service; +import java.util.Collection; +import java.util.List; + /** *

* 服务实现类 @@ -17,4 +23,11 @@ import org.springframework.stereotype.Service; @Service public class BelongOrgServiceImpl extends ServiceImpl implements IBelongOrgService { + @Override + public List listNameByCodes(Collection stripCodes) { + LambdaQueryWrapper query = Wrappers.lambdaQuery(BelongOrg.class) + .in(BelongOrg::getOrgCode, stripCodes); + return CollUtils.fieldList(list(query), BelongOrg::getOrgName); + } + } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java index e92c45f..c844a71 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java @@ -25,6 +25,7 @@ import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo; import com.ningdatech.pmapi.expert.model.entity.ExpertReview; import com.ningdatech.pmapi.expert.service.IExpertReviewService; import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; +import com.ningdatech.pmapi.gov.service.IBelongOrgService; import com.ningdatech.pmapi.meeting.builder.ExpertInviteBuilder; import com.ningdatech.pmapi.meeting.entity.domain.*; import com.ningdatech.pmapi.meeting.entity.dto.*; @@ -43,7 +44,6 @@ import com.ningdatech.pmapi.meeting.task.ExpertRandomInviteTask; import com.ningdatech.pmapi.meta.helper.DictionaryCache; import com.ningdatech.pmapi.meta.helper.TagCache; import com.ningdatech.pmapi.organization.service.IDingOrganizationService; -import com.ningdatech.pmapi.organization.service.IGovBusinessStripService; import com.ningdatech.pmapi.projectlib.enumeration.ProjectStatusEnum; import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.service.IProjectService; @@ -91,7 +91,7 @@ public class MeetingManage { private final IProjectService projectService; private final IMeetingInnerProjectService meetingInnerProjectService; private final IMeetingOuterProjectService meetingOuterProjectService; - private final IGovBusinessStripService businessStripService; + private final IBelongOrgService belongOrgService; private final IDingOrganizationService dingOrganizationService; private final IExpertReviewService expertReviewService; private final ExpertInviteHelper expertInviteHelper; @@ -601,7 +601,7 @@ public class MeetingManage { vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); vo.setAvoidUnitIds(avoidInfo.getAvoidUnitIdList()); if (CollUtil.isNotEmpty(vo.getAvoidOrgIds())) { - vo.setAvoidOrgs(businessStripService.listNameByCodes(avoidInfo.getAvoidOrgIdList())); + vo.setAvoidOrgs(belongOrgService.listNameByCodes(avoidInfo.getAvoidOrgIdList())); } if (CollUtil.isNotEmpty(vo.getAvoidUnitIds())) { vo.setAvoidUnits(dingOrganizationService.listNameByCodes(avoidInfo.getAvoidUnitIdList()));