add 国际研讨会 查询关联课题

jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java

@@ -6,6 +6,7 @@ import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.base.controller.JeroController;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
@@ -230,12 +231,12 @@ public class InternalMeetingController extends JeroController<PayMeeting, IPayMe
     }
 
     /**
-     * 发布
+     * 查询关联课题
      */
-    @ApiOperation(value = "发布")
+    @ApiOperation(value = "查询关联课题")
     @GetMapping(value = "/getLinkTopics")
-    public Result<?> getLinkTopics(@RequestParam(name = "id") String id) {
+    public Result<List<DictModel>> getLinkTopics(@RequestParam(name = "id") String id) {
-        payMeetingService.getLinkTopics(id);
+        List<DictModel> linkTopics = payMeetingService.getLinkTopics(id);
-        return Result.OK();
+        return Result.OK(linkTopics);
     }
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java

@@ -3,6 +3,7 @@ package com.jero.meeting.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.enums.CompanyMessageEnums;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.meeting.entity.MeetingSummary;
 import com.jero.meeting.entity.PayMeeting;
@@ -105,5 +106,5 @@ public interface IPayMeetingService extends IService<PayMeeting> {
 
     void standardsRelease(PublishReminderVO publishReminderVO);
 
-    void getLinkTopics(String id);
+    List<DictModel> getLinkTopics(String id);
 }

jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jero.meeting.service.impl;
 
+import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -17,6 +18,7 @@ import com.jero.common.service.RolePermissionService;
 import com.jero.common.service.SendMessageService;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.DictModel;
 import com.jero.common.system.vo.LoginUser;
 import com.jero.common.util.AuthenticationUtils;
 import com.jero.common.util.PasswordUtil;
@@ -57,11 +59,9 @@ import com.jero.project.service.IPayWorkingGroupSubItemContactsService;
 import com.jero.project.service.IPayWorkingGroupSubItemService;
 import com.jero.standards.xuanguan.stablecrosstraining.entity.StableCrossTraining;
 import com.jero.standards.xuanguan.stablecrosstraining.service.IStableCrossTrainingService;
-import io.swagger.models.auth.In;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.util.CollectionUtils;
-import org.hibernate.type.YesNoType;
 import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.BeanUtils;
 import org.springframework.core.env.Environment;
@@ -80,8 +80,6 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.ObjectUtils;
 
-import static com.jero.project.common.PayProjectCommon.NO;
-
 /**
  * @Description: 会议管理
  * @Author: jero-boot
@@ -1507,9 +1505,18 @@ public class PayMeetingServiceImpl extends ServiceImpl<PayMeetingMapper, PayMeet
     }
 
     @Override
-    public void getLinkTopics(String id) {
+    public List<DictModel> getLinkTopics(String id) {
         PayMeeting payMeeting = getById(id);
         String linkTopics = payMeeting.getLinkTopics();
-        //sysBaseAPI.dict
+        List<DictModel> dictList = sysBaseAPI.queryDictItemsByCode("linkTopics");
+        Map<String, DictModel> stringDictModelMap = CollStreamUtil.toIdentityMap(dictList, DictModel::getValue);
+        List<String> strings = Arrays.asList(linkTopics.split(","));
+        List<DictModel> dictModels = new ArrayList<>();
+
+        for (String key : strings) {
+            DictModel dictModel = stringDictModelMap.get(key);
+            dictModels.add(dictModel);
+        }
+        return dictModels;
     }
 }

pom.xml

@@ -25,7 +25,7 @@
 		<sqljdbc4.version>4.0</sqljdbc4.version>
 		<mysql-connector-java.version>8.0.21</mysql-connector-java.version>
 		<dynamic-datasource-spring-boot-starter.version>3.2.0</dynamic-datasource-spring-boot-starter.version>
-		<hutool-all.version>5.3.8</hutool-all.version>
+		<hutool-all.version>5.8.22</hutool-all.version>
 		<redisson.version>3.13.6</redisson.version>
 		<commons-beanutils.version>1.9.4</commons-beanutils.version>
 		<guava.version>29.0-jre</guava.version>