合并代码

Pu Zhibing

2025-01-24 face1a695132461b2a2e6b2c47e3dfe495d9b227

 cloud-server-account/src/main/java/com/dsh/account/controller/StudentController.java

@@ -1085,7 +1085,8 @@
    @PostMapping("/student/queryUserAge1")
    public HashMap<String, Object> queryUserAge1() {
        HashMap<String, Object> map = new HashMap<>();
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1));
        List<TAppUser> list = appUserService.list(new LambdaQueryWrapper<TAppUser>().eq(TAppUser::getInsertType, 1)
                .isNotNull(TAppUser::getCity));
        List<Integer> collect = list.stream().map(TAppUser::getId).collect(Collectors.toList());
        if (collect.size() == 0) {
            collect.add(-1);
@@ -1381,7 +1382,14 @@
        map.put("boy", boy);
        map.put("girl", girl);
        return map;
    }



    @ResponseBody
    @PostMapping("/student/queryExpiredList")
    public List<TStudent> queryExpiredList(){
        List<TStudent> list = studentService.list(new QueryWrapper<TStudent>().eq("state", 1).last(" and DATE_FORMAT(now(), '%Y-%m-%d') > validity"));
        return list;
    }
}