diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java index c5a861f9..2fb78b63 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/contoller/CeesDormitoryInfoController.java @@ -96,8 +96,8 @@ public class CeesDormitoryInfoController extends JeecgController selectBySex(@RequestParam(name="sex",required=true) String sex) { - return ceesDormitoryInfoService.selectBySex(sex); + public Result selectBySex(@RequestParam(name="sex",required=true) String sex, @RequestParam(name="majorId") Integer majorId) { + return ceesDormitoryInfoService.selectBySex(sex, majorId); } /** * 通过id删除 diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java index e2ba2ce9..ed12605d 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/ICeesDormitoryInfoService.java @@ -17,7 +17,7 @@ import javax.servlet.http.HttpServletRequest; */ public interface ICeesDormitoryInfoService extends IService { - Result selectBySex(String sex); + Result selectBySex(String sex, Integer majorId); IPage queryPageList(CeesDormitoryInfo ceesDormitoryInfo, Integer pageNo, Integer pageSize, HttpServletRequest req); } diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java index f32f9959..594f2213 100644 --- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java +++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/CeesDormitoryInfoServiceImpl.java @@ -46,7 +46,7 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl selectBySex(String sex) { + public Result selectBySex(String sex, Integer majorId) { //todo: 未添加宿舍满员的情况和宿舍是否正常使用 Integer type = Integer.parseInt(sex); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); @@ -54,6 +54,9 @@ public class CeesDormitoryInfoServiceImpl extends ServiceImpl list = ceesDormitoryInfoMapper.selectList(wrapper); JSONArray resultArray = new JSONArray(); for (CeesDormitoryInfo dorm : list) {