Merge remote-tracking branch 'origin/dev' into dev

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;
+
 /**
  * <p>
  * 服务类
@@ -13,4 +16,6 @@ import com.ningdatech.pmapi.gov.entity.BelongOrg;
  */
 public interface IBelongOrgService extends IService<BelongOrg> {
 
+    List<String> listNameByCodes(Collection<String> stripCodes);
+
 }

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;
+
 /**
  * <p>
  * 服务实现类
@@ -17,4 +23,11 @@ import org.springframework.stereotype.Service;
 @Service
 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);
+    }
+
 }

pmapi/src/main/java/com/ningdatech/pmapi/meeting/entity/vo/AvoidInfoVO.java

@@ -18,6 +18,9 @@ import java.util.List;
 @ApiModel("回避信息")
 public class AvoidInfoVO {
 
+    @ApiModelProperty("回避类型：1 回避同单位、2 回避同条线、3 不回避")
+    private Integer avoidType;
+
     @ApiModelProperty("回避单位")
     private List<String> avoidUnitIds;
 

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<RandomInviteRuleVO> randomRules;
 

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;
@@ -588,7 +588,7 @@ public class MeetingManage {
                     randomRule.setIntentionRegions(intentionRegions);
                 }
                 if (CollUtil.isNotEmpty(randomRule.getExpertRegionList())) {
-                    List<RegionDTO> regions = CollUtils.convert(randomRule.getExpertRegions(),
+                    List<RegionDTO> regions = CollUtils.convert(randomRule.getExpertRegionList(),
                             w -> regionCache.getByCodeAndLevel(w.getRegionCode(), w.getRegionLevel()));
                     randomRule.setExpertRegions(regions);
                 }
@@ -596,11 +596,12 @@ public class MeetingManage {
             });
             AvoidRuleDTO avoidInfo = inviteAvoidRuleService.getAvoidInfo(meetingId);
             AvoidInfoVO vo = new AvoidInfoVO();
+            vo.setAvoidType(avoidInfo.getAvoidType());
             vo.setWeekInviteCount(avoidInfo.getWeekInviteCount());
             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()));

pmapi/src/main/java/com/ningdatech/pmapi/meeting/service/impl/ExpertInviteAvoidRuleServiceImpl.java

@@ -40,6 +40,7 @@ public class ExpertInviteAvoidRuleServiceImpl extends ServiceImpl<ExpertInviteAv
         avoidInfo.setAvoidUnitIdList(StrUtils.split(avoidRule.getAvoidUnitIds()));
         avoidInfo.setExpertIds(BizUtils.splitToLong(avoidRule.getAvoidExpertIds()));
         avoidInfo.setWeekInviteCount(avoidRule.getWeekInviteCount());
+        avoidInfo.setAvoidType(avoidRule.getAvoidType());
         return avoidInfo;
     }