更新床位导出

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

@@ -48,7 +48,7 @@ public interface WelcomeBedControllerAPI {
 
     @GetMapping(value = "welcomeBedExport")
     @ApiOperation(value = "导出床位信息数据", notes = "导出床位信息数据", httpMethod = "GET")
-    void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId);
+    void welcomeBedExport(HttpServletResponse response, Integer schoolId,Integer buildId,Integer dormitoryId,String sex, Integer isCheck,Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
 
     @PostMapping(value = "/submit")
     @ApiOperation(value = "提交床位信息", notes = "提交床位信息", httpMethod = "POST")

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

@@ -633,8 +633,8 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
     }
 
     @Override
-    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
-        List<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId);
+    public void welcomeBedExport(HttpServletResponse response, Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
+        List<WelcomeBed> result = welcomeBedService.queryPageWelcomeBeds(schoolId, buildId, dormitoryId, sex, isCheck, collegeId, majorId, classstrId,retentionState);
 
         //导出
         Workbook workbook = new XSSFWorkbook();
@@ -666,7 +666,12 @@ public class WelcomeBedController implements WelcomeBedControllerAPI {
             dataRow.createCell(3).setCellValue(bed.getDormitory());
             dataRow.createCell(4).setCellValue(bed.getNumber());
             dataRow.createCell(5).setCellValue(bed.getSex());
-            dataRow.createCell(6).setCellValue(bed.getGrade());
+            if (ObjectUtils.isEmpty(bed.getGrade())) {
+                dataRow.createCell(6).setCellValue("");
+            }else {
+                dataRow.createCell(6).setCellValue(bed.getGrade());
+            }
+
             dataRow.createCell(7).setCellValue(bed.getCollege());
             dataRow.createCell(8).setCellValue(bed.getMajor());
             dataRow.createCell(9).setCellValue(bed.getClassstr());

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

@@ -32,7 +32,7 @@ public interface WelcomeBedService extends IService<WelcomeBed> {
 
     WelcomeBed queryBedData(String school, Integer buildId, Integer dormitoryId, Integer number);
 
-    List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId);
+    List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState);
 
     WelcomeBed getBedByCardId(String studentCard);
 

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

@@ -89,7 +89,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
     }
 
     @Override
-    public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId) {
+    public List<WelcomeBed> queryPageWelcomeBeds(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, Integer isCheck, Integer collegeId, Integer majorId, Integer classstrId,Integer retentionState) {
         QueryWrapper<WelcomeBed> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq(schoolId != null, "school_id", schoolId);
         queryWrapper.eq(buildId != null, "build_id", buildId);
@@ -99,6 +99,7 @@ public class WelcomeBedServiceImpl extends ServiceImpl<WelcomeBedMapper, Welcome
         queryWrapper.eq(collegeId != null, "college_id", collegeId);
         queryWrapper.eq(majorId != null, "major_id", majorId);
         queryWrapper.eq(classstrId != null, "classstr_id", classstrId);
+        queryWrapper.eq(retentionState != null, "retention_state", retentionState);
         List<WelcomeBed> result = welcomeBedMapper.selectList(queryWrapper);
         return result;
     }