From b5bab032e80f0233fdf06a4e8de2599bc6b65e47 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 21:23:56 +0800
Subject: [PATCH] 修改
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java
index e852ff5..a5f1b4c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTitleMajorServiceImpl.java
@@ -4,12 +4,17 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.BasePage;
+import com.ruoyi.system.domain.TRegion;
+import com.ruoyi.system.domain.TTechnicalTitle;
import com.ruoyi.system.domain.TTitleMajor;
+import com.ruoyi.system.mapper.TRegionMapper;
import com.ruoyi.system.mapper.TTitleMajorMapper;
import com.ruoyi.system.service.TTitleMajorService;
import com.ruoyi.system.vo.SysUserVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.Arrays;
import java.util.List;
/**
@@ -23,10 +28,17 @@
@Service
public class TTitleMajorServiceImpl extends ServiceImpl<TTitleMajorMapper, TTitleMajor> implements TTitleMajorService {
+ @Autowired
+ private TRegionMapper regionMapper;
@Override
public PageInfo<TTitleMajor> pageList(BasePage basePage) {
PageInfo<TTitleMajor> pageInfo = new PageInfo<>(basePage.getPageNum(), basePage.getPageSize());
List<TTitleMajor> list = this.baseMapper.pageList(pageInfo);
+ for (TTitleMajor titleMajor : list) {
+ List<TRegion> tRegions = regionMapper.selectBatchIds(Arrays.asList(titleMajor.getRegionIds().split(",")));
+ tRegions.stream().forEach(region -> region.setAddress(region.getProvinceName()+"-"+region.getName()));
+ titleMajor.setRegionNames(tRegions.stream().map(region -> region.getAddress()).reduce((a, b) -> a + "、" + b).get());
+ }
pageInfo.setRecords(list);
return pageInfo;
}
--
Gitblit v1.7.1