From 8581b76c538ed2f31d20d8c2b4cf6aa9d5a0a0ef Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 07 十一月 2025 11:56:00 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mobile_community

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/THelpNeedsService.java                             |    3 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterServiceImpl.java                      |   12 
 ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml                                |   11 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TOtherConfigService.java                           |   16 
 ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml                                       |   17 
 ruoyi-system/src/main/resources/mapper/system/TOtherConfigMapper.xml                                   |   17 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAssistedDiningController.java                  |   65 +++
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/THelpNeedsMapper.java                               |    7 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TOtherConfig.java                                    |   42 ++
 ruoyi-system/src/main/resources/mapper/system/TOldsterMapper.xml                                       |   16 
 ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java                                    |    6 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterWarningMapper.java                          |   16 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java                                 |    6 
 ruoyi-system/src/main/java/com/ruoyi/system/query/OldsterListQuery.java                                |   19 
 ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java                            |   57 --
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOtherConfigServiceImpl.java                  |   20 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterMapper.java                                 |    7 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TAssistedDiningService.java                        |    4 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THelpNeedsServiceImpl.java                    |   12 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQuestionnaireStemBriefAnswerServiceImpl.java |   20 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java                          |   54 ++
 ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java                                  |   59 ++
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TQuestionnaireStemBriefAnswerMapper.java            |   16 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOtherConfigMapper.java                             |   16 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TQuestionnaireStemBriefAnswerService.java          |   16 
 ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java                                     |    2 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOtherConfigController.java                     |   20 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQuestionnaireStemBriefAnswerController.java    |   20 
 ruoyi-system/src/main/java/com/ruoyi/system/model/TOldsterWarning.java                                 |   40 +
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBannerMapper.java                                  |    7 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java                       |   12 
 ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml                                     |   13 
 ruoyi-system/src/main/java/com/ruoyi/system/query/BannerListQuery.java                                 |   12 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THelpNeedsController.java                       |   65 +++
 ruoyi-system/src/main/java/com/ruoyi/system/model/TQuestionnaireStemBriefAnswer.java                   |   46 ++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java                         |   35 +
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterWarningController.java                  |   20 
 ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml                                        |    9 
 ruoyi-system/src/main/java/com/ruoyi/system/query/AssistedDiningListQuery.java                         |   17 
 ruoyi-system/src/main/resources/mapper/system/TOldsterWarningMapper.xml                                |   22 +
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterWarningServiceImpl.java               |   20 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterService.java                               |    3 
 ruoyi-system/src/main/java/com/ruoyi/system/query/HelpNeedsListQuery.java                              |   21 +
 ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterWarningService.java                        |   16 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterController.java                         |  176 ++++++++
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java                       |   54 +-
 ruoyi-system/src/main/resources/mapper/system/TBannerMapper.xml                                        |    7 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java                               |    4 
 ruoyi-system/src/main/java/com/ruoyi/system/vo/SysUserVO.java                                          |    7 
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java                      |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/query/AppUserListQuery.java                                |   18 
 ruoyi-system/src/main/resources/mapper/system/TQuestionnaireStemBriefAnswerMapper.xml                  |   18 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java                      |   11 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java                       |    2 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAssistedDiningServiceImpl.java               |   12 
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAssistedDiningMapper.java                          |    7 
 ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java                                |    5 
 57 files changed, 1,144 insertions(+), 113 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
index f089354..bc31b5b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAppUserController.java
@@ -1,9 +1,18 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.query.AppUserListQuery;
+import com.ruoyi.system.service.TAppUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.annotation.Resource;
 
 /**
  * <p>
@@ -15,7 +24,29 @@
  */
 @RestController
 @RequestMapping("/t-app-user")
