Browse Source

修改条线名称查询方式

tags/24080901
WendyYang 1 year ago
parent
commit
fae64b5e52
3 changed files with 21 additions and 3 deletions
  1. +5
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IBelongOrgService.java
  2. +13
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/BelongOrgServiceImpl.java
  3. +3
    -3
      pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java

+ 5
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/service/IBelongOrgService.java View File

@@ -3,6 +3,9 @@ package com.ningdatech.pmapi.gov.service;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.ningdatech.pmapi.gov.entity.BelongOrg; import com.ningdatech.pmapi.gov.entity.BelongOrg;


import java.util.Collection;
import java.util.List;

/** /**
* <p> * <p>
* 服务类 * 服务类
@@ -13,4 +16,6 @@ import com.ningdatech.pmapi.gov.entity.BelongOrg;
*/ */
public interface IBelongOrgService extends IService<BelongOrg> { public interface IBelongOrgService extends IService<BelongOrg> {


List<String> listNameByCodes(Collection<String> stripCodes);

} }

+ 13
- 0
pmapi/src/main/java/com/ningdatech/pmapi/gov/service/impl/BelongOrgServiceImpl.java View File

@@ -1,11 +1,17 @@
package com.ningdatech.pmapi.gov.service.impl; 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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ningdatech.basic.util.CollUtils;
import com.ningdatech.pmapi.gov.entity.BelongOrg; import com.ningdatech.pmapi.gov.entity.BelongOrg;
import com.ningdatech.pmapi.gov.mapper.BelongOrgMapper; import com.ningdatech.pmapi.gov.mapper.BelongOrgMapper;
import com.ningdatech.pmapi.gov.service.IBelongOrgService; import com.ningdatech.pmapi.gov.service.IBelongOrgService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import java.util.Collection;
import java.util.List;

/** /**
* <p> * <p>
* 服务实现类 * 服务实现类
@@ -17,4 +23,11 @@ import org.springframework.stereotype.Service;
@Service @Service
public class BelongOrgServiceImpl extends ServiceImpl<BelongOrgMapper, BelongOrg> implements IBelongOrgService { public class BelongOrgServiceImpl extends ServiceImpl<BelongOrgMapper, BelongOrg> implements IBelongOrgService {


@Override
public List<String> listNameByCodes(Collection<String> stripCodes) {
LambdaQueryWrapper<BelongOrg> query = Wrappers.lambdaQuery(BelongOrg.class)
.in(BelongOrg::getOrgCode, stripCodes);
return CollUtils.fieldList(list(query), BelongOrg::getOrgName);
}

} }

+ 3
- 3
pmapi/src/main/java/com/ningdatech/pmapi/meeting/manage/MeetingManage.java View File

@@ -25,6 +25,7 @@ import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo;
import com.ningdatech.pmapi.expert.model.entity.ExpertReview; import com.ningdatech.pmapi.expert.model.entity.ExpertReview;
import com.ningdatech.pmapi.expert.service.IExpertReviewService; import com.ningdatech.pmapi.expert.service.IExpertReviewService;
import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; 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.builder.ExpertInviteBuilder;
import com.ningdatech.pmapi.meeting.entity.domain.*; import com.ningdatech.pmapi.meeting.entity.domain.*;
import com.ningdatech.pmapi.meeting.entity.dto.*; 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.DictionaryCache;
import com.ningdatech.pmapi.meta.helper.TagCache; import com.ningdatech.pmapi.meta.helper.TagCache;
import com.ningdatech.pmapi.organization.service.IDingOrganizationService; 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.enumeration.ProjectStatusEnum;
import com.ningdatech.pmapi.projectlib.model.entity.Project; import com.ningdatech.pmapi.projectlib.model.entity.Project;
import com.ningdatech.pmapi.projectlib.service.IProjectService; import com.ningdatech.pmapi.projectlib.service.IProjectService;
@@ -91,7 +91,7 @@ public class MeetingManage {
private final IProjectService projectService; private final IProjectService projectService;
private final IMeetingInnerProjectService meetingInnerProjectService; private final IMeetingInnerProjectService meetingInnerProjectService;
private final IMeetingOuterProjectService meetingOuterProjectService; private final IMeetingOuterProjectService meetingOuterProjectService;
private final IGovBusinessStripService businessStripService;
private final IBelongOrgService belongOrgService;
private final IDingOrganizationService dingOrganizationService; private final IDingOrganizationService dingOrganizationService;
private final IExpertReviewService expertReviewService; private final IExpertReviewService expertReviewService;
private final ExpertInviteHelper expertInviteHelper; private final ExpertInviteHelper expertInviteHelper;
@@ -601,7 +601,7 @@ public class MeetingManage {
vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList()); vo.setAvoidOrgIds(avoidInfo.getAvoidOrgIdList());
vo.setAvoidUnitIds(avoidInfo.getAvoidUnitIdList()); vo.setAvoidUnitIds(avoidInfo.getAvoidUnitIdList());
if (CollUtil.isNotEmpty(vo.getAvoidOrgIds())) { if (CollUtil.isNotEmpty(vo.getAvoidOrgIds())) {
vo.setAvoidOrgs(businessStripService.listNameByCodes(avoidInfo.getAvoidOrgIdList()));
vo.setAvoidOrgs(belongOrgService.listNameByCodes(avoidInfo.getAvoidOrgIdList()));
} }
if (CollUtil.isNotEmpty(vo.getAvoidUnitIds())) { if (CollUtil.isNotEmpty(vo.getAvoidUnitIds())) {
vo.setAvoidUnits(dingOrganizationService.listNameByCodes(avoidInfo.getAvoidUnitIdList())); vo.setAvoidUnits(dingOrganizationService.listNameByCodes(avoidInfo.getAvoidUnitIdList()));


Loading…
Cancel
Save