diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java index eb1e043..fe3c3ce 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/controller/YxSchoolController.java @@ -190,39 +190,17 @@ public class YxSchoolController extends JeecgController selectionList = new ArrayList<>(); if (oConvertUtils.isNotEmpty(selections)) { - List selectionList = Arrays.asList(selections.split(",")); - queryWrapper.select(YxSchool::getId); - queryWrapper.select(YxSchool::getSchoolName); - queryWrapper.in(YxSchool::getId,selectionList); + selectionList = Arrays.asList(selections.split(",")); } - List exportList = service.list(queryWrapper); - Map schoolIdMap = exportList.stream().collect(Collectors.toMap(YxSchool::getId, YxSchool::getSchoolName)); - - List schoolExportDTOList =new ArrayList<>(); - if (CollectionUtil.isNotEmpty(exportList)) { - List schoolIdList = exportList.stream().map(YxSchool::getId).collect(Collectors.toList()); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(YxSchoolChild::getSchoolId,schoolIdList); - lambdaQueryWrapper.orderByDesc(YxSchoolChild::getSchoolCode); - lambdaQueryWrapper.select(YxSchoolChild::getSchoolId,YxSchoolChild::getSchoolName,YxSchoolChild::getSchoolCode); - List schoolChildList = yxSchoolChildService.list(lambdaQueryWrapper); - SchoolExportDTO schoolExportDTO = null; - for (YxSchoolChild yxSchoolChild : schoolChildList) { - schoolExportDTO = new SchoolExportDTO(); - schoolExportDTO.setSchoolName(yxSchoolChild.getSchoolName()); - schoolExportDTO.setSchoolCode(yxSchoolChild.getSchoolCode()); - schoolExportDTO.setMasterSchoolName(schoolIdMap.get(yxSchoolChild.getSchoolId())); - schoolExportDTOList.add(schoolExportDTO); - } - } - + List exportList = yxSchoolService.exportList(selectionList); ModelAndView mv = new ModelAndView(new JeecgEntityExcelView()); mv.addObject(NormalExcelConstants.FILE_NAME, title); mv.addObject(NormalExcelConstants.CLASS, SchoolExportDTO.class); ExportParams exportParams=new ExportParams(title + "报表", "导出人:" + sysUser.getRealname(), title); mv.addObject(NormalExcelConstants.PARAMS,exportParams); - mv.addObject(NormalExcelConstants.DATA_LIST, schoolExportDTOList); + mv.addObject(NormalExcelConstants.DATA_LIST, exportList); return mv; } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java index ee3611a..f08888a 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/YxSchoolMapper.java @@ -9,6 +9,7 @@ import org.jeecg.modules.web.dto.ArtHotSchoolDTO; import org.jeecg.modules.web.dto.ArtSchoolDTO; import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.MiniSchoolDTO; +import org.jeecg.modules.yx.dto.SchoolExportDTO; import org.jeecg.modules.yx.dto.YxSchoolDTO; import org.jeecg.modules.yx.entity.YxSchool; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -58,4 +59,6 @@ public interface YxSchoolMapper extends BaseMapper { List artSchoolListBySchoolCodeList(@Param("schoolCodeList") List schoolCodeList); IPage queryPageList(@Param("page") Page page, @Param("qvo") QueryRecommendMajorVO queryRecommendMajorVO); + + List exportList(List schoolIdList); } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml index 543e4d8..a372091 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/mapper/xml/YxSchoolMapper.xml @@ -488,4 +488,18 @@ ORDER BY s.create_time,s.update_time DESC + diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java index c82bd92..2b32a47 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/IYxSchoolService.java @@ -6,6 +6,7 @@ import org.jeecg.modules.web.dto.ArtHotSchoolDTO; import org.jeecg.modules.web.dto.ArtSchoolDTO; import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.MiniSchoolDTO; +import org.jeecg.modules.yx.dto.SchoolExportDTO; import org.jeecg.modules.yx.dto.YxSchoolDTO; import org.jeecg.modules.yx.entity.YxSchool; import com.baomidou.mybatisplus.extension.service.IService; @@ -41,5 +42,7 @@ public interface IYxSchoolService extends IService { IPage queryPageList(Page page, QueryRecommendMajorVO queryRecommendMajorVO); + List exportList(List schoolIdList); + //小程序代码================================================= } diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java index d38987a..dd19ccd 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxSchoolServiceImpl.java @@ -12,6 +12,7 @@ import org.jeecg.modules.web.dto.ArtHotSchoolDTO; import org.jeecg.modules.web.dto.ArtSchoolDTO; import org.jeecg.modules.web.vo.QueryRecommendMajorVO; import org.jeecg.modules.mini.dto.MiniSchoolDTO; +import org.jeecg.modules.yx.dto.SchoolExportDTO; import org.jeecg.modules.yx.dto.YxSchoolDTO; import org.jeecg.modules.yx.entity.*; import org.jeecg.modules.yx.mapper.YxSchoolMapper; @@ -157,6 +158,11 @@ public class YxSchoolServiceImpl extends ServiceImpl i return baseMapper.queryPageList(page,queryRecommendMajorVO); } + @Override + public List exportList(List schoolIdList) { + return baseMapper.exportList(schoolIdList); + } + ///==========================PC端 @Override public IPage search(QueryRecommendMajorVO queryRecommendMajorVO) {