管理后台养老服务模块接口

无关风月

2025-11-06 547209172a4decd10345190702bf4dcbda3f0d21

管理后台养老服务模块接口

 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));
    }
}


 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,44 @@
 */
@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 entity) {
        assistedDiningService.save(entity);
        return R.ok();
    }
    @ApiOperation(value = "修改")
    @Log(title = "助餐信息-修改", businessType = BusinessType.UPDATE)
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody TAssistedDining entity) {
        assistedDiningService.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
        assistedDiningService.removeBatchByIds(res);
        return R.ok();
    }
    @ApiOperation(value = "查看详情")
    @GetMapping(value = "/detail")
    public R<TAssistedDining> detail(Integer id) {
        return R.ok(assistedDiningService.getById( id));
    }
}


 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();
    }
}


 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,44 @@
 */
@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 entity) {
        helpNeedsService.save(entity);
        return R.ok();
    }
    @ApiOperation(value = "修改")
    @Log(title = "助需管理-修改", businessType = BusinessType.UPDATE)
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody THelpNeeds entity) {
        helpNeedsService.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
        helpNeedsService.removeBatchByIds(res);
        return R.ok();
    }
    @ApiOperation(value = "查看详情")
    @GetMapping(value = "/detail")
    public R<THelpNeeds> detail(Integer id) {
        return R.ok(helpNeedsService.getById( id));
    }
}


 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;

 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,129 @@
 * @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 entity) {
        oldsterService.save(entity);
        return R.ok();
    }
    @ApiOperation(value = "修改")
    @Log(title = "老人户籍信息-修改", businessType = BusinessType.UPDATE)
    @PostMapping(value = "/edit")
    public R<Boolean> edit(@RequestBody TOldster entity) {
        oldsterService.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
        oldsterService.removeBatchByIds(res);
        return R.ok();
    }
    @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();
    }
}


 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));
    }

    /**
     * 根据用户编号获取授权角色

 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() {

 ruoyi-system/src/main/java/com/ruoyi/system/export/OldsterImport.java

New file
@@ -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;

}

 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);
}

 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);
}

 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);

}

 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);

}

 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);

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/AppUserListQuery.java

New file
@@ -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;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/AssistedDiningListQuery.java

New file
@@ -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;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/BannerListQuery.java

New file
@@ -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 {

}

 ruoyi-system/src/main/java/com/ruoyi/system/query/HelpNeedsListQuery.java

New file
@@ -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;
}

 ruoyi-system/src/main/java/com/ruoyi/system/query/OldsterListQuery.java

New file
@@ -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;
}

 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;


}

 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);

}

 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);

}

 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);

}

 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);
}

 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);
}

 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;

 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;
    }
}

 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;
    }
}

 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;
    }
}

 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;
    }
}

 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;
    }
}

 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;


 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>

 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>

 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>

 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>

 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>

 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>