提交导出

src/main/java/com/template/api/WelcomeDormitoryControllerAPI.java

@@ -38,11 +38,6 @@ public interface WelcomeDormitoryControllerAPI {
     CommonResult dormitoryGroup(Integer schoolId,Integer buildId);
 
 
-
-
-
-
-
     @GetMapping(value = "/groupBuild")
     @ApiOperation(value = "楼栋分组", notes = "楼栋分组", httpMethod = "GET")
     CommonResult groupBuild(String sex,String college,String gradestr,String school);
@@ -70,6 +65,6 @@ public interface WelcomeDormitoryControllerAPI {
 
     @GetMapping(value = "welcomeDormitoryExport")
     @ApiOperation(value = "导出寝室信息数据", notes = "导出寝室信息数据", httpMethod = "GET")
-    void welcomeDormitoryExport(HttpServletResponse response, String schoolName,String buildName,String dormitory,String sex,Integer status,String major,String college);
+    void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId);
 
 }

src/main/java/com/template/controller/WelcomeDormitoryController.java

@@ -110,8 +110,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
         welcomeDormitoryService.removeById(dormitoryId);
         //        动态删除床位
-        LambdaQueryWrapper<WelcomeBed> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(WelcomeBed::getDormitoryId,dormitoryId);
+        LambdaQueryWrapper<WelcomeBed> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(WelcomeBed::getDormitoryId, dormitoryId);
         welcomeBedService.remove(wrapper);
 
         return CommonResult.ok();
@@ -156,7 +156,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId,Integer buildId,Integer dormitoryId,String sex,Integer status,Integer majorId,Integer collegeId) {
+    public CommonResult listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
 
         PageUtils<WelcomeDormitoryVo> pageUtils = welcomeDormitoryService.listDormitory(currentPage, pageCount, schoolId, buildId, dormitoryId, sex, status, majorId, collegeId);
 
@@ -165,7 +165,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
     @Override
     public CommonResult dormitoryGroup(Integer schoolId, Integer buildId) {
-        List<WelcomeDormitory> list = welcomeDormitoryService.dormitoryGroup(schoolId,buildId);
+        List<WelcomeDormitory> list = welcomeDormitoryService.dormitoryGroup(schoolId, buildId);
 
         return CommonResult.ok(list);
     }
@@ -220,7 +220,6 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
 
-
     @Override
     public CommonResult importDormitoryExcel(MultipartFile file) throws IOException, ParseException {
         System.out.println("导入楼栋信息");
@@ -341,7 +340,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         String dormitory = dataFormatter.formatCellValue(row.getCell(3));//寝室号
                         WelcomeDormitory wd = new WelcomeDormitory();
                         Optional<WelcomeDormitory> owelcomeDormitory = wds.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build) && e.getDormitory().equals(dormitory)).findFirst();
