Merge branch 'master' of https://e.coding.net/chuanghaikeji/smarCampus/backend_dormitory

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

@@ -69,4 +69,8 @@ public interface WelcomeDormitoryControllerAPI {
     @GetMapping(value = "/saveBedDormitoryGroup")
     @ApiOperation(value = "添加床位楼栋分组", notes = "添加床位楼栋分组", httpMethod = "GET")
     CommonResult saveBedDormitoryGroup(Integer schoolId,Integer accountId);
+
+    @GetMapping(value = "/dormitoryTGroup")
+    @ApiOperation(value = "寝室分组", notes = "寝室分组", httpMethod = "GET")
+    CommonResult dormitoryTGroup(Integer schoolId,Integer buildId);
 }

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

@@ -768,5 +768,12 @@ public class WelcomeDormitoryController implements WelcomeDormitoryControllerAPI
         }
         return CommonResult.ok(vos);
     }
+
+    @Override
+    public CommonResult dormitoryTGroup(Integer schoolId, Integer buildId) {
+        List<WelcomeDormitory> list = welcomeDormitoryService.dormitoryTGroup(schoolId, buildId);
+
+        return CommonResult.ok(list);
+    }
 }
 

src/main/java/com/template/model/vo/WelcomeVisitorVO.java

@@ -19,9 +19,8 @@ public class WelcomeVisitorVO implements Serializable {
     @ExcelProperty("id")
     private Integer id;
 
-    @ApiModelProperty(value = "学生身份证号")
-    @ExcelProperty("学生身份证号")
-    @ExcelIgnore
+    @ApiModelProperty(value = "学号/录取号")
+    @ExcelProperty("学号/录取号")
     private String studentCard;
 
     @ApiModelProperty(value = "学生姓名")

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

@@ -47,4 +47,5 @@ public interface WelcomeDormitoryService extends IService<WelcomeDormitory> {
 
     List<WelcomeDormitoryVo> listDormitoryS(Integer schoolId, Integer buildId, Integer dormitoryId, String sex, String collegeIds, Integer status, Integer retentionState);
 
+    List<WelcomeDormitory> dormitoryTGroup(Integer schoolId, Integer buildId);
 }

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

@@ -141,4 +141,13 @@ public class WelcomeDormitoryServiceImpl extends ServiceImpl<WelcomeDormitoryMap
         List<WelcomeDormitoryVo> result = welcomeDormitoryMapper.listDormitoryS(schoolId,buildId,dormitoryId,sex,collegeIds,status,retentionState);
         return result;
     }
+
+    @Override
+    public List<WelcomeDormitory> dormitoryTGroup(Integer schoolId, Integer buildId) {
+        LambdaQueryWrapper<WelcomeDormitory> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(ObjectUtils.isNotEmpty(schoolId), WelcomeDormitory::getSchoolId, schoolId)
+                .eq(ObjectUtils.isNotEmpty(buildId), WelcomeDormitory::getBuildId, buildId);
+        List<WelcomeDormitory> welcomeDormitories = welcomeDormitoryMapper.selectList(wrapper);
+        return welcomeDormitories;
+    }
 }