浏览代码

更改校区分组

liu 1 年之前
父节点
当前提交
137d6f83ac

+ 6 - 7
src/main/java/com/template/controller/WelcomeBuildController.java

@@ -7,14 +7,12 @@ import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.api.WelcomeBuildControllerAPI;
 import com.template.api.WelcomeBuildControllerAPI;
 import com.template.common.utils.ExcelUtils;
 import com.template.common.utils.ExcelUtils;
 import com.template.model.enumModel.eFileType;
 import com.template.model.enumModel.eFileType;
-import com.template.model.pojo.WelcomeBuild;
-import com.template.model.pojo.WelcomeCity;
-import com.template.model.pojo.WelcomeOrg;
-import com.template.model.pojo.WelcomeStudent;
+import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.StudentPageVo;
 import com.template.model.vo.StudentPageVo;
 import com.template.services.WelcomeBuildService;
 import com.template.services.WelcomeBuildService;
+import com.template.services.WelcomeSchoolService;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
@@ -54,6 +52,9 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
     @Autowired
     @Autowired
     private WelcomeBuildService welcomeBuildService;
     private WelcomeBuildService welcomeBuildService;
 
 
+    @Autowired
+    WelcomeSchoolService welcomeSchoolService;
+
     @Override
     @Override
     public CommonResult saveBuild(WelcomeBuild welcomeBuild) {
     public CommonResult saveBuild(WelcomeBuild welcomeBuild) {
         String build = welcomeBuild.getBuild();
         String build = welcomeBuild.getBuild();
@@ -110,9 +111,7 @@ public class WelcomeBuildController implements WelcomeBuildControllerAPI {
 
 
     @Override
     @Override
     public CommonResult schoolGroup() {
     public CommonResult schoolGroup() {
-        LambdaQueryWrapper<WelcomeBuild> wrapper=new LambdaQueryWrapper<>();
-        wrapper.groupBy(WelcomeBuild::getSchool);
-        List<WelcomeBuild> schoolGroup = welcomeBuildService.list(wrapper);
+        List<WelcomeSchool> schoolGroup = welcomeSchoolService.schoolGroup();
 
 
         return CommonResult.ok(schoolGroup);
         return CommonResult.ok(schoolGroup);
     }
     }

+ 5 - 0
src/main/java/com/template/services/WelcomeSchoolService.java

@@ -4,6 +4,8 @@ import com.template.model.pojo.WelcomeSchool;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.result.PageUtils;
 import com.template.model.result.PageUtils;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  *  服务类
  *  服务类
@@ -15,4 +17,7 @@ import com.template.model.result.PageUtils;
 public interface WelcomeSchoolService extends IService<WelcomeSchool> {
 public interface WelcomeSchoolService extends IService<WelcomeSchool> {
 
 
     PageUtils<WelcomeSchool> listSchool(int currentPage, int pageCount);
     PageUtils<WelcomeSchool> listSchool(int currentPage, int pageCount);
+
+    List<WelcomeSchool> schoolGroup();
+
 }
 }

+ 9 - 1
src/main/java/com/template/services/impl/WelcomeSchoolServiceImpl.java

@@ -11,6 +11,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import java.util.List;
+
 /**
 /**
  * <p>
  * <p>
  *  服务实现类
  *  服务实现类
@@ -20,7 +22,7 @@ import org.springframework.stereotype.Service;
  * @since 2025-06-19
  * @since 2025-06-19
  */
  */
 @Service
 @Service
-public class WelcomeSchoolServiceImpl extends ServiceImpl<WelcomeSchoolMapper, WelcomeSchool> implements WelcomeSchoolService {
+public class WelcomeSchoolServixceImpl extends ServiceImpl<WelcomeSchoolMapper, WelcomeSchool> implements WelcomeSchoolService {
 
 
     @Autowired
     @Autowired
     WelcomeSchoolMapper welcomeSchoolMapper;
     WelcomeSchoolMapper welcomeSchoolMapper;
@@ -30,4 +32,10 @@ public class WelcomeSchoolServiceImpl extends ServiceImpl<WelcomeSchoolMapper, W
         IPage<WelcomeSchool> result = welcomeSchoolMapper.selectPage(new Page<>(currentPage, pageCount), new QueryWrapper<>());
         IPage<WelcomeSchool> result = welcomeSchoolMapper.selectPage(new Page<>(currentPage, pageCount), new QueryWrapper<>());
         return new PageUtils<>(result);
         return new PageUtils<>(result);
     }
     }
+
+    @Override
+    public List<WelcomeSchool> schoolGroup() {
+        List<WelcomeSchool> welcomeSchools = welcomeSchoolMapper.selectList(new QueryWrapper<>());
+        return welcomeSchools;
+    }
 }
 }