浏览代码

新增
1、增加居家长者信息模块
修改
1、修改上传文件大小限制

liangwenxuan 2 月之前
父节点
当前提交
003fcb245f
共有 18 个文件被更改,包括 529 次插入3 次删除
  1. 83 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/HomeElderlyInfoController.java
  2. 23 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeElderlyInfoPageReqVO.java
  3. 25 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeElderlyInfoPageRespVO.java
  4. 57 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeElderlyInfoSaveReqVO.java
  5. 29 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyAccountDO.java
  6. 29 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyAccountDetailDO.java
  7. 36 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyFamilyDO.java
  8. 64 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyInfoDO.java
  9. 3 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyBuildFloorActivityImageMapper.java
  10. 10 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyAccountDetailMapper.java
  11. 9 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyAccountMapper.java
  12. 10 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyFamilyMapper.java
  13. 18 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyInfoMapper.java
  14. 1 1
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/MaterialIoServiceImpl.java
  15. 21 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeElderlyInfoService.java
  16. 53 0
      yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeElderlyInfoServiceImpl.java
  17. 56 0
      yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/HomeElderlyInfoMapper.xml
  18. 2 2
      yudao-server/src/main/resources/application.yaml

+ 83 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/HomeElderlyInfoController.java

@@ -0,0 +1,83 @@
+package cn.iocoder.yudao.module.system.controller.admin.home;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
+import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyInfoDO;
+import cn.iocoder.yudao.module.system.service.home.HomeElderlyInfoService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+@Tag(name = "管理后台 - 居家长者信息")
+@RestController
+@RequestMapping("/home/elderly-info")
+@Validated
+public class HomeElderlyInfoController {
+
+    @Resource
+    private HomeElderlyInfoService homeElderlyInfoService;
+
+    @GetMapping("/page")
+    @Operation(summary = "获得居家长者信息分页")
+    @TenantIgnore
+    public CommonResult<PageResult<HomeElderlyInfoPageRespVO>> page(@Valid HomeElderlyInfoPageReqVO pageReqVO) {
+        if (pageReqVO.getTenantId() == null) {
+            pageReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        if (pageReqVO.getTenantIds() == null) {
+            pageReqVO.setTenantIds(new Long[]{TenantContextHolder.getTenantId()});
+        }
+        PageResult<HomeElderlyInfoPageRespVO> pageResult = homeElderlyInfoService.getHomeElderlyInfoPage(pageReqVO);
+        return success(pageResult);
+    }
+
+    @PostMapping("/create")
+    @Operation(summary = "新增居家长者信息")
+    @TenantIgnore
+    public CommonResult<Long> create(@Valid @RequestBody HomeElderlyInfoSaveReqVO createReqVO) {
+        if (createReqVO.getTenantId() == null) {
+            createReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        return success(homeElderlyInfoService.createHomeElderlyInfo(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "修改居家长者信息")
+    @TenantIgnore
+    public CommonResult<Boolean> update(@Valid @RequestBody HomeElderlyInfoSaveReqVO updateReqVO) {
+        if (updateReqVO.getTenantId() == null) {
+            updateReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        homeElderlyInfoService.updateHomeElderlyInfo(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除居家长者信息")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @TenantIgnore
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        homeElderlyInfoService.deleteHomeElderlyInfo(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得居家长者信息详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @TenantIgnore
+    public CommonResult<HomeElderlyInfoDO> get(@RequestParam("id") Long id) {
+        return success(homeElderlyInfoService.getHomeElderlyInfo(id));
+    }
+}

+ 23 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeElderlyInfoPageReqVO.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.system.controller.admin.home.vo;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 居家长者信息分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class HomeElderlyInfoPageReqVO extends PageParam {
+
+    private String elderName;
+    private String idCard;
+    private String phone;
+    private Long tenantId;
+    private Long[] tenantIds;
+    private LocalDateTime[] birthday;
+}

+ 25 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeElderlyInfoPageRespVO.java

@@ -0,0 +1,25 @@
+package cn.iocoder.yudao.module.system.controller.admin.home.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 居家长者信息分页 Response VO")
+@Data
+public class HomeElderlyInfoPageRespVO {
+
+    private Long id;
+    private String elderName;
+    private String sex;
+    private Integer age;
+    private String phone;
+    private String telephone;
+    private String selfCareSituation;
+    private String liveSituation;
+    private String accountBalance;
+    private Integer isService;
+    private Integer serviceTimesYear;
+    private String currentLiveAddress;
+    private LocalDateTime checkIn;
+}

+ 57 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/home/vo/HomeElderlyInfoSaveReqVO.java

@@ -0,0 +1,57 @@
+package cn.iocoder.yudao.module.system.controller.admin.home.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 居家长者信息新增/修改 Request VO")
+@Data
+public class HomeElderlyInfoSaveReqVO {
+
+    private Long id;
+    private String idCardType;
+    private String idCard;
+    private String elderName;
+    private String elderQrCode;
+    private String sex;
+    private LocalDateTime birthday;
+    private String phone;
+    private String telephone;
+    private String liveSituation;
+    private BigDecimal liveArea;
+    private LocalDateTime checkIn;
+    private String currentLiveArea;
+    private String currentLiveAddress;
+    private String householdArea;
+    private String householdAddress;
+    private String householdType;
+    private String ethnicity;
+    private String maritalStatus;
+    private String job;
+    private String selfCareSituation;
+    private String educationalLevel;
+    private String disabilityType;
+    private String incomeSource;
+    private BigDecimal disposableIncome;
+    private String medicalType;
+    private String intendedElderlyCareMode;
+    private String intendedService;
+    private String problem;
+    private String trackingRecord;
+    private String isMigrate;
+    private String isResident;
+    private Integer isService;
+    private Integer serviceTimesYear;
+    private String healthStatus;
+    private String bloodType;
+    private String medicalInsuranceCard;
+    private String eyesight;
+    private String hearing;
+    private String disease;
+    private String medicalHistory;
+    private String extraFile;
+    private Long tenantId;
+}
+

+ 29 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyAccountDO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.home;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 居家长者账户 DO
+ */
+@TableName("home_elderly_account")
+@Data
+public class HomeElderlyAccountDO implements Serializable {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long homeElderId;
+    private BigDecimal amount;
+    private Long tenantId;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private String creator;
+    private String updater;
+}
+

+ 29 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyAccountDetailDO.java

@@ -0,0 +1,29 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.home;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 居家长者账户明细 DO
+ */
+@TableName("home_elderly_account_detail")
+@Data
+public class HomeElderlyAccountDetailDO implements Serializable {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long accountId;
+    private String type;
+    private BigDecimal amount;
+    private Long tenantId;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private String creator;
+    private String updater;
+}

+ 36 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyFamilyDO.java

@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.home;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * 居家长者亲属 DO
+ */
+@TableName("home_elderly_family")
+@Data
+public class HomeElderlyFamilyDO implements Serializable {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private Long homeElderId;
+    private String contactName;
+    private String idCard;
+    private String sex;
+    private String phone;
+    private String telephone;
+    private String relation;
+    private String isGuardian;
+    private String liveArea;
+    private String liveAddress;
+    private Integer isEmergency;
+    private Long tenantId;
+    private LocalDateTime createTime;
+    private LocalDateTime updateTime;
+    private String creator;
+    private String updater;
+}

+ 64 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/home/HomeElderlyInfoDO.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.home;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 居家长者信息 DO
+ */
+@TableName("home_elderly_info")
+@Data
+public class HomeElderlyInfoDO implements Serializable {
+
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    private String idCardType;
+    private String idCard;
+    private String elderName;
+    private String elderQrCode;
+    private String sex;
+    private LocalDateTime birthday;
+    private String phone;
+    private String telephone;
+    private String liveSituation;
+    private BigDecimal liveArea;
+    private LocalDateTime checkIn;
+    private String currentLiveArea;
+    private String currentLiveAddress;
+    private String householdArea;
+    private String householdAddress;
+    private String householdType;
+    private String ethnicity;
+    private String maritalStatus;
+    private String job;
+    private String selfCareSituation;
+    private String educationalLevel;
+    private String disabilityType;
+    private String incomeSource;
+    private BigDecimal disposableIncome;
+    private String medicalType;
+    private String intendedElderlyCareMode;
+    private String intendedService;
+    private String problem;
+    private String trackingRecord;
+    private String isMigrate;
+    private String isResident;
+    private Integer isService;
+    private Integer serviceTimesYear;
+    private Integer inStatus;
+    private String healthStatus;
+    private String bloodType;
+    private String medicalInsuranceCard;
+    private String eyesight;
+    private String hearing;
+    private String disease;
+    private String medicalHistory;
+    private String extraFile;
+    private Long tenantId;
+}

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyBuildFloorActivityImageMapper.java

@@ -42,6 +42,9 @@ public interface ElderlyBuildFloorActivityImageMapper extends BaseMapperX<Elderl
 
 
 
+
+
+
 
 
 

+ 10 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyAccountDetailMapper.java

@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.system.dal.mysql.home;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyAccountDetailDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HomeElderlyAccountDetailMapper extends BaseMapperX<HomeElderlyAccountDetailDO> {
+}
+

+ 9 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyAccountMapper.java

@@ -0,0 +1,9 @@
+package cn.iocoder.yudao.module.system.dal.mysql.home;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyAccountDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HomeElderlyAccountMapper extends BaseMapperX<HomeElderlyAccountDO> {
+}

+ 10 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyFamilyMapper.java

@@ -0,0 +1,10 @@
+package cn.iocoder.yudao.module.system.dal.mysql.home;
+
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyFamilyDO;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface HomeElderlyFamilyMapper extends BaseMapperX<HomeElderlyFamilyDO> {
+}
+

+ 18 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/home/HomeElderlyInfoMapper.java

@@ -0,0 +1,18 @@
+package cn.iocoder.yudao.module.system.dal.mysql.home;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyInfoDO;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+@Mapper
+public interface HomeElderlyInfoMapper extends BaseMapperX<HomeElderlyInfoDO> {
+
+    List<HomeElderlyInfoPageRespVO> selectPageWithAccountInfo(Page<HomeElderlyInfoPageRespVO> page, @Param("params") HomeElderlyInfoPageReqVO reqVO);
+}

+ 1 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/MaterialIoServiceImpl.java

@@ -389,7 +389,7 @@ public class MaterialIoServiceImpl implements MaterialIoService {
             outboundItem.setRefInboundItemId(itemVO.getInboundItemId()); // 入库明细ID
             outboundItem.setMaterialId(itemVO.getMaterialId());
             outboundItem.setQuantity(itemVO.getQuantity());
-            outboundItem.setQuantity(itemVO.getSaleUnitPrice());
+            outboundItem.setPrice(itemVO.getSaleUnitPrice());
             outboundItem.setTenantId(createReqVO.getTenantId());
             outboundOrderItemMapper.insert(outboundItem);
 

+ 21 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeElderlyInfoService.java

@@ -0,0 +1,21 @@
+package cn.iocoder.yudao.module.system.service.home;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyInfoDO;
+
+public interface HomeElderlyInfoService {
+
+    Long createHomeElderlyInfo(HomeElderlyInfoSaveReqVO createReqVO);
+
+    void updateHomeElderlyInfo(HomeElderlyInfoSaveReqVO updateReqVO);
+
+    void deleteHomeElderlyInfo(Long id);
+
+    HomeElderlyInfoDO getHomeElderlyInfo(Long id);
+
+    PageResult<HomeElderlyInfoPageRespVO> getHomeElderlyInfoPage(HomeElderlyInfoPageReqVO pageReqVO);
+
+}

+ 53 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/home/HomeElderlyInfoServiceImpl.java

@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.system.service.home;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.home.HomeElderlyInfoDO;
+import cn.iocoder.yudao.module.system.dal.mysql.home.HomeElderlyInfoMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+@Validated
+public class HomeElderlyInfoServiceImpl implements HomeElderlyInfoService {
+
+    @Resource
+    private HomeElderlyInfoMapper homeElderlyInfoMapper;
+
+    @Override
+    public Long createHomeElderlyInfo(HomeElderlyInfoSaveReqVO createReqVO) {
+        HomeElderlyInfoDO doObj = BeanUtils.toBean(createReqVO, HomeElderlyInfoDO.class);
+        homeElderlyInfoMapper.insert(doObj);
+        return doObj.getId();
+    }
+
+    @Override
+    public void updateHomeElderlyInfo(HomeElderlyInfoSaveReqVO updateReqVO) {
+        HomeElderlyInfoDO updateObj = BeanUtils.toBean(updateReqVO, HomeElderlyInfoDO.class);
+        homeElderlyInfoMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void deleteHomeElderlyInfo(Long id) {
+        homeElderlyInfoMapper.deleteById(id);
+    }
+
+    @Override
+    public HomeElderlyInfoDO getHomeElderlyInfo(Long id) {
+        return homeElderlyInfoMapper.selectById(id);
+    }
+
+    @Override
+    public PageResult<HomeElderlyInfoPageRespVO> getHomeElderlyInfoPage(HomeElderlyInfoPageReqVO pageReqVO) {
+        Page<HomeElderlyInfoPageRespVO> page = new Page<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+        List<HomeElderlyInfoPageRespVO> list = homeElderlyInfoMapper.selectPageWithAccountInfo(page, pageReqVO);
+        return new PageResult<>(list, page.getTotal());
+    }
+}

+ 56 - 0
yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/HomeElderlyInfoMapper.xml

@@ -0,0 +1,56 @@
+<?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="cn.iocoder.yudao.module.system.dal.mysql.home.HomeElderlyInfoMapper">
+
+    <select id="selectPageWithAccountInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.home.vo.HomeElderlyInfoPageRespVO">
+        select
+            hei.id,
+            hei.elder_name as elderName,
+            hei.sex,
+            case
+                when hei.birthday is null then null
+                else timestampdiff(year, hei.birthday, curdate())
+            end as age,
+            hei.phone,
+            hei.telephone,
+            hei.self_care_situation as selfCareSituation,
+            hei.live_situation as liveSituation,
+            concat('代金券:', ifnull(hea.coupon_amount, 0), '元,现金:', ifnull(hea.cash_amount, 0), '元') as accountBalance,
+            hei.is_service as isService,
+            hei.service_times_year as serviceTimesYear,
+            hei.current_live_address as currentLiveAddress,
+            hei.check_in as checkIn
+        from home_elderly_info hei
+        left join (
+            select
+                a.home_elder_id,
+                sum(case when d.type = '1' then ifnull(d.amount, 0) else 0 end) as cash_amount,
+                sum(case when d.type = '2' then ifnull(d.amount, 0) else 0 end) as coupon_amount
+            from home_elderly_account a
+            left join home_elderly_account_detail d on d.account_id = a.id
+            group by a.home_elder_id
+        ) hea on hea.home_elder_id = hei.id
+        where 1 = 1
+        <if test="params.elderName != null and params.elderName != ''">
+            and hei.elder_name like concat('%', #{params.elderName}, '%')
+        </if>
+        <if test="params.idCard != null and params.idCard != ''">
+            and hei.id_card like concat('%', #{params.idCard}, '%')
+        </if>
+        <if test="params.phone != null and params.phone != ''">
+            and hei.phone like concat('%', #{params.phone}, '%')
+        </if>
+        <if test="params.tenantId != null">
+            and hei.tenant_id = #{params.tenantId}
+        </if>
+        <if test="params.tenantIds != null and params.tenantIds.length > 0">
+            and hei.tenant_id in
+            <foreach collection="params.tenantIds" item="tenantId" open="(" separator="," close=")">
+                #{tenantId}
+            </foreach>
+        </if>
+        order by hei.id desc
+    </select>
+
+</mapper>
+

+ 2 - 2
yudao-server/src/main/resources/application.yaml

@@ -14,8 +14,8 @@ spring:
   servlet:
     # 文件上传相关配置项
     multipart:
-      max-file-size: 30MB # 单个文件大小
-      max-request-size: 100MB # 设置总上传的文件大小
+      max-file-size: 60MB # 单个文件大小
+      max-request-size: 150MB # 设置总上传的文件大小
 #      location: D:\\
   mvc:
     pathmatch: