From b94fffb01c94100b34e2908b4fe79c1c554b0912 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 02 一月 2025 13:55:03 +0800
Subject: [PATCH] 代码

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TTechnicalTitleServiceImpl.java |   15 +++++++++++++++
 1 files changed, 15 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..f98f831 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
@@ -1,17 +1,23 @@
 package com.ruoyi.system.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 
 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;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -24,10 +30,19 @@
 @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);
+        List<TRegion> regions = regionMapper.selectList(new LambdaQueryWrapper<TRegion>());
+        for (TTechnicalTitle tTechnicalTitle : list) {
+            List<TRegion> tRegions = regions.stream().filter(region -> tTechnicalTitle.getRegionIds().contains(region.getId() + "")).collect(Collectors.toList());
+            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