From 381bd9f6a9525b11d574b4a4f79925d99d3ad626 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 13 十二月 2024 22:05:59 +0800
Subject: [PATCH] 修改

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java
index c61d96e..37fc355 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java
@@ -4,13 +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.TTechnicalTitleMapper;
 import com.ruoyi.system.query.RegionQuery;
 import com.ruoyi.system.service.TTechnicalTitleService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
 import java.util.List;
 
 /**
@@ -24,10 +28,18 @@
 @Service
 public class TTechnicalTitleServiceImpl extends ServiceImpl<TTechnicalTitleMapper, TTechnicalTitle> implements TTechnicalTitleService {
 
+    @Autowired
+    private TRegionMapper regionMapper;
+
     @Override
     public PageInfo<TTechnicalTitle> pageList(RegionQuery regionQuery) {
         PageInfo<TTechnicalTitle> pageInfo = new PageInfo<>(regionQuery.getPageNum(), regionQuery.getPageSize());
         List<TTechnicalTitle> list = this.baseMapper.pageList(regionQuery,pageInfo);
+        for (TTechnicalTitle tTechnicalTitle : list) {
+            List<TRegion> tRegions = regionMapper.selectBatchIds(Arrays.asList(tTechnicalTitle.getRegionIds().split(",")));
+            tRegions.stream().forEach(region -> region.setAddress(region.getProvinceName()+"-"+region.getName()));
+            tTechnicalTitle.setRegionNames(tRegions.stream().map(region -> region.getAddress()).reduce((a, b) -> a + "、" + b).get());
+        }
         pageInfo.setRecords(list);
         return pageInfo;
     }

--
Gitblit v1.7.1