-                        if(owelcomeDormitory != null && owelcomeDormitory.isPresent()){
+                        if (owelcomeDormitory != null && owelcomeDormitory.isPresent()) {
                             wd.setId(owelcomeDormitory.get().getId());
                         }
 
@@ -356,7 +355,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
                         wd.setSchool(school);
                         Optional<WelcomeBuild> oBuild = buildDatas.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
-                        if(oBuild != null && oBuild.isPresent()){
+                        if (oBuild != null && oBuild.isPresent()) {
                             wd.setBuild(build);
                             wd.setBuildId(oBuild.get().getId());
                         }
@@ -364,13 +363,13 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         wd.setSex(sex);
 
                         Optional<WelcomeOrg> oCollege = orgs.stream().filter(e -> e.getName().equals(college)).findFirst();
-                        if(oCollege != null && oCollege.isPresent()){
+                        if (oCollege != null && oCollege.isPresent()) {
                             wd.setCollege(major);
                             wd.setCollegeId(oCollege.get().getId());
                         }
 
                         Optional<WelcomeOrg> oMajor = orgs.stream().filter(e -> e.getName().equals(major)).findFirst();
-                        if(oMajor != null && oMajor.isPresent()){
+                        if (oMajor != null && oMajor.isPresent()) {
                             wd.setMajor(major);
                             wd.setMajorId(oMajor.get().getId());
                         }
@@ -475,7 +474,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         String dormitory = dataFormatter.formatCellValue(row.getCell(3));//寝室号
                         WelcomeDormitory wd = new WelcomeDormitory();
                         Optional<WelcomeDormitory> owelcomeDormitory = wds.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build) && e.getDormitory().equals(dormitory)).findFirst();
-                        if(owelcomeDormitory != null && owelcomeDormitory.isPresent()){
+                        if (owelcomeDormitory != null && owelcomeDormitory.isPresent()) {
                             wd.setId(owelcomeDormitory.get().getId());
                         }
 
@@ -490,7 +489,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
 
                         wd.setSchool(school);
                         Optional<WelcomeBuild> oBuild = buildDatas.stream().filter(e -> e.getSchool().equals(school) && e.getBuild().equals(build)).findFirst();
-                        if(oBuild != null && oBuild.isPresent()){
+                        if (oBuild != null && oBuild.isPresent()) {
                             wd.setBuild(build);
                             wd.setBuildId(oBuild.get().getId());
                         }
@@ -498,13 +497,13 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
                         wd.setSex(sex);
 
                         Optional<WelcomeOrg> oCollege = orgs.stream().filter(e -> e.getName().equals(college)).findFirst();
-                        if(oCollege != null && oCollege.isPresent()){
+                        if (oCollege != null && oCollege.isPresent()) {
                             wd.setCollege(major);
                             wd.setCollegeId(oCollege.get().getId());
                         }
 
                         Optional<WelcomeOrg> oMajor = orgs.stream().filter(e -> e.getName().equals(major)).findFirst();
-                        if(oMajor != null && oMajor.isPresent()){
+                        if (oMajor != null && oMajor.isPresent()) {
                             wd.setMajor(major);
                             wd.setMajorId(oMajor.get().getId());
                         }
@@ -531,8 +530,8 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
     }
 
     @Override
-    public void welcomeDormitoryExport(HttpServletResponse response, String schoolName,String buildName,String dormitory,String sex,Integer status,String major,String college) {
-        List<WelcomeDormitory> result = welcomeDormitoryService.listDormitory(schoolName,buildName,dormitory,sex,status,major,college);
+    public void welcomeDormitoryExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
+        List<WelcomeDormitoryVo> result = welcomeDormitoryService.listDormitory(schoolId, buildId, dormitoryId, sex, status, majorId, collegeId);
         //导出
         Workbook workbook = new XSSFWorkbook();
         Sheet sheet = workbook.createSheet("宿舍信息");
@@ -550,7 +549,7 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         headerRow.createCell(9).setCellValue("入住情况");
         headerRow.createCell(10).setCellValue("备注");
         for (int i = 0; i < result.size(); i++) {
-            WelcomeDormitory build = result.get(i);
+            WelcomeDormitoryVo build = result.get(i);
             Row dataRow = sheet.createRow(i + 1);
             dataRow.createCell(0).setCellValue(i + 1);
             dataRow.createCell(1).setCellValue(build.getSchool());

src/main/java/com/template/mapper/WelcomeDormitoryMapper.java

@@ -32,5 +32,10 @@ public interface WelcomeDormitoryMapper extends BaseMapper<WelcomeDormitory> {
                                             @Param("majorId") Integer majorId, @Param("collegeId") Integer collegeId);
 
 
+    List<WelcomeDormitoryVo> listDormitory( @Param("schoolId") Integer schoolId, @Param("buildId") Integer buildId,
+                                            @Param("dormitoryId") Integer dormitoryId, @Param("sex") String sex, @Param("status") Integer status,
+                                            @Param("majorId") Integer majorId, @Param("collegeId") Integer collegeId);
+
+
     StudentStayVo getTotalCount(@Param("buildId") Integer buildId);
 }

src/main/java/com/template/services/WelcomeDormitoryService.java

@@ -34,7 +34,7 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     PageUtils<WelcomeDormitoryVo> listDormitory(int currentPage, int pageCount, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
 
-    List<WelcomeDormitory> listDormitory( String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college);
+    List<WelcomeDormitoryVo> listDormitory(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId);
 
     List<WelcomeDormitory> dormitoryGroup(Integer schoolId, Integer buildId);
 

src/main/java/com/template/services/impl/WelcomeDormitoryServiceImpl.java

@@ -86,18 +86,9 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
     }
 
     @Override
-    public List<WelcomeDormitory> listDormitory(String schoolName, String buildName, String dormitory, String sex, Integer status, String major, String college) {
-
-        LambdaQueryWrapper<WelcomeDormitory> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(ObjectUtils.isNotEmpty(schoolName),WelcomeDormitory::getSchool,schoolName)
-                .eq(ObjectUtils.isNotEmpty(buildName),WelcomeDormitory::getBuild,buildName)
-                .eq(ObjectUtils.isNotEmpty(dormitory),WelcomeDormitory::getDormitory,dormitory)
-                .eq(ObjectUtils.isNotEmpty(sex),WelcomeDormitory::getSex,sex)
-                .eq(ObjectUtils.isNotEmpty(status),WelcomeDormitory::getStatus,status)
-                .eq(ObjectUtils.isNotEmpty(major),WelcomeDormitory::getMajor,major)
-                .eq(ObjectUtils.isNotEmpty(college),WelcomeDormitory::getCollege,college);
-
-        List<WelcomeDormitory> result = welcomeDormitoryMapper.selectList(queryWrapper);
+    public List<WelcomeDormitoryVo> listDormitory(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer status, Integer majorId, Integer collegeId) {
+
+        List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitory(schoolId,buildId,dormitoryId,sex,status,majorId,collegeId);
         return result;
     }