diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java index 4ba00d9a..c3ebef08 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/controller/InternalMeetingController.java +++ b/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 getLinkTopics(@RequestParam(name = "id") String id) { - payMeetingService.getLinkTopics(id); - return Result.OK(); + public Result> getLinkTopics(@RequestParam(name = "id") String id) { + List linkTopics = payMeetingService.getLinkTopics(id); + return Result.OK(linkTopics); } } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java index 155aaa85..c2ef4644 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/IPayMeetingService.java +++ b/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 { void standardsRelease(PublishReminderVO publishReminderVO); - void getLinkTopics(String id); + List getLinkTopics(String id); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java index bb510d6a..14bb94c4 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/meeting/service/impl/PayMeetingServiceImpl.java +++ b/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 getLinkTopics(String id) { PayMeeting payMeeting = getById(id); String linkTopics = payMeeting.getLinkTopics(); - //sysBaseAPI.dict + List dictList = sysBaseAPI.queryDictItemsByCode("linkTopics"); + Map stringDictModelMap = CollStreamUtil.toIdentityMap(dictList, DictModel::getValue); + List strings = Arrays.asList(linkTopics.split(",")); + List dictModels = new ArrayList<>(); + + for (String key : strings) { + DictModel dictModel = stringDictModelMap.get(key); + dictModels.add(dictModel); + } + return dictModels; } } diff --git a/pom.xml b/pom.xml index 24cd5e9d..c74554cb 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ 4.0 8.0.21 3.2.0 - 5.3.8 + 5.8.22 3.13.6 1.9.4 29.0-jre