+@Api(tags = "用户管理")
 public class TAppUserController {
+    @Resource
+    private TAppUserService  appUserService;
 
+    @ApiOperation(value = "用户管理分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TAppUser>> pageList(@RequestBody AppUserListQuery query) {
+        return R.ok(appUserService.pageList(query));
+    }
+    @ApiOperation(value = "修改状态")
+    @GetMapping(value = "/changeStatus")
+    @Log(title = "小程序用户-修改状态", businessType = BusinessType.UPDATE)
+    public R pageList(Integer id) {
+        TAppUser appUser = appUserService.getById(id);
+        appUser.setStatus(appUser.getStatus()==1?2:1);
+        appUserService.updateById(appUser);
+        return R.ok();
+    }
+    @ApiOperation(value = "查看详情")
+    @GetMapping(value = "/detail")
+    public R<TAppUser> detail(Integer id) {
+        return R.ok(appUserService.getById( id));
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAssistedDiningController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAssistedDiningController.java
index d01d093..e3f32c5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAssistedDiningController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TAssistedDiningController.java
@@ -1,9 +1,26 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TAssistedDining;
+import com.ruoyi.system.model.TAssistedDining;
+import com.ruoyi.system.model.THelpNeeds;
+import com.ruoyi.system.query.AssistedDiningListQuery;
+import com.ruoyi.system.query.OldsterListQuery;
+import com.ruoyi.system.service.TAssistedDiningService;
+import com.ruoyi.system.service.TAssistedDiningService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -15,7 +32,51 @@
  */
 @RestController
 @RequestMapping("/t-assisted-dining")
+@Api(tags = "助餐管理")
 public class TAssistedDiningController {
+    @Autowired
+    private TAssistedDiningService assistedDiningService;
+    @ApiOperation(value = "助餐信息分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TAssistedDining>> pageList(@RequestBody AssistedDiningListQuery query) {
+        return R.ok(assistedDiningService.pageList(query));
+    }
 
+    @ApiOperation(value = "添加")
+    @Transactional
+    @Log(title = "助餐信息-添加", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public R<Boolean> save(@RequestBody TAssistedDining dto) {
+        assistedDiningService.save(dto);
+        return R.ok();
+    }
+    @ApiOperation(value = "修改")
+    @Log(title = "助餐信息-修改", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public R<Boolean> edit(@RequestBody TAssistedDining dto) {
+        assistedDiningService.updateById(dto);
+        return R.ok();
+    }
+    @Log(title = "助餐信息-删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "助餐信息-删除")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(assistedDiningService.removeById(id));
+    }
+
+    /**
+     * 批量删除助餐信息
+     */
+    @Log(title = "助餐信息-批量删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "助餐信息-批量删除")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(assistedDiningService.removeByIds(ids));
+    }
+    @ApiOperation(value = "查看详情")
+    @GetMapping(value = "/detail")
+    public R<TAssistedDining> detail(Integer id) {
+        return R.ok(assistedDiningService.getById( id));
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
index bd2becd..50ceb6c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
@@ -1,9 +1,27 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.TBanner;
+import com.ruoyi.system.query.AppUserListQuery;
+import com.ruoyi.system.query.BannerListQuery;
+import com.ruoyi.system.service.TBannerService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -15,7 +33,39 @@
  */
 @RestController
 @RequestMapping("/t-banner")
+@Api(tags = "轮播图管理")
 public class TBannerController {
+    @Autowired
+    private TBannerService bannerService;
+    @ApiOperation(value = "轮播图管理分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TBanner>> pageList(@RequestBody BannerListQuery  query) {
+        return R.ok(bannerService.pageList(query));
+    }
 
+    @ApiOperation(value = "添加")
+    @Transactional
+    @Log(title = "轮播图管理-添加", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public R<Boolean> save(@RequestBody TBanner entity) {
+        bannerService.save(entity);
+        return R.ok();
+    }
+    @ApiOperation(value = "修改")
+    @Log(title = "轮播图管理-修改", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public R<Boolean> edit(@RequestBody TBanner entity) {
+        bannerService.updateById(entity);
+        return R.ok();
+    }
+    @Log(title = "轮播图管理-删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "轮播图管理-删除")
+    @DeleteMapping(value = "/delete")
+    public R delete(@RequestParam String ids) {
+        List<Integer> res = Arrays.stream(ids.split(",")).map(Integer::parseInt).collect(Collectors.toList());
+        // 转换成Integer
+        bannerService.removeBatchByIds(res);
+        return R.ok();
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THelpNeedsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THelpNeedsController.java
index 966f750..f0c30d4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THelpNeedsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THelpNeedsController.java
@@ -1,9 +1,26 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.model.THelpNeeds;
+import com.ruoyi.system.model.THelpNeeds;
+import com.ruoyi.system.query.AssistedDiningListQuery;
+import com.ruoyi.system.query.HelpNeedsListQuery;
+import com.ruoyi.system.service.THelpNeedsService;
+import com.ruoyi.system.service.THelpNeedsService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -15,7 +32,51 @@
  */
 @RestController
 @RequestMapping("/t-help-needs")
+@Api(tags = "助需管理")
 public class THelpNeedsController {
+    @Autowired
+    private THelpNeedsService helpNeedsService;
+    @ApiOperation(value = "助需管理分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<THelpNeeds>> pageList(@RequestBody HelpNeedsListQuery query) {
+        return R.ok(helpNeedsService.pageList(query));
+    }
 
+    @ApiOperation(value = "添加")
+    @Transactional
+    @Log(title = "助需管理-添加", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public R<Boolean> save(@RequestBody THelpNeeds dto) {
+        helpNeedsService.save(dto);
+        return R.ok();
+    }
+    @ApiOperation(value = "修改")
+    @Log(title = "助需管理-修改", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public R<Boolean> edit(@RequestBody THelpNeeds dto) {
+        helpNeedsService.updateById(dto);
+        return R.ok();
+    }
+    @Log(title = "助需管理-删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "助需管理-删除")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(helpNeedsService.removeById(id));
+    }
+
+    /**
+     * 批量删除助需管理
+     */
+    @Log(title = "助需管理-批量删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "助需管理-批量删除")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(helpNeedsService.removeByIds(ids));
+    }
+    @ApiOperation(value = "查看详情")
+    @GetMapping(value = "/detail")
+    public R<THelpNeeds> detail(Integer id) {
+        return R.ok(helpNeedsService.getById( id));
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java
index eeb47f9..990051b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/THtmlConfigController.java
@@ -7,6 +7,7 @@
 import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.system.model.THtmlConfig;
 import com.ruoyi.system.service.THtmlConfigService;
+import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -22,6 +23,7 @@
  */
 @RestController
 @RequestMapping("/t-html-config")
+@Api(tags = "基础信息管理-协议管理")
 public class THtmlConfigController {
 
     private final THtmlConfigService htmlConfigService;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterController.java
index 9c266e6..6efe5b1 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterController.java
@@ -1,9 +1,50 @@
 package com.ruoyi.web.controller.api;
 
 
-import org.springframework.web.bind.annotation.RequestMapping;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.ExcelImportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.afterturn.easypoi.excel.entity.ImportParams;
+import cn.hutool.json.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ruoyi.common.annotation.Log;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.core.exception.ServiceException;
+import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.WebUtils;
+import com.ruoyi.system.export.OldsterImport;
+import com.ruoyi.system.model.TOldster;
+import com.ruoyi.system.query.BannerListQuery;
+import com.ruoyi.system.query.OldsterListQuery;
+import com.ruoyi.system.service.TOldsterService;
+import com.ruoyi.system.service.TOldsterService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
-import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -14,8 +55,139 @@
  * @since 2025-11-06
  */
 @RestController
+@Slf4j
 @RequestMapping("/t-oldster")
+@Api(tags = "老人户籍信息")
 public class TOldsterController {
+    @Autowired
+    private TOldsterService oldsterService; 
+    @ApiOperation(value = "老人户籍信息分页列表")
+    @PostMapping(value = "/pageList")
+    public R<PageInfo<TOldster>> pageList(@RequestBody OldsterListQuery query) {
+        return R.ok(oldsterService.pageList(query));
+    }
 
+    @ApiOperation(value = "添加")
+    @Transactional
+    @Log(title = "老人户籍信息-添加", businessType = BusinessType.INSERT)
+    @PostMapping(value = "/add")
+    public R<Boolean> save(@RequestBody TOldster dto) {
+        oldsterService.save(dto);
+        return R.ok();
+    }
+    @ApiOperation(value = "修改")
+    @Log(title = "老人户籍信息-修改", businessType = BusinessType.UPDATE)
+    @PostMapping(value = "/edit")
+    public R<Boolean> edit(@RequestBody TOldster dto) {
+        oldsterService.updateById(dto);
+        return R.ok();
+    }
+    /**
+     * 删除老人户籍信息
+     */
+    @Log(title = "老人户籍信息-删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "老人户籍信息-删除")
+    @DeleteMapping(value = "/deleteById")
+    public R<Boolean> deleteById(@RequestParam String id) {
+        return R.ok(oldsterService.removeById(id));
+    }
+
+    /**
+     * 批量删除老人户籍信息
+     */
+    @Log(title = "老人户籍信息-批量删除", businessType = BusinessType.DELETE)
+    @ApiOperation(value = "老人户籍信息-批量删除")
+    @DeleteMapping(value = "/deleteByIds")
+    public R<Boolean> deleteByIds(@RequestBody List<String> ids) {
+        return R.ok(oldsterService.removeByIds(ids));
+    }
+    @ApiOperation(value = "导入模板下载")
+    @GetMapping("/import-template")
+    public void importTemplate() {
+        List<OldsterImport> assetHouseInspectionImports = new ArrayList<>();
+        OldsterImport temp = new OldsterImport();
+        assetHouseInspectionImports.add(temp);
+        Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), OldsterImport.class, assetHouseInspectionImports);
+        HttpServletResponse response = WebUtils.response();
+        ServletOutputStream outputStream = null;
+        try {
+            String fileName = URLEncoder.encode("老人户籍信息导入模板.xls", "utf-8");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            response.setHeader("content-Type", "application/vnd.ms-excel");
+            response.setHeader("Pragma", "no-cache");
+            response.setHeader("Cache-Control", "no-cache");
+            outputStream = response.getOutputStream();
+            workbook.write(outputStream);
+        } catch (IOException e) {
+            e.printStackTrace();
+            System.out.println("老人户籍信息导入模板下载失败!");
+        } finally {
+            try {
+                outputStream.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    @Log(title = "老人户籍信息导入", businessType = BusinessType.INSERT)
+    @ApiOperation(value = "老人户籍信息导入")
+    @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
+    @PostMapping("/import")
+    public R<String> importLocation(@RequestPart("file") MultipartFile file) {
+        List<TOldster> oldsters = new ArrayList<>();
+        ImportParams params = new ImportParams();
+        params.setHeadRows(1); //表头行数
+        InputStream inputStream = null;
+        List<OldsterImport> assetHouseInspectionImports;
+        try {
+            inputStream = file.getInputStream();
+            assetHouseInspectionImports = ExcelImportUtil.importExcel(inputStream,
+                    OldsterImport.class, params);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("老人户籍信息导入失败:{}", e.getMessage());
+            throw new ServiceException("老人户籍信息导入失败!");
+        } finally {
+            try {
+                inputStream.close();
+            } catch (IOException e) {
+                throw new ServiceException(e.getMessage());
+            }
+        }
+        if (CollectionUtils.isEmpty(assetHouseInspectionImports)) {
+            throw new ServiceException("老人户籍信息数据为空!");
+        }
+        JSONObject result = new JSONObject();
+        int i = 1;
+        for (OldsterImport oldsterImport : assetHouseInspectionImports) {
+            if (!StringUtils.hasLength(oldsterImport.getOldsterName())){
+                result.append("第"+i+"行：[", "老人姓名"+"]不能为空");
+            }
+            if (oldsterImport.getOldsterAge()!=null){
+                result.append("第"+i+"行：[", "老人年龄"+"]不能为空");
+            }
+            if (oldsterImport.getOldsterSex()!=null){
+                result.append("第"+i+"行：[", "老人性别"+"]不能为空");
+            }
+            if (!StringUtils.hasLength(oldsterImport.getContactPhone())){
+                result.append("第"+i+"行：[", "联系方式"+"]不能为空");
+            }
+            if (oldsterImport.getOldsterType()!=null){
+                result.append("第"+i+"行：[", "人员类型"+"]不能为空");
+            }
+            if (!StringUtils.hasLength(oldsterImport.getAddress())){
+                result.append("第"+i+"行：[", "居住地址"+"]不能为空");
+            }
+            TOldster tOldster = new TOldster();
+            BeanUtils.copyProperties(oldsterImport, tOldster);
+            oldsters.add(tOldster);
+            i++;
+        }
+        oldsterService.saveBatch(oldsters);
+        if(!result.isEmpty()){
+            return R.fail(result.toString());
+        }
+        return R.ok();
+    }
 }
 
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterWarningController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterWarningController.java
new file mode 100644
index 0000000..c9e9a27
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOldsterWarningController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.web.controller.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 老人预警 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@RestController
+@RequestMapping("/t-oldster-warning")
+public class TOldsterWarningController {
+
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOtherConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOtherConfigController.java
new file mode 100644
index 0000000..3df5bf2
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TOtherConfigController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.web.controller.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 系统其他设置 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@RestController
+@RequestMapping("/t-other-config")
+public class TOtherConfigController {
+
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQuestionnaireStemBriefAnswerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQuestionnaireStemBriefAnswerController.java
new file mode 100644
index 0000000..966f788
--- /dev/null
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TQuestionnaireStemBriefAnswerController.java
@@ -0,0 +1,20 @@
+package com.ruoyi.web.controller.api;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 简答题答案 前端控制器
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@RestController
+@RequestMapping("/t-questionnaire-stem-brief-answer")
+public class TQuestionnaireStemBriefAnswerController {
+
+}
+
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index b6248cf..5bfea73 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -167,10 +167,9 @@
     // @PreAuthorize("@ss.hasPermi('system:user:add')")
     @ApiOperation(value = "新增用户管理",response = SysUser.class)
     @Log(title = "用户信息-新增用户", businessType = BusinessType.INSERT)
-    @PostMapping("/api/system/user/add")
-    public R<String> add(@RequestBody String param)
+    @PostMapping("/system/user/add")
+    public R<String> add(@RequestBody SysUser user)
     {
-        SysUser user = JSON.parseObject(param,SysUser.class);
         user.setUserName(user.getUserName());
         if (!userService.checkUserNameUnique(user))
         {
@@ -182,8 +181,6 @@
         }
         user.setCreateBy(getUsername());
         user.setPassword(SecurityUtils.encryptPassword("123456"));
-        user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
-        user.setUserIdentification(CodeGenerateUtils.generateVolumeSn());
         userService.insertUser(user);
         return R.ok();
     }
@@ -199,10 +196,9 @@
     // @PreAuthorize("@ss.hasPermi('system:user:edit')")
     @ApiOperation(value = "修改用户管理")
     @Log(title = "用户信息-修改用户", businessType = BusinessType.UPDATE)
-    @PostMapping("/api/system/user/edit")
-    public R edit(@RequestBody String param)
+    @PostMapping("/system/user/edit")
+    public R edit(@RequestBody SysUser user)
     {
-        SysUser user = JSON.parseObject(param,SysUser.class);
         user.setUserName(user.getPhonenumber());
 //        userService.checkUserAllowed(user);
 //        userService.checkUserDataScope(user.getUserId());
@@ -219,7 +215,6 @@
         if(StringUtils.isNotEmpty(user.getPassword())){
             user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
         }
-        user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
         return R.ok(userService.updateUser(user));
     }
 
@@ -265,10 +260,9 @@
     // @PreAuthorize("@ss.hasPermi('system:user:resetPwd')")
     @ApiOperation(value = "重置密码")
     @Log(title = "用户信息-重置密码", businessType = BusinessType.UPDATE)
-    @PostMapping("/api/system/user/resetPwd")
-    public AjaxResult resetPwd(@RequestBody String param)
+    @PostMapping("/system/user/resetPwd")
+    public AjaxResult resetPwd(@RequestBody SysUser user)
     {
-        SysUser user = JSON.parseObject(param,SysUser.class);
         userService.checkUserAllowed(user);
 //        userService.checkUserDataScope(user.getUserId());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
@@ -279,22 +273,26 @@
     /**
      * 状态修改
      */
-//    @ApiOperation(value = "状态修改")
-//    @Log(title = "用户信息-状态修改", businessType = BusinessType.UPDATE)
-//    @PutMapping("/system/user/changeStatus")
-//    public AjaxResult changeStatus(@RequestBody SysUserUpdateStatusDTO dto)
-//    {
-//        SysUser loginUser = tokenService.getLoginUser().getUser();
-//        SysUser user = new SysUser();
-//        user.setUserId(dto.getUserId());
-//        user.setStatus(String.valueOf(dto.getStatus()));
-////        user.setRemark(dto.getRemark());
-//        user.setUpdateBy(getUsername());
-//        user.setDisableRemark(dto.getRemark());
-//        user.setOperatingTime(LocalDateTime.now());
-//        user.setOperatingPerson(loginUser.getNickName()+"("+loginUser.getUserName()+")");
-//        return AjaxResult.success(userService.updateUserStatus(user));
-//    }
+    @ApiOperation(value = "禁用")
+    @Log(title = "用户信息-禁用", businessType = BusinessType.UPDATE)
+    @PutMapping("/system/user/off")
+    public AjaxResult off(Long userId,String  disableRemark)
+    {
+        SysUser user = userService.selectUserById(userId);
+        user.setDisableRemark(disableRemark);
+        user.setStatus("1");
+        return AjaxResult.success(userService.updateUser(user));
+    }
+    @ApiOperation(value = "启用")
+    @Log(title = "用户信息-启用", businessType = BusinessType.UPDATE)
+    @PutMapping("/system/user/on")
+    public AjaxResult on(Long userId)
+    {
+        SysUser user = userService.selectUserById(userId);
+        user.setStatus("0");
+        user.setDisableRemark(null);
+        return AjaxResult.success(userService.updateUser(user));
+    }
 
     /**
      * 根据用户编号获取授权角色
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
index 90fc6e0..67ee4d7 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java
@@ -46,6 +46,8 @@
     //@Excel(name = "用户名称")
     @ApiModelProperty(value = "用户名称")
     private String nickName;
+    @ApiModelProperty(value = "禁用备注")
+    private String disableRemark;
 
     /** 用户邮箱 */
     //@Excel(name = "用户邮箱")
@@ -113,20 +115,9 @@
     /** 角色ID */
     @ApiModelProperty(value = "角色ID")
     private Long roleId;
-    /**
-     * 是否为黑名单 1是 0否
-     */
-    @ApiModelProperty(value = "是否为黑名单 1是 0否")
-    private Integer ifBlack;
 
-    /**
-     * 区县id
-     */
-    @ApiModelProperty(value = "区县id")
-    private Integer districtId;
-    /** 角色类型 1=超管 2=审批人 3=工艺工程师 4=化验师 5=实验员 */
-    @ApiModelProperty(value = "角色类型 1=超管 2=审批人 3=工艺工程师 4=化验师 5=实验员")
-    private Integer roleType;
+
+
     @TableField(exist = false)
     private String roleName;
     @TableField(exist = false)
@@ -134,34 +125,7 @@
     @TableField(exist = false)
     private List<String> deptIds;
 
-    @ApiModelProperty(value = "营业部id")
-    @TableField("business_dept_id")
-    private String businessDeptId;
 
-    @ApiModelProperty(value = "签名照")
-    @TableField("sign_picture")
-    private String signPicture;
-
-    @ApiModelProperty(value = "用户唯一标识")
-    @TableField("userIdentification")
-    private String userIdentification;
-    @ApiModelProperty(value = "继承账号id")
-    @TableField("parentId")
-    private Long parentId;
-    @ApiModelProperty(value = "继承账号")
-    @TableField("parentAccount")
-    private String parentAccount;
-    @ApiModelProperty(value = "分配")
-    @TableField("allocateIp")
-    private String allocateIp;
-
-    public Integer getRoleType() {
-        return roleType;
-    }
-
-    public void setRoleType(Integer roleType) {
-        this.roleType = roleType;
-    }
 
     public String getRoleName() {
         return roleName;
@@ -171,13 +135,6 @@
         this.roleName = roleName;
     }
 
-    public Integer getDistrictId() {
-        return districtId;
-    }
-
-    public void setDistrictId(Integer districtId) {
-        this.districtId = districtId;
-    }
 
     public SysUser()
     {
@@ -386,13 +343,7 @@
         this.roleId = roleId;
     }
 
-    public Integer getIfBlack() {
-        return ifBlack;
-    }
 
-    public void setIfBlack(Integer ifBlack) {
-        this.ifBlack = ifBlack;
-    }
 
     @Override
     public String toString() {
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java b/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java
new file mode 100644
index 0000000..9d1a523
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java
@@ -0,0 +1,59 @@
+package com.ruoyi.system.export;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+@Data
+@ApiModel(value = "老人户籍信息导入excel")
+public class OldsterImport implements Serializable {
+
+    @Excel(name = "老人姓名",width = 20)
+    @ApiModelProperty(value = "老人姓名")
+    private String oldsterName;
+
+    @ApiModelProperty(value = "老人年龄")
+    @Excel(name = "老人年龄",width = 20)
+    private Integer oldsterAge;
+
+    @ApiModelProperty(value = "性别 1=男 2=女")
+    @Excel(name = "性别",width = 20)
+    private Integer oldsterSex;
+
+    @ApiModelProperty(value = "联系方式")
+    @Excel(name = "联系方式",width = 20)
+    private String contactPhone;
+
+    @ApiModelProperty(value = "监护人姓名")
+    @Excel(name = "监护人姓名",width = 20)
+    private String guardianName;
+
+    @ApiModelProperty(value = "监护人电话")
+    @Excel(name = "监护人电话",width = 20)
+    private String guardianPhone;
+
+
+    @ApiModelProperty(value = "身份证")
+    @Excel(name = "身份证",width = 40)
+    private String idCard;
+
+    @ApiModelProperty(value = "出生日期")
+    @Excel(name = "出生日期",width = 20)
+    private String birthDate;
+
+    @ApiModelProperty(value = "人员类型 1=独居老人 2=高龄老人 3=散居特困供养老人 4=失能老人")
+    @Excel(name = "人员类型",width = 20)
+    private String oldsterType;
+
+    @ApiModelProperty(value = "居住地址")
+    @Excel(name = "居住地址",width = 50)
+    private String address;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
index 8ae6465..fbb97fb 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAppUserMapper.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.query.AppUserListQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,5 @@
  */
 public interface TAppUserMapper extends BaseMapper<TAppUser> {
 
+    List<TAppUser> pageList(@Param("query")AppUserListQuery query,@Param("pageInfo") PageInfo<TAppUser> pageInfo);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAssistedDiningMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAssistedDiningMapper.java
index 8a4cb95..871ba38 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAssistedDiningMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TAssistedDiningMapper.java
@@ -1,7 +1,13 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TAssistedDining;
+import com.ruoyi.system.query.AssistedDiningListQuery;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.security.core.parameters.P;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +19,5 @@
  */
 public interface TAssistedDiningMapper extends BaseMapper<TAssistedDining> {
 
+    List<TAssistedDining> pageList(@Param("query") AssistedDiningListQuery query,@Param("pageInfo") PageInfo<TAssistedDining> pageInfo);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBannerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBannerMapper.java
index 10a92bd..08115d3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBannerMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TBannerMapper.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TBanner;
+import com.ruoyi.system.query.BannerListQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,6 @@
  */
 public interface TBannerMapper extends BaseMapper<TBanner> {
 
+    List<TBanner> pageList(@Param("query")BannerListQuery query, @Param("pageInfo")PageInfo<TBanner> pageInfo);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THelpNeedsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THelpNeedsMapper.java
index 30bd6fc..66d9db1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THelpNeedsMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/THelpNeedsMapper.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.THelpNeeds;
+import com.ruoyi.system.query.HelpNeedsListQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,6 @@
  */
 public interface THelpNeedsMapper extends BaseMapper<THelpNeeds> {
 
+    List<THelpNeeds> pageList(@Param("query") HelpNeedsListQuery query, @Param("pageInfo") PageInfo<THelpNeeds> pageInfo);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterMapper.java
index 81ed116..64741a7 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterMapper.java
@@ -1,7 +1,12 @@
 package com.ruoyi.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TOldster;
+import com.ruoyi.system.query.OldsterListQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +18,6 @@
  */
 public interface TOldsterMapper extends BaseMapper<TOldster> {
 
+    List<TOldster> pageList(@Param("query") OldsterListQuery query,@Param("pageInfo") PageInfo<TOldster> pageInfo);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterWarningMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterWarningMapper.java
new file mode 100644
index 0000000..8dd358a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOldsterWarningMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TOldsterWarning;
+
+/**
+ * <p>
+ * 老人预警 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+public interface TOldsterWarningMapper extends BaseMapper<TOldsterWarning> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOtherConfigMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOtherConfigMapper.java
new file mode 100644
index 0000000..de9aa0a
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TOtherConfigMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TOtherConfig;
+
+/**
+ * <p>
+ * 系统其他设置 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+public interface TOtherConfigMapper extends BaseMapper<TOtherConfig> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TQuestionnaireStemBriefAnswerMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TQuestionnaireStemBriefAnswerMapper.java
new file mode 100644
index 0000000..92a5f04
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TQuestionnaireStemBriefAnswerMapper.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.system.model.TQuestionnaireStemBriefAnswer;
+
+/**
+ * <p>
+ * 简答题答案 Mapper 接口
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+public interface TQuestionnaireStemBriefAnswerMapper extends BaseMapper<TQuestionnaireStemBriefAnswer> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java
index 5650988..c06e6b6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/THtmlConfig.java
@@ -30,7 +30,7 @@
     @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
-    @ApiModelProperty(value = "类型 1=托育服务 2=阅芽计划 3=办事指南图文指引 4=暖心服务图片 5=注册协议 6=隐私政策 7=学习申请书 8=安全告知书 9=购买支付说明 10=微心愿风险提示 11=群众诉求服务说明 12=随手拍说明")
+    @ApiModelProperty(value = "类型 1=托育服务 2=阅芽计划 3=办事指南图文指引 4=暖心服务图片 5=注册协议 6=隐私政策 7=学习申请书 8=安全告知书 9=购买支付说明 10=微心愿风险提示 11=群众诉求服务说明 12=随手拍说明 13=康年年图文介绍")
     @TableField("config_type")
     private Integer configType;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TOldsterWarning.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TOldsterWarning.java
new file mode 100644
index 0000000..69075a8
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TOldsterWarning.java
@@ -0,0 +1,40 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.common.core.domain.BaseModel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 老人预警
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_oldster_warning")
+@ApiModel(value="TOldsterWarning对象", description="老人预警")
+public class TOldsterWarning extends BaseModel {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "老人户籍id")
+    @TableField("oldster_id")
+    private String oldsterId;
+
+    @ApiModelProperty(value = "预警时间")
+    @TableField("warning_time")
+    private LocalDateTime warningTime;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TOtherConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TOtherConfig.java
new file mode 100644
index 0000000..612ef19
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TOtherConfig.java
@@ -0,0 +1,42 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 系统其他设置
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_other_config")
+@ApiModel(value="TOtherConfig对象", description="系统其他设置")
+public class TOtherConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "老人年龄")
+    @TableField("elderly_age")
+    private Integer elderlyAge;
+
+    @ApiModelProperty(value = "天数")
+    @TableField("days")
+    private Integer days;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQuestionnaireStemBriefAnswer.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQuestionnaireStemBriefAnswer.java
new file mode 100644
index 0000000..bd2ca92
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQuestionnaireStemBriefAnswer.java
@@ -0,0 +1,46 @@
+package com.ruoyi.system.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 简答题答案
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("t_questionnaire_stem_brief_answer")
+@ApiModel(value="TQuestionnaireStemBriefAnswer对象", description="简答题答案")
+public class TQuestionnaireStemBriefAnswer implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
+    private String id;
+
+    @ApiModelProperty(value = "题干id")
+    @TableField("stem_id")
+    private String stemId;
+
+    @ApiModelProperty(value = "用户id")
+    @TableField("app_user_id")
+    private String appUserId;
+
+    @ApiModelProperty(value = "回答内容")
+    @TableField("answer_content")
+    private String answerContent;
+
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/AppUserListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/AppUserListQuery.java
new file mode 100644
index 0000000..6c3e98b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AppUserListQuery.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "用户管理分页列表query")
+public class AppUserListQuery extends BasePage {
+    @ApiModelProperty(value = "用户昵称")
+    private String nickName;
+    @ApiModelProperty(value = "手机号")
+    private String phoneNumber;
+    @ApiModelProperty(value = "状态 1=使用中 2=冻结")
+    private Integer status;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/AssistedDiningListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssistedDiningListQuery.java
new file mode 100644
index 0000000..1709869
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/AssistedDiningListQuery.java
@@ -0,0 +1,17 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "助餐管理分页列表query")
+public class AssistedDiningListQuery extends BasePage {
+    @ApiModelProperty(value = "点位名称")
+    private String pointName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String pointPhone;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/BannerListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/BannerListQuery.java
new file mode 100644
index 0000000..e71fffd
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/BannerListQuery.java
@@ -0,0 +1,12 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "Banner管理分页列表query")
+public class BannerListQuery extends BasePage {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/HelpNeedsListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/HelpNeedsListQuery.java
new file mode 100644
index 0000000..c14de9d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/HelpNeedsListQuery.java
@@ -0,0 +1,21 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "助需管理分页列表query")
+public class HelpNeedsListQuery extends BasePage {
+    @ApiModelProperty(value = "发布人姓名")
+    private String nickName;
+
+    @ApiModelProperty(value = "联系电话")
+    private String contactNumber;
+    @ApiModelProperty(value = "发布时间开始 yyyy-MM-dd HH:mm:ss")
+    private String startTime;
+    @ApiModelProperty(value = "发布时间结束 yyyy-MM-dd HH:mm:ss")
+    private String endTime;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/OldsterListQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/OldsterListQuery.java
new file mode 100644
index 0000000..de92c11
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/OldsterListQuery.java
@@ -0,0 +1,19 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "老人户籍信息分页列表query")
+public class OldsterListQuery extends BasePage {
+    @ApiModelProperty(value = "老人姓名")
+    private String oldsterName;
+    @ApiModelProperty(value = "人员类型 1=独居老人 2=高龄老人 3=散居特困供养老人 4=失能老人")
+    private Integer oldsterType;
+
+    @ApiModelProperty(value = "联系方式")
+    private String contactPhone;
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
index 5b12765..8e52768 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/SysUserQuery.java
@@ -17,13 +17,9 @@
     @ApiModelProperty(value = "角色id")
     private List<Integer> roleIds;
 
-    @ApiModelProperty(value = "部门id集合")
-    private List<String> deptIds;
-
     @ApiModelProperty(value = "状态  0=正常 1=停用")
     private String status;
 
-    @ApiModelProperty(value = "营业部id",hidden = true)
-    private String businessDeptId;
+
 
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
index 969eec2..9bbd030 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAppUserService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.query.AppUserListQuery;
 
 /**
  * <p>
@@ -13,4 +15,6 @@
  */
 public interface TAppUserService extends IService<TAppUser> {
 
+    PageInfo<TAppUser> pageList(AppUserListQuery query);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAssistedDiningService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAssistedDiningService.java
index 1049b45..fc608d4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TAssistedDiningService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TAssistedDiningService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TAssistedDining;
+import com.ruoyi.system.query.AssistedDiningListQuery;
 
 /**
  * <p>
@@ -13,4 +15,6 @@
  */
 public interface TAssistedDiningService extends IService<TAssistedDining> {
 
+    PageInfo<TAssistedDining> pageList(AssistedDiningListQuery query);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java
index f557703..e8fafa2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TBannerService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TBanner;
+import com.ruoyi.system.query.BannerListQuery;
 
 /**
  * <p>
@@ -13,4 +15,7 @@
  */
 public interface TBannerService extends IService<TBanner> {
 
+
+    PageInfo<TBanner> pageList(BannerListQuery query);
+
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/THelpNeedsService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/THelpNeedsService.java
index 9613c82..2dd1977 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/THelpNeedsService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/THelpNeedsService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.THelpNeeds;
+import com.ruoyi.system.query.HelpNeedsListQuery;
 
 /**
  * <p>
@@ -13,4 +15,5 @@
  */
 public interface THelpNeedsService extends IService<THelpNeeds> {
 
+    PageInfo<THelpNeeds> pageList(HelpNeedsListQuery query);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterService.java
index a80d5c3..811060a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterService.java
@@ -1,7 +1,9 @@
 package com.ruoyi.system.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.model.TOldster;
+import com.ruoyi.system.query.OldsterListQuery;
 
 /**
  * <p>
@@ -13,4 +15,5 @@
  */
 public interface TOldsterService extends IService<TOldster> {
 
+    PageInfo<TOldster> pageList(OldsterListQuery query);
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterWarningService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterWarningService.java
new file mode 100644
index 0000000..215e325
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOldsterWarningService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TOldsterWarning;
+
+/**
+ * <p>
+ * 老人预警 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+public interface TOldsterWarningService extends IService<TOldsterWarning> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TOtherConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOtherConfigService.java
new file mode 100644
index 0000000..efc4056
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TOtherConfigService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TOtherConfig;
+
+/**
+ * <p>
+ * 系统其他设置 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+public interface TOtherConfigService extends IService<TOtherConfig> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TQuestionnaireStemBriefAnswerService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TQuestionnaireStemBriefAnswerService.java
new file mode 100644
index 0000000..3acffcf
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TQuestionnaireStemBriefAnswerService.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.system.model.TQuestionnaireStemBriefAnswer;
+
+/**
+ * <p>
+ * 简答题答案 服务类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+public interface TQuestionnaireStemBriefAnswerService extends IService<TQuestionnaireStemBriefAnswer> {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
index fd39ee9..66328f8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -658,8 +658,6 @@
     @Override
     public PageInfo<SysUserVO> pageList(SysUserQuery query) {
         PageInfo<SysUserVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
-        String businessDeptId = SecurityUtils.getBusinessDeptId();
-        query.setBusinessDeptId(businessDeptId);
         List<SysUserVO> list = userMapper.pageList(query,pageInfo);
         if(CollectionUtils.isEmpty(list)){
             return pageInfo;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
index 563e1e5..2a6b7ca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAppUserServiceImpl.java
@@ -1,10 +1,14 @@
 package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.TAppUserMapper;
 import com.ruoyi.system.model.TAppUser;
+import com.ruoyi.system.query.AppUserListQuery;
 import com.ruoyi.system.service.TAppUserService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +21,11 @@
 @Service
 public class TAppUserServiceImpl extends ServiceImpl<TAppUserMapper, TAppUser> implements TAppUserService {
 
+    @Override
+    public PageInfo<TAppUser> pageList(AppUserListQuery query) {
+        PageInfo<TAppUser> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TAppUser> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords( list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAssistedDiningServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAssistedDiningServiceImpl.java
index fd85794..ba83d36 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAssistedDiningServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TAssistedDiningServiceImpl.java
@@ -1,10 +1,15 @@
 package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.TAssistedDiningMapper;
+import com.ruoyi.system.model.TAppUser;
 import com.ruoyi.system.model.TAssistedDining;
+import com.ruoyi.system.query.AssistedDiningListQuery;
 import com.ruoyi.system.service.TAssistedDiningService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +22,11 @@
 @Service
 public class TAssistedDiningServiceImpl extends ServiceImpl<TAssistedDiningMapper, TAssistedDining> implements TAssistedDiningService {
 
+    @Override
+    public PageInfo<TAssistedDining> pageList(AssistedDiningListQuery query) {
+        PageInfo<TAssistedDining> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TAssistedDining> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords( list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java
index a40c293..cd17488 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBannerServiceImpl.java
@@ -1,10 +1,14 @@
 package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.TBannerMapper;
 import com.ruoyi.system.model.TBanner;
+import com.ruoyi.system.query.BannerListQuery;
 import com.ruoyi.system.service.TBannerService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +21,12 @@
 @Service
 public class TBannerServiceImpl extends ServiceImpl<TBannerMapper, TBanner> implements TBannerService {
 
+
+    @Override
+    public PageInfo<TBanner> pageList(BannerListQuery query) {
+        PageInfo<TBanner> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TBanner> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords( list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THelpNeedsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THelpNeedsServiceImpl.java
index 5691a20..6b80115 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THelpNeedsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THelpNeedsServiceImpl.java
@@ -1,10 +1,15 @@
 package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.THelpNeedsMapper;
+import com.ruoyi.system.model.TAssistedDining;
 import com.ruoyi.system.model.THelpNeeds;
+import com.ruoyi.system.query.HelpNeedsListQuery;
 import com.ruoyi.system.service.THelpNeedsService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +22,11 @@
 @Service
 public class THelpNeedsServiceImpl extends ServiceImpl<THelpNeedsMapper, THelpNeeds> implements THelpNeedsService {
 
+    @Override
+    public PageInfo<THelpNeeds> pageList(HelpNeedsListQuery query) {
+        PageInfo<THelpNeeds> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<THelpNeeds> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords( list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterServiceImpl.java
index 2dd4352..061cabe 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterServiceImpl.java
@@ -1,10 +1,15 @@
 package com.ruoyi.system.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
 import com.ruoyi.system.mapper.TOldsterMapper;
+import com.ruoyi.system.model.TBanner;
 import com.ruoyi.system.model.TOldster;
+import com.ruoyi.system.query.OldsterListQuery;
 import com.ruoyi.system.service.TOldsterService;
 import org.springframework.stereotype.Service;
+
+import java.util.List;
 
 /**
  * <p>
@@ -17,4 +22,11 @@
 @Service
 public class TOldsterServiceImpl extends ServiceImpl<TOldsterMapper, TOldster> implements TOldsterService {
 
+    @Override
+    public PageInfo<TOldster> pageList(OldsterListQuery query) {
+        PageInfo<TOldster> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+        List<TOldster> list = this.baseMapper.pageList(query,pageInfo);
+        pageInfo.setRecords( list);
+        return pageInfo;
+    }
 }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterWarningServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterWarningServiceImpl.java
new file mode 100644
index 0000000..209c574
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOldsterWarningServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TOldsterWarningMapper;
+import com.ruoyi.system.model.TOldsterWarning;
+import com.ruoyi.system.service.TOldsterWarningService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 老人预警 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@Service
+public class TOldsterWarningServiceImpl extends ServiceImpl<TOldsterWarningMapper, TOldsterWarning> implements TOldsterWarningService {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOtherConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOtherConfigServiceImpl.java
new file mode 100644
index 0000000..ce88d4d
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TOtherConfigServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TOtherConfigMapper;
+import com.ruoyi.system.model.TOtherConfig;
+import com.ruoyi.system.service.TOtherConfigService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 系统其他设置 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@Service
+public class TOtherConfigServiceImpl extends ServiceImpl<TOtherConfigMapper, TOtherConfig> implements TOtherConfigService {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQuestionnaireStemBriefAnswerServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQuestionnaireStemBriefAnswerServiceImpl.java
new file mode 100644
index 0000000..12941b4
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TQuestionnaireStemBriefAnswerServiceImpl.java
@@ -0,0 +1,20 @@
+package com.ruoyi.system.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.mapper.TQuestionnaireStemBriefAnswerMapper;
+import com.ruoyi.system.model.TQuestionnaireStemBriefAnswer;
+import com.ruoyi.system.service.TQuestionnaireStemBriefAnswerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 简答题答案 服务实现类
+ * </p>
+ *
+ * @author xiaochen
+ * @since 2025-11-06
+ */
+@Service
+public class TQuestionnaireStemBriefAnswerServiceImpl extends ServiceImpl<TQuestionnaireStemBriefAnswerMapper, TQuestionnaireStemBriefAnswer> implements TQuestionnaireStemBriefAnswerService {
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/SysUserVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/SysUserVO.java
index 09a4e0d..5dade92 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/SysUserVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/SysUserVO.java
@@ -11,12 +11,7 @@
 @ApiModel(value = "账户列表VO")
 public class SysUserVO extends SysUser {
 
-    @ApiModelProperty(value = "身份")
-    private Integer companyType;
-    @ApiModelProperty(value = "单位名称")
-    private String companyName;
-    @ApiModelProperty(value = "部门")
-    private List<String> deptList;
+
     @ApiModelProperty(value = "角色")
     private String roleName;
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
index 5dacb7d..e423805 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -237,12 +237,7 @@
 		<if test="query.status != null and query.status != ''">
 			AND u.status = #{query.status}
 		</if>
-		<if test="query.deptIds != null and query.deptIds.size()>0">
-			AND u.user_id IN (select DISTINCT user_id from t_dept_to_user where dept_id IN
-			<foreach collection="query.deptIds" close=")" open="(" item="deptId" separator=",">
-				#{deptId}
-			</foreach>)
-		</if>
+
 		<if test="query.roleIds != null and query.roleIds.size()>0">
 			AND r.role_id IN
 			<foreach collection="query.roleIds" close=")" open="(" item="roleId" separator=",">
@@ -308,7 +303,6 @@
  			<if test="status != null and status != ''">status,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
-		<if test="userIdentification != null and userIdentification != ''">userIdentification,</if>
  			create_time
  		)values(
  			<if test="userId != null and userId != ''">#{userId},</if>
@@ -324,7 +318,6 @@
  			<if test="status != null and status != ''">#{status},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
-			<if test="userIdentification != null and userIdentification != ''">#{userIdentification},</if>
  			sysdate()
  		)
 	</insert>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
index 8fc6dfd..516913e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAppUserMapper.xml
@@ -23,5 +23,22 @@
     <sql id="Base_Column_List">
         id, nick_name, avatar, phone_number, gender, birth_date, status, open_id, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.TAppUser">
+        select t1.* from t_app_user t1
+        where  1=1
+        <if test="query.nickName != null and query.nickName != ''">
+            and t1.nick_name like concat('%',#{query.nickName},'%')
+        </if>
+
+        <if test="query.phoneNumber != null and query.phoneNumber != ''">
+            and t1.phone_number like concat('%',#{query.phoneNumber},'%')
+        </if>
+        <if test="query.status != null">
+            and t1.status = #{query.status}
+        </if>
+          AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+
+        order by t1.create_time desc
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml
index 79fe923..2c124ca 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TAssistedDiningMapper.xml
@@ -21,5 +21,16 @@
     <sql id="Base_Column_List">
         id, point_name, point_phone, point_cover, address, point_detail, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.TAssistedDining">
+        select t1.* from t_assisted_dining t1
+        <if test="query.pointName != null and query.pointName != ''">
+            and t1.point_name like concat('%',#{query.pointName},'%')
+        </if>
+        <if test="query.pointPhone != null and query.pointPhone != ''">
+            and t1.point_phone like concat('%',#{query.pointPhone},'%')
+        </if>
+            AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+        order by t1.create_time desc
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TBannerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TBannerMapper.xml
index 0f55e8a..4d74ebb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TBannerMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TBannerMapper.xml
@@ -19,5 +19,12 @@
     <sql id="Base_Column_List">
         id, banner_name, pictures, banner_detail, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.TBanner">
+        select * from t_banner
+        where 1=1
+          AND disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+
+        order by create_time desc
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml
index f958ba3..6be22f8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THelpNeedsMapper.xml
@@ -21,5 +21,18 @@
     <sql id="Base_Column_List">
         id, app_user_id, nick_name, contact_number, requirement_description, pictures, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.THelpNeeds">
+        select t1.* from t_help_needs
+        where 1=1
+        <if test="query.nickName != null and query.nickName != ''">
+            and t1.nick_name like concat('%',#{query.nickName},'%')
+        </if>
+        <if test="query.contactNumber != null and query.contactNumber != ''">
+            and t1.contact_number like concat('%',#{query.contactNumber},'%')
+        </if>
+        <if test="query.startTime != null and query.startTime != '' and query.endTime != null and query.endTime != ''">
+            and t1.create_time between #{query.startTime} and #{query.endTime}
+        </if>
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOldsterMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOldsterMapper.xml
index 6de41d6..849d2a5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TOldsterMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TOldsterMapper.xml
@@ -27,5 +27,21 @@
     <sql id="Base_Column_List">
         id, oldster_name, oldster_age, oldster_sex, contact_phone, guardian_name, guardian_phone, passport_photo, id_card, birth_date, oldster_type, address, create_time, update_time, create_by, update_by, disabled
     </sql>
+    <select id="pageList" resultType="com.ruoyi.system.model.TOldster">
+        select t1.* from t_oldster t1
+        where  1=1
+        <if test="query.oldsterName != null and query.oldsterName != ''">
+            and t1.oldster_name like concat('%',#{query.oldsterName},'%')
+        </if>
+        <if test="query.oldsterType != null and query.oldsterType != ''">
+            and t1.oldster_type = #{query.oldsterType}
+        </if>
+        <if test="query.contactPhone != null and query.contactPhone != ''">
+            and t1.contact_phone like concat('%',#{query.contactPhone},'%')
+        </if>
+        AND t1.disabled = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+
+        order by t1.create_time desc
+    </select>
 
 </mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOldsterWarningMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOldsterWarningMapper.xml
new file mode 100644
index 0000000..5286aea
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TOldsterWarningMapper.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TOldsterWarningMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TOldsterWarning">
+        <id column="id" property="id" />
+        <result column="oldster_id" property="oldsterId" />
+        <result column="warning_time" property="warningTime" />
+        <result column="create_time" property="createTime" />
+        <result column="update_time" property="updateTime" />
+        <result column="create_by" property="createBy" />
+        <result column="update_by" property="updateBy" />
+        <result column="disabled" property="disabled" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, oldster_id, warning_time, create_time, update_time, create_by, update_by, disabled
+    </sql>
+
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TOtherConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TOtherConfigMapper.xml
new file mode 100644
index 0000000..6c9c0d3
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TOtherConfigMapper.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TOtherConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TOtherConfig">
+        <id column="id" property="id" />
+        <result column="elderly_age" property="elderlyAge" />
+        <result column="days" property="days" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, elderly_age, days
+    </sql>
+
+</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TQuestionnaireStemBriefAnswerMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TQuestionnaireStemBriefAnswerMapper.xml
new file mode 100644
index 0000000..8dcc7eb
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/TQuestionnaireStemBriefAnswerMapper.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.ruoyi.system.mapper.TQuestionnaireStemBriefAnswerMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.ruoyi.system.model.TQuestionnaireStemBriefAnswer">
+        <id column="id" property="id" />
+        <result column="stem_id" property="stemId" />
+        <result column="app_user_id" property="appUserId" />
+        <result column="answer_content" property="answerContent" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, stem_id, app_user_id, answer_content
+    </sql>
+
+</mapper>

--
Gitblit v1.7.1