新增修改

1、楼栋清洁消毒记录模块
2、每日清洁消毒记录模块
3、尿不湿领取记录模块
4、危险物品登记模块
5、尿不湿使用记录模块
6、消毒记录模块
7、设施设备检查记录模块

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/ElderlyBuildCleanDisinfectRecordController.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz;
+
+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.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.service.biz.ElderlyBuildCleanDisinfectRecordService;
+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("/elderly-build-clean-disinfect-record")
+@Validated
+public class ElderlyBuildCleanDisinfectRecordController {
+
+    @Resource
+    private ElderlyBuildCleanDisinfectRecordService elderlyBuildCleanDisinfectRecordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建楼栋清洁消毒记录")
+    public CommonResult<Long> create(@Valid @RequestBody ElderlyBuildCleanDisinfectRecordSaveReqVO createReqVO) {
+        if (createReqVO.getTenantId() == null) {
+            createReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        return success(elderlyBuildCleanDisinfectRecordService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新楼栋清洁消毒记录")
+    @TenantIgnore
+    public CommonResult<Boolean> update(@Valid @RequestBody ElderlyBuildCleanDisinfectRecordSaveReqVO updateReqVO) {
+        if (updateReqVO.getTenantId() == null) {
+            updateReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        elderlyBuildCleanDisinfectRecordService.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除楼栋清洁消毒记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @TenantIgnore
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        elderlyBuildCleanDisinfectRecordService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得楼栋清洁消毒记录详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @TenantIgnore
+    public CommonResult<ElderlyBuildCleanDisinfectRecordRespVO> get(@RequestParam("id") Long id) {
+        return success(elderlyBuildCleanDisinfectRecordService.get(id));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得楼栋清洁消毒记录分页")
+    @TenantIgnore
+    public CommonResult<PageResult<ElderlyBuildCleanDisinfectRecordRespVO>> page(@Valid ElderlyBuildCleanDisinfectRecordPageReqVO pageReqVO) {
+        if (pageReqVO.getTenantIds() == null) {
+            pageReqVO.setTenantIds(new Long[]{TenantContextHolder.getTenantId()});
+        }
+        return success(elderlyBuildCleanDisinfectRecordService.getPage(pageReqVO));
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/ElderlyDailyCleanDisinfectRecordController.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz;
+
+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.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.service.biz.ElderlyDailyCleanDisinfectRecordService;
+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("/elderly-daily-clean-disinfect-record")
+@Validated
+public class ElderlyDailyCleanDisinfectRecordController {
+
+    @Resource
+    private ElderlyDailyCleanDisinfectRecordService elderlyDailyCleanDisinfectRecordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建每日清洁消毒记录")
+    public CommonResult<Long> create(@Valid @RequestBody ElderlyDailyCleanDisinfectRecordSaveReqVO createReqVO) {
+        if (createReqVO.getTenantId() == null) {
+            createReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        return success(elderlyDailyCleanDisinfectRecordService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新每日清洁消毒记录")
+    @TenantIgnore
+    public CommonResult<Boolean> update(@Valid @RequestBody ElderlyDailyCleanDisinfectRecordSaveReqVO updateReqVO) {
+        if (updateReqVO.getTenantId() == null) {
+            updateReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        elderlyDailyCleanDisinfectRecordService.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除每日清洁消毒记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @TenantIgnore
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        elderlyDailyCleanDisinfectRecordService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得每日清洁消毒记录详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @TenantIgnore
+    public CommonResult<ElderlyDailyCleanDisinfectRecordRespVO> get(@RequestParam("id") Long id) {
+        return success(elderlyDailyCleanDisinfectRecordService.get(id));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得每日清洁消毒记录分页")
+    @TenantIgnore
+    public CommonResult<PageResult<ElderlyDailyCleanDisinfectRecordRespVO>> page(@Valid ElderlyDailyCleanDisinfectRecordPageReqVO pageReqVO) {
+        if (pageReqVO.getTenantIds() == null) {
+            pageReqVO.setTenantIds(new Long[]{TenantContextHolder.getTenantId()});
+        }
+        return success(elderlyDailyCleanDisinfectRecordService.getPage(pageReqVO));
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/ElderlyDiaperUsageRecodController.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz;
+
+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.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodSaveReqVO;
+import cn.iocoder.yudao.module.system.service.biz.ElderlyDiaperUsageRecodService;
+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("/elderly-diaper-usage-recod")
+@Validated
+public class ElderlyDiaperUsageRecodController {
+
+    @Resource
+    private ElderlyDiaperUsageRecodService elderlyDiaperUsageRecodService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建尿不湿使用记录")
+    public CommonResult<Long> create(@Valid @RequestBody ElderlyDiaperUsageRecodSaveReqVO createReqVO) {
+        if (createReqVO.getTenantId() == null) {
+            createReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        return success(elderlyDiaperUsageRecodService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新尿不湿使用记录")
+    @TenantIgnore
+    public CommonResult<Boolean> update(@Valid @RequestBody ElderlyDiaperUsageRecodSaveReqVO updateReqVO) {
+        if (updateReqVO.getTenantId() == null) {
+            updateReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        elderlyDiaperUsageRecodService.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除尿不湿使用记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @TenantIgnore
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        elderlyDiaperUsageRecodService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得尿不湿使用记录详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @TenantIgnore
+    public CommonResult<ElderlyDiaperUsageRecodRespVO> get(@RequestParam("id") Long id) {
+        return success(elderlyDiaperUsageRecodService.get(id));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得尿不湿使用记录分页")
+    @TenantIgnore
+    public CommonResult<PageResult<ElderlyDiaperUsageRecodRespVO>> page(@Valid ElderlyDiaperUsageRecodPageReqVO pageReqVO) {
+        if (pageReqVO.getTenantIds() == null) {
+            pageReqVO.setTenantIds(new Long[]{TenantContextHolder.getTenantId()});
+        }
+        return success(elderlyDiaperUsageRecodService.getPage(pageReqVO));
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/ElderlyDiapersGetRecordController.java

@@ -0,0 +1,77 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz;
+
+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.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.service.biz.ElderlyDiapersGetRecordService;
+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("/elderly-diapers-get-record")
+@Validated
+public class ElderlyDiapersGetRecordController {
+
+    @Resource
+    private ElderlyDiapersGetRecordService elderlyDiapersGetRecordService;
+
+    @PostMapping("/create")
+    @Operation(summary = "创建尿不湿领取记录")
+    public CommonResult<Long> create(@Valid @RequestBody ElderlyDiapersGetRecordSaveReqVO createReqVO) {
+        if (createReqVO.getTenantId() == null) {
+            createReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        return success(elderlyDiapersGetRecordService.create(createReqVO));
+    }
+
+    @PutMapping("/update")
+    @Operation(summary = "更新尿不湿领取记录")
+    @TenantIgnore
+    public CommonResult<Boolean> update(@Valid @RequestBody ElderlyDiapersGetRecordSaveReqVO updateReqVO) {
+        if (updateReqVO.getTenantId() == null) {
+            updateReqVO.setTenantId(TenantContextHolder.getTenantId());
+        }
+        elderlyDiapersGetRecordService.update(updateReqVO);
+        return success(true);
+    }
+
+    @DeleteMapping("/delete")
+    @Operation(summary = "删除尿不湿领取记录")
+    @Parameter(name = "id", description = "编号", required = true)
+    @TenantIgnore
+    public CommonResult<Boolean> delete(@RequestParam("id") Long id) {
+        elderlyDiapersGetRecordService.delete(id);
+        return success(true);
+    }
+
+    @GetMapping("/get")
+    @Operation(summary = "获得尿不湿领取记录详情")
+    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @TenantIgnore
+    public CommonResult<ElderlyDiapersGetRecordRespVO> get(@RequestParam("id") Long id) {
+        return success(elderlyDiapersGetRecordService.get(id));
+    }
+
+    @GetMapping("/page")
+    @Operation(summary = "获得尿不湿领取记录分页")
+    @TenantIgnore
+    public CommonResult<PageResult<ElderlyDiapersGetRecordRespVO>> page(@Valid ElderlyDiapersGetRecordPageReqVO pageReqVO) {
+        if (pageReqVO.getTenantIds() == null) {
+            pageReqVO.setTenantIds(new Long[]{TenantContextHolder.getTenantId()});
+        }
+        return success(elderlyDiapersGetRecordService.getPage(pageReqVO));
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/buildcleandisinfectrecord/ElderlyBuildCleanDisinfectRecordPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord;
+
+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;
+
+@Schema(description = "管理后台 - 楼栋清洁消毒记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ElderlyBuildCleanDisinfectRecordPageReqVO extends PageParam {
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String[] assessMonth;
+
+    @Schema(description = "机构id数组")
+    private Long[] tenantIds;
+}
+

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/buildcleandisinfectrecord/ElderlyBuildCleanDisinfectRecordRespVO.java

@@ -0,0 +1,56 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 楼栋清洁消毒记录 Response VO")
+@Data
+public class ElderlyBuildCleanDisinfectRecordRespVO {
+
+    @Schema(description = "id", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "楼层名称")
+    private String floorName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", example = "1")
+    private Long tenantId;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "更新人")
+    private String updater;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/buildcleandisinfectrecord/ElderlyBuildCleanDisinfectRecordSaveReqVO.java

@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 楼栋清洁消毒记录新增/修改 Request VO")
+@Data
+public class ElderlyBuildCleanDisinfectRecordSaveReqVO {
+
+    @Schema(description = "id（修改时必传）", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "机构id不能为空")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/dailycleandisinfectrecord/ElderlyDailyCleanDisinfectRecordPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord;
+
+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;
+
+@Schema(description = "管理后台 - 日常清洁消毒记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ElderlyDailyCleanDisinfectRecordPageReqVO extends PageParam {
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String[] assessMonth;
+
+    @Schema(description = "机构id数组")
+    private Long[] tenantIds;
+}
+

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/dailycleandisinfectrecord/ElderlyDailyCleanDisinfectRecordRespVO.java

@@ -0,0 +1,52 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+@Schema(description = "管理后台 - 每日清洁消毒记录 Response VO")
+@Data
+public class ElderlyDailyCleanDisinfectRecordRespVO {
+
+    @Schema(description = "id", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "楼层名称")
+    private String floorName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", example = "1")
+    private Long tenantId;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "更新人")
+    private String updater;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/dailycleandisinfectrecord/ElderlyDailyCleanDisinfectRecordSaveReqVO.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+@Schema(description = "管理后台 - 每日清洁消毒记录新增/修改 Request VO")
+@Data
+public class ElderlyDailyCleanDisinfectRecordSaveReqVO {
+
+    @Schema(description = "id（修改时必传）", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "机构id不能为空")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diapersgetrecord/ElderlyDiapersGetRecordPageReqVO.java

@@ -0,0 +1,38 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord;
+
+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 org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 尿不湿领取记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ElderlyDiapersGetRecordPageReqVO extends PageParam {
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记日期范围")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    private LocalDate[] assessDate;
+
+    @Schema(description = "机构id数组")
+    private Long[] tenantIds;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diapersgetrecord/ElderlyDiapersGetRecordRespVO.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 尿不湿领取记录 Response VO")
+@Data
+public class ElderlyDiapersGetRecordRespVO {
+
+    @Schema(description = "id", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "楼层名称")
+    private String floorName;
+
+    @Schema(description = "长者id", example = "1")
+    private Long elderId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
+    private LocalDate[] assessDate;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", example = "1")
+    private Long tenantId;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "更新人")
+    private String updater;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diapersgetrecord/ElderlyDiapersGetRecordSaveReqVO.java

@@ -0,0 +1,46 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 尿不湿领取记录新增/修改 Request VO")
+@Data
+public class ElderlyDiapersGetRecordSaveReqVO {
+
+    @Schema(description = "id（修改时必传）", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "长者id", example = "1")
+    private Long elderId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
+    private LocalDate assessDate;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "机构id不能为空")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diaperusagerecod/ElderlyDiaperUsageRecodPageReqVO.java

@@ -0,0 +1,33 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod;
+
+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;
+
+@Schema(description = "管理后台 - 尿不湿使用记录分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class ElderlyDiaperUsageRecodPageReqVO extends PageParam {
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String[] assessMonth;
+
+    @Schema(description = "机构id数组")
+    private Long[] tenantIds;
+}
+

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diaperusagerecod/ElderlyDiaperUsageRecodRespVO.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - 尿不湿使用记录 Response VO")
+@Data
+public class ElderlyDiaperUsageRecodRespVO {
+
+    @Schema(description = "id", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "楼层名称")
+    private String floorName;
+
+    @Schema(description = "长者id", example = "1")
+    private Long elderId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", example = "1")
+    private Long tenantId;
+
+    @Schema(description = "创建时间")
+    private LocalDateTime createTime;
+
+    @Schema(description = "更新时间")
+    private LocalDateTime updateTime;
+
+    @Schema(description = "创建人")
+    private String creator;
+
+    @Schema(description = "更新人")
+    private String updater;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/diaperusagerecod/ElderlyDiaperUsageRecodSaveReqVO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+
+@Schema(description = "管理后台 - 尿不湿使用记录新增/修改 Request VO")
+@Data
+public class ElderlyDiaperUsageRecodSaveReqVO {
+
+    @Schema(description = "id（修改时必传）", example = "1")
+    private Long id;
+
+    @Schema(description = "楼栋id", example = "1")
+    private Long buildId;
+
+    @Schema(description = "楼层id", example = "1")
+    private Long floorId;
+
+    @Schema(description = "长者id", example = "1")
+    private Long elderId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
+    @NotNull(message = "机构id不能为空")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlydangermaterialregister/ElderlyDangerMaterialRegisterPageReqVO.java

@@ -27,6 +27,12 @@ public class ElderlyDangerMaterialRegisterPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate[] assessDate;
 
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlydangermaterialregister/ElderlyDangerMaterialRegisterRespVO.java

@@ -29,9 +29,15 @@ public class ElderlyDangerMaterialRegisterRespVO {
     @Schema(description = "楼栋id", example = "1")
     private Long buildId;
 
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
     @Schema(description = "楼层id", example = "1")
     private Long floorId;
 
+    @Schema(description = "楼层名称")
+    private String floorName;
+
     @Schema(description = "登记人")
     private String assessor;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlydangermaterialregister/ElderlyDangerMaterialRegisterSaveReqVO.java

@@ -44,7 +44,6 @@ public class ElderlyDangerMaterialRegisterSaveReqVO {
     private String assessData;
 
     @Schema(description = "机构id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    @NotNull(message = "机构id不能为空")
     private Long tenantId;
 }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlydisinfectrecord/ElderlyDisinfectRecordPageReqVO.java

@@ -24,6 +24,12 @@ public class ElderlyDisinfectRecordPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate[] assessDate;
 
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
     @Schema(description = "机构id数组")
     private Long[] tenantIds;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlydisinfectrecord/ElderlyDisinfectRecordRespVO.java

@@ -21,9 +21,15 @@ public class ElderlyDisinfectRecordRespVO {
     @Schema(description = "楼栋id", example = "1")
     private Long buildId;
 
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
     @Schema(description = "楼层id", example = "1")
     private Long floorId;
 
+    @Schema(description = "楼层名称")
+    private String floorName;
+
     @Schema(description = "登记人")
     private String assessor;
 
@@ -32,7 +38,7 @@ public class ElderlyDisinfectRecordRespVO {
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
     private LocalDate assessDate;
 
-    @Schema(description = "消毒数据")
+    @Schema(description = "登记数据")
     private String assessData;
 
     @Schema(description = "机构id", example = "1")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlydisinfectrecord/ElderlyDisinfectRecordSaveReqVO.java

@@ -31,7 +31,7 @@ public class ElderlyDisinfectRecordSaveReqVO {
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
     private LocalDate assessDate;
 
-    @Schema(description = "消毒数据")
+    @Schema(description = "登记数据")
     private String assessData;
 
     @Schema(description = "机构id", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyfacilityequipmentcheck/ElderlyFacilityEquipmentCheckPageReqVO.java

@@ -20,9 +20,14 @@ public class ElderlyFacilityEquipmentCheckPageReqVO extends PageParam {
     @Schema(description = "检查人")
     private String assessor;
 
-    @Schema(description = "检查日期范围")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    private LocalDate[] assessDate;
+    @Schema(description = "检查月份范围")
+    private String[] assessMonth;
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
 
     @Schema(description = "机构id数组")
     private Long[] tenantIds;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyfacilityequipmentcheck/ElderlyFacilityEquipmentCheckRespVO.java

@@ -5,12 +5,8 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
-
 @Schema(description = "管理后台 - 设施设备检查记录 Response VO")
 @Data
 public class ElderlyFacilityEquipmentCheckRespVO {
@@ -21,18 +17,22 @@ public class ElderlyFacilityEquipmentCheckRespVO {
     @Schema(description = "楼栋id", example = "1")
     private Long buildId;
 
+    @Schema(description = "楼栋名称")
+    private String buildName;
+
     @Schema(description = "楼层id", example = "1")
     private Long floorId;
 
-    @Schema(description = "检查人")
+    @Schema(description = "楼层名称")
+    private String floorName;
+
+    @Schema(description = "登记人")
     private String assessor;
 
-    @Schema(description = "检查日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
-    private LocalDate assessDate;
+    @Schema(description = "登记月份")
+    private String assessMonth;
 
-    @Schema(description = "检查数据")
+    @Schema(description = "登记数据")
     private String assessData;
 
     @Schema(description = "检查情况说明")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyfacilityequipmentcheck/ElderlyFacilityEquipmentCheckSaveReqVO.java

@@ -1,14 +1,9 @@
 package cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyfacilityequipmentcheck;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotNull;
-import java.time.LocalDate;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
 
 @Schema(description = "管理后台 - 设施设备检查记录新增/修改 Request VO")
 @Data
@@ -23,15 +18,13 @@ public class ElderlyFacilityEquipmentCheckSaveReqVO {
     @Schema(description = "楼层id", example = "1")
     private Long floorId;
 
-    @Schema(description = "检查人")
+    @Schema(description = "登记人")
     private String assessor;
 
-    @Schema(description = "检查日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = "GMT+8")
-    private LocalDate assessDate;
+    @Schema(description = "登记月份")
+    private String assessMonth;
 
-    @Schema(description = "检查数据")
+    @Schema(description = "登记数据")
     private String assessData;
 
     @Schema(description = "检查情况说明")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyBuildCleanDisinfectRecordDO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.biz;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * 楼栋清洁消毒记录 DO
+ */
+@TableName("elderly_build_clean_disinfect_record")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ElderlyBuildCleanDisinfectRecordDO extends BaseNoDeleteDO {
+
+    @TableId
+    private Long id;
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyDailyCleanDisinfectRecordDO.java

@@ -0,0 +1,47 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.biz;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * 每日清洁消毒记录 DO
+ */
+@TableName("elderly_daily_clean_disinfect_record")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ElderlyDailyCleanDisinfectRecordDO extends BaseNoDeleteDO {
+
+    @TableId
+    private Long id;
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyDangerMaterialRegisterDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.biz;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyDiaperUsageRecodDO.java

@@ -0,0 +1,53 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.biz;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+/**
+ * 尿不湿使用记录 DO
+ */
+@TableName("elderly_diaper_usage_recod")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ElderlyDiaperUsageRecodDO extends BaseNoDeleteDO {
+
+    @TableId
+    private Long id;
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "长者id")
+    private Long elderId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记月份")
+    private String assessMonth;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyDiapersGetRecordDO.java

@@ -0,0 +1,62 @@
+package cn.iocoder.yudao.module.system.dal.dataobject.biz;
+
+import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDate;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
+
+/**
+ * 尿不湿领取记录 DO
+ */
+@TableName("elderly_diapers_get_record")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ElderlyDiapersGetRecordDO extends BaseNoDeleteDO {
+
+    @TableId
+    private Long id;
+
+    @Schema(description = "楼栋id")
+    private Long buildId;
+
+    @Schema(description = "楼层id")
+    private Long floorId;
+
+    @Schema(description = "长者id")
+    private Long elderId;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "登记人")
+    private String assessor;
+
+    @Schema(description = "登记日期")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
+    private LocalDate assessDate;
+
+    @Schema(description = "登记数据")
+    private String assessData;
+
+    @Schema(description = "机构id")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyDisinfectRecordDO.java

@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.biz;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -47,7 +48,7 @@ public class ElderlyDisinfectRecordDO extends BaseNoDeleteDO {
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
     private LocalDate assessDate;
 
-    @Schema(description = "消毒数据")
+    @Schema(description = "登记数据")
     private String assessData;
 
     @Schema(description = "机构id")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/biz/ElderlyFacilityEquipmentCheckDO.java

@@ -1,9 +1,9 @@
 package cn.iocoder.yudao.module.system.dal.dataobject.biz;
 
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseNoDeleteDO;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -11,12 +11,6 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.time.LocalDate;
-
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
-import static cn.iocoder.yudao.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT;
 
 /**
  * 设施设备检查记录 DO
@@ -42,12 +36,10 @@ public class ElderlyFacilityEquipmentCheckDO extends BaseNoDeleteDO {
     @Schema(description = "检查人")
     private String assessor;
 
-    @Schema(description = "检查日期")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY, timezone = TIME_ZONE_DEFAULT)
-    private LocalDate assessDate;
+    @Schema(description = "登记月份")
+    private String assessMonth;
 
-    @Schema(description = "检查数据")
+    @Schema(description = "登记数据")
     private String assessData;
 
     @Schema(description = "检查情况说明")

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyBuildCleanDisinfectRecordMapper.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.dal.mysql.biz;
+
+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.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyBuildCleanDisinfectRecordDO;
+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 ElderlyBuildCleanDisinfectRecordMapper extends BaseMapperX<ElderlyBuildCleanDisinfectRecordDO> {
+
+    List<ElderlyBuildCleanDisinfectRecordRespVO> selectPageWithBuildInfo(Page<ElderlyBuildCleanDisinfectRecordRespVO> page,
+                                                                         @Param("reqVO") ElderlyBuildCleanDisinfectRecordPageReqVO reqVO);
+
+    default PageResult<ElderlyBuildCleanDisinfectRecordRespVO> selectPageWithBuildInfo(ElderlyBuildCleanDisinfectRecordPageReqVO reqVO) {
+        Page<ElderlyBuildCleanDisinfectRecordRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyBuildCleanDisinfectRecordRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
+    }
+}
+

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

@@ -44,6 +44,7 @@ public interface ElderlyBuildFloorActivityImageMapper extends BaseMapperX<Elderl
 
 
 
+
 
 
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyDailyCleanDisinfectRecordMapper.java

@@ -0,0 +1,28 @@
+package cn.iocoder.yudao.module.system.dal.mysql.biz;
+
+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.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydisinfectrecord.ElderlyDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydisinfectrecord.ElderlyDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDailyCleanDisinfectRecordDO;
+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 ElderlyDailyCleanDisinfectRecordMapper extends BaseMapperX<ElderlyDailyCleanDisinfectRecordDO> {
+
+    List<ElderlyDailyCleanDisinfectRecordRespVO> selectPageWithBuildInfo(Page<ElderlyDailyCleanDisinfectRecordRespVO> page,
+                                                               @Param("reqVO") ElderlyDailyCleanDisinfectRecordPageReqVO reqVO);
+
+    default PageResult<ElderlyDailyCleanDisinfectRecordRespVO> selectPageWithBuildInfo(ElderlyDailyCleanDisinfectRecordPageReqVO reqVO) {
+        Page<ElderlyDailyCleanDisinfectRecordRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyDailyCleanDisinfectRecordRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
+    }
+}
+

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyDangerMaterialRegisterMapper.java

@@ -2,21 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydangermaterialregister.ElderlyDangerMaterialRegisterPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydangermaterialregister.ElderlyDangerMaterialRegisterRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDangerMaterialRegisterDO;
+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 ElderlyDangerMaterialRegisterMapper extends BaseMapperX<ElderlyDangerMaterialRegisterDO> {
 
-    default PageResult<ElderlyDangerMaterialRegisterDO> selectPage(ElderlyDangerMaterialRegisterPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyDangerMaterialRegisterDO>()
-                .likeIfPresent(ElderlyDangerMaterialRegisterDO::getElderName, reqVO.getElderName())
-                .likeIfPresent(ElderlyDangerMaterialRegisterDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyDangerMaterialRegisterDO::getAssessDate, reqVO.getAssessDate())
-                .inIfPresent(ElderlyDangerMaterialRegisterDO::getTenantId, reqVO.getTenantIds())
-                .orderByDesc(ElderlyDangerMaterialRegisterDO::getAssessDate, ElderlyDangerMaterialRegisterDO::getId));
+    List<ElderlyDangerMaterialRegisterRespVO> selectPageWithBuildInfo(Page<ElderlyDangerMaterialRegisterRespVO> page,
+                                                                       @Param("reqVO") ElderlyDangerMaterialRegisterPageReqVO reqVO);
+
+    default PageResult<ElderlyDangerMaterialRegisterRespVO> selectPageWithBuildInfo(ElderlyDangerMaterialRegisterPageReqVO reqVO) {
+        Page<ElderlyDangerMaterialRegisterRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyDangerMaterialRegisterRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }
-

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyDiaperUsageRecodMapper.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.dal.mysql.biz;
+
+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.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDiaperUsageRecodDO;
+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 ElderlyDiaperUsageRecodMapper extends BaseMapperX<ElderlyDiaperUsageRecodDO> {
+
+    List<ElderlyDiaperUsageRecodRespVO> selectPageWithBuildInfo(Page<ElderlyDiaperUsageRecodRespVO> page,
+                                                                @Param("reqVO") ElderlyDiaperUsageRecodPageReqVO reqVO);
+
+    default PageResult<ElderlyDiaperUsageRecodRespVO> selectPageWithBuildInfo(ElderlyDiaperUsageRecodPageReqVO reqVO) {
+        Page<ElderlyDiaperUsageRecodRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyDiaperUsageRecodRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
+    }
+}
+

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyDiapersGetRecordMapper.java

@@ -0,0 +1,26 @@
+package cn.iocoder.yudao.module.system.dal.mysql.biz;
+
+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.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDiapersGetRecordDO;
+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 ElderlyDiapersGetRecordMapper extends BaseMapperX<ElderlyDiapersGetRecordDO> {
+
+    List<ElderlyDiapersGetRecordRespVO> selectPageWithBuildInfo(Page<ElderlyDiapersGetRecordRespVO> page,
+                                                                @Param("reqVO") ElderlyDiapersGetRecordPageReqVO reqVO);
+
+    default PageResult<ElderlyDiapersGetRecordRespVO> selectPageWithBuildInfo(ElderlyDiapersGetRecordPageReqVO reqVO) {
+        Page<ElderlyDiapersGetRecordRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyDiapersGetRecordRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
+    }
+}
+

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyDisinfectRecordMapper.java

@@ -2,19 +2,27 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordRespVO;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydisinfectrecord.ElderlyDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydisinfectrecord.ElderlyDisinfectRecordRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDisinfectRecordDO;
+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 ElderlyDisinfectRecordMapper extends BaseMapperX<ElderlyDisinfectRecordDO> {
 
-    default PageResult<ElderlyDisinfectRecordDO> selectPage(ElderlyDisinfectRecordPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyDisinfectRecordDO>()
-                .likeIfPresent(ElderlyDisinfectRecordDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyDisinfectRecordDO::getAssessDate, reqVO.getAssessDate())
-                .inIfPresent(ElderlyDisinfectRecordDO::getTenantId, reqVO.getTenantIds())
-                .orderByDesc(ElderlyDisinfectRecordDO::getAssessDate, ElderlyDisinfectRecordDO::getId));
+    List<ElderlyDisinfectRecordRespVO> selectPageWithBuildInfo(Page<ElderlyDisinfectRecordRespVO> page,
+                                                               @Param("reqVO") ElderlyDisinfectRecordPageReqVO reqVO);
+
+    default PageResult<ElderlyDisinfectRecordRespVO> selectPageWithBuildInfo(ElderlyDisinfectRecordPageReqVO reqVO) {
+        Page<ElderlyDisinfectRecordRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyDisinfectRecordRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/biz/ElderlyFacilityEquipmentCheckMapper.java

@@ -2,19 +2,24 @@ package cn.iocoder.yudao.module.system.dal.mysql.biz;
 
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
-import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
 import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyfacilityequipmentcheck.ElderlyFacilityEquipmentCheckPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyfacilityequipmentcheck.ElderlyFacilityEquipmentCheckRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyFacilityEquipmentCheckDO;
+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 ElderlyFacilityEquipmentCheckMapper extends BaseMapperX<ElderlyFacilityEquipmentCheckDO> {
 
-    default PageResult<ElderlyFacilityEquipmentCheckDO> selectPage(ElderlyFacilityEquipmentCheckPageReqVO reqVO) {
-        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyFacilityEquipmentCheckDO>()
-                .likeIfPresent(ElderlyFacilityEquipmentCheckDO::getAssessor, reqVO.getAssessor())
-                .betweenIfPresent(ElderlyFacilityEquipmentCheckDO::getAssessDate, reqVO.getAssessDate())
-                .inIfPresent(ElderlyFacilityEquipmentCheckDO::getTenantId, reqVO.getTenantIds())
-                .orderByDesc(ElderlyFacilityEquipmentCheckDO::getAssessDate, ElderlyFacilityEquipmentCheckDO::getId));
+    List<ElderlyFacilityEquipmentCheckRespVO> selectPageWithBuildInfo(Page<ElderlyFacilityEquipmentCheckRespVO> page,
+                                                                      @Param("reqVO") ElderlyFacilityEquipmentCheckPageReqVO reqVO);
+
+    default PageResult<ElderlyFacilityEquipmentCheckRespVO> selectPageWithBuildInfo(ElderlyFacilityEquipmentCheckPageReqVO reqVO) {
+        Page<ElderlyFacilityEquipmentCheckRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyFacilityEquipmentCheckRespVO> list = selectPageWithBuildInfo(page, reqVO);
+        return new PageResult<>(list, page.getTotal());
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyBuildCleanDisinfectRecordService.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordSaveReqVO;
+
+public interface ElderlyBuildCleanDisinfectRecordService {
+
+    Long create(ElderlyBuildCleanDisinfectRecordSaveReqVO createReqVO);
+
+    void update(ElderlyBuildCleanDisinfectRecordSaveReqVO updateReqVO);
+
+    void delete(Long id);
+
+    ElderlyBuildCleanDisinfectRecordRespVO get(Long id);
+
+    PageResult<ElderlyBuildCleanDisinfectRecordRespVO> getPage(ElderlyBuildCleanDisinfectRecordPageReqVO pageReqVO);
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyBuildCleanDisinfectRecordServiceImpl.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+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.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyBuildCleanDisinfectRecordDO;
+import cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyBuildCleanDisinfectRecordMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.COMMON_NOT_FOUND;
+
+@Service
+@Validated
+public class ElderlyBuildCleanDisinfectRecordServiceImpl implements ElderlyBuildCleanDisinfectRecordService {
+
+    @Resource
+    private ElderlyBuildCleanDisinfectRecordMapper elderlyBuildCleanDisinfectRecordMapper;
+
+    @Override
+    public Long create(ElderlyBuildCleanDisinfectRecordSaveReqVO createReqVO) {
+        ElderlyBuildCleanDisinfectRecordDO record = BeanUtils.toBean(createReqVO, ElderlyBuildCleanDisinfectRecordDO.class);
+        elderlyBuildCleanDisinfectRecordMapper.insert(record);
+        return record.getId();
+    }
+
+    @Override
+    public void update(ElderlyBuildCleanDisinfectRecordSaveReqVO updateReqVO) {
+        validateExists(updateReqVO.getId());
+        ElderlyBuildCleanDisinfectRecordDO updateObj = BeanUtils.toBean(updateReqVO, ElderlyBuildCleanDisinfectRecordDO.class);
+        elderlyBuildCleanDisinfectRecordMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void delete(Long id) {
+        validateExists(id);
+        elderlyBuildCleanDisinfectRecordMapper.deleteById(id);
+    }
+
+    @Override
+    public ElderlyBuildCleanDisinfectRecordRespVO get(Long id) {
+        ElderlyBuildCleanDisinfectRecordDO record = elderlyBuildCleanDisinfectRecordMapper.selectById(id);
+        if (record == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+        return BeanUtils.toBean(record, ElderlyBuildCleanDisinfectRecordRespVO.class);
+    }
+
+    @Override
+    public PageResult<ElderlyBuildCleanDisinfectRecordRespVO> getPage(ElderlyBuildCleanDisinfectRecordPageReqVO pageReqVO) {
+        return elderlyBuildCleanDisinfectRecordMapper.selectPageWithBuildInfo(pageReqVO);
+    }
+
+    private void validateExists(Long id) {
+        if (id == null || elderlyBuildCleanDisinfectRecordMapper.selectById(id) == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDailyCleanDisinfectRecordService.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordSaveReqVO;
+
+public interface ElderlyDailyCleanDisinfectRecordService {
+
+    Long create(ElderlyDailyCleanDisinfectRecordSaveReqVO createReqVO);
+
+    void update(ElderlyDailyCleanDisinfectRecordSaveReqVO updateReqVO);
+
+    void delete(Long id);
+
+    ElderlyDailyCleanDisinfectRecordRespVO get(Long id);
+
+    PageResult<ElderlyDailyCleanDisinfectRecordRespVO> getPage(ElderlyDailyCleanDisinfectRecordPageReqVO pageReqVO);
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDailyCleanDisinfectRecordServiceImpl.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+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.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDailyCleanDisinfectRecordDO;
+import cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyDailyCleanDisinfectRecordMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.COMMON_NOT_FOUND;
+
+@Service
+@Validated
+public class ElderlyDailyCleanDisinfectRecordServiceImpl implements ElderlyDailyCleanDisinfectRecordService {
+
+    @Resource
+    private ElderlyDailyCleanDisinfectRecordMapper elderlyDailyCleanDisinfectRecordMapper;
+
+    @Override
+    public Long create(ElderlyDailyCleanDisinfectRecordSaveReqVO createReqVO) {
+        ElderlyDailyCleanDisinfectRecordDO record = BeanUtils.toBean(createReqVO, ElderlyDailyCleanDisinfectRecordDO.class);
+        elderlyDailyCleanDisinfectRecordMapper.insert(record);
+        return record.getId();
+    }
+
+    @Override
+    public void update(ElderlyDailyCleanDisinfectRecordSaveReqVO updateReqVO) {
+        validateExists(updateReqVO.getId());
+        ElderlyDailyCleanDisinfectRecordDO updateObj = BeanUtils.toBean(updateReqVO, ElderlyDailyCleanDisinfectRecordDO.class);
+        elderlyDailyCleanDisinfectRecordMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void delete(Long id) {
+        validateExists(id);
+        elderlyDailyCleanDisinfectRecordMapper.deleteById(id);
+    }
+
+    @Override
+    public ElderlyDailyCleanDisinfectRecordRespVO get(Long id) {
+        ElderlyDailyCleanDisinfectRecordDO record = elderlyDailyCleanDisinfectRecordMapper.selectById(id);
+        if (record == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+        return BeanUtils.toBean(record, ElderlyDailyCleanDisinfectRecordRespVO.class);
+    }
+
+    @Override
+    public PageResult<ElderlyDailyCleanDisinfectRecordRespVO> getPage(ElderlyDailyCleanDisinfectRecordPageReqVO pageReqVO) {
+        return elderlyDailyCleanDisinfectRecordMapper.selectPageWithBuildInfo(pageReqVO);
+    }
+
+    private void validateExists(Long id) {
+        if (id == null || elderlyDailyCleanDisinfectRecordMapper.selectById(id) == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDangerMaterialRegisterServiceImpl.java

@@ -67,8 +67,7 @@ public class ElderlyDangerMaterialRegisterServiceImpl implements ElderlyDangerMa
 
     @Override
     public PageResult<ElderlyDangerMaterialRegisterRespVO> getPage(ElderlyDangerMaterialRegisterPageReqVO pageReqVO) {
-        PageResult<ElderlyDangerMaterialRegisterDO> pageResult = elderlyDangerMaterialRegisterMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyDangerMaterialRegisterRespVO.class);
+        return elderlyDangerMaterialRegisterMapper.selectPageWithBuildInfo(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDiaperUsageRecodService.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodSaveReqVO;
+
+public interface ElderlyDiaperUsageRecodService {
+
+    Long create(ElderlyDiaperUsageRecodSaveReqVO createReqVO);
+
+    void update(ElderlyDiaperUsageRecodSaveReqVO updateReqVO);
+
+    void delete(Long id);
+
+    ElderlyDiaperUsageRecodRespVO get(Long id);
+
+    PageResult<ElderlyDiaperUsageRecodRespVO> getPage(ElderlyDiaperUsageRecodPageReqVO pageReqVO);
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDiaperUsageRecodServiceImpl.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+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.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDiaperUsageRecodDO;
+import cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyDiaperUsageRecodMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.COMMON_NOT_FOUND;
+
+@Service
+@Validated
+public class ElderlyDiaperUsageRecodServiceImpl implements ElderlyDiaperUsageRecodService {
+
+    @Resource
+    private ElderlyDiaperUsageRecodMapper elderlyDiaperUsageRecodMapper;
+
+    @Override
+    public Long create(ElderlyDiaperUsageRecodSaveReqVO createReqVO) {
+        ElderlyDiaperUsageRecodDO record = BeanUtils.toBean(createReqVO, ElderlyDiaperUsageRecodDO.class);
+        elderlyDiaperUsageRecodMapper.insert(record);
+        return record.getId();
+    }
+
+    @Override
+    public void update(ElderlyDiaperUsageRecodSaveReqVO updateReqVO) {
+        validateExists(updateReqVO.getId());
+        ElderlyDiaperUsageRecodDO updateObj = BeanUtils.toBean(updateReqVO, ElderlyDiaperUsageRecodDO.class);
+        elderlyDiaperUsageRecodMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void delete(Long id) {
+        validateExists(id);
+        elderlyDiaperUsageRecodMapper.deleteById(id);
+    }
+
+    @Override
+    public ElderlyDiaperUsageRecodRespVO get(Long id) {
+        ElderlyDiaperUsageRecodDO record = elderlyDiaperUsageRecodMapper.selectById(id);
+        if (record == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+        return BeanUtils.toBean(record, ElderlyDiaperUsageRecodRespVO.class);
+    }
+
+    @Override
+    public PageResult<ElderlyDiaperUsageRecodRespVO> getPage(ElderlyDiaperUsageRecodPageReqVO pageReqVO) {
+        return elderlyDiaperUsageRecodMapper.selectPageWithBuildInfo(pageReqVO);
+    }
+
+    private void validateExists(Long id) {
+        if (id == null || elderlyDiaperUsageRecodMapper.selectById(id) == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDiapersGetRecordService.java

@@ -0,0 +1,19 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordSaveReqVO;
+
+public interface ElderlyDiapersGetRecordService {
+
+    Long create(ElderlyDiapersGetRecordSaveReqVO createReqVO);
+
+    void update(ElderlyDiapersGetRecordSaveReqVO updateReqVO);
+
+    void delete(Long id);
+
+    ElderlyDiapersGetRecordRespVO get(Long id);
+
+    PageResult<ElderlyDiapersGetRecordRespVO> getPage(ElderlyDiapersGetRecordPageReqVO pageReqVO);
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDiapersGetRecordServiceImpl.java

@@ -0,0 +1,64 @@
+package cn.iocoder.yudao.module.system.service.biz;
+
+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.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordRespVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordSaveReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyDiapersGetRecordDO;
+import cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyDiapersGetRecordMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.COMMON_NOT_FOUND;
+
+@Service
+@Validated
+public class ElderlyDiapersGetRecordServiceImpl implements ElderlyDiapersGetRecordService {
+
+    @Resource
+    private ElderlyDiapersGetRecordMapper elderlyDiapersGetRecordMapper;
+
+    @Override
+    public Long create(ElderlyDiapersGetRecordSaveReqVO createReqVO) {
+        ElderlyDiapersGetRecordDO record = BeanUtils.toBean(createReqVO, ElderlyDiapersGetRecordDO.class);
+        elderlyDiapersGetRecordMapper.insert(record);
+        return record.getId();
+    }
+
+    @Override
+    public void update(ElderlyDiapersGetRecordSaveReqVO updateReqVO) {
+        validateExists(updateReqVO.getId());
+        ElderlyDiapersGetRecordDO updateObj = BeanUtils.toBean(updateReqVO, ElderlyDiapersGetRecordDO.class);
+        elderlyDiapersGetRecordMapper.updateById(updateObj);
+    }
+
+    @Override
+    public void delete(Long id) {
+        validateExists(id);
+        elderlyDiapersGetRecordMapper.deleteById(id);
+    }
+
+    @Override
+    public ElderlyDiapersGetRecordRespVO get(Long id) {
+        ElderlyDiapersGetRecordDO record = elderlyDiapersGetRecordMapper.selectById(id);
+        if (record == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+        return BeanUtils.toBean(record, ElderlyDiapersGetRecordRespVO.class);
+    }
+
+    @Override
+    public PageResult<ElderlyDiapersGetRecordRespVO> getPage(ElderlyDiapersGetRecordPageReqVO pageReqVO) {
+        return elderlyDiapersGetRecordMapper.selectPageWithBuildInfo(pageReqVO);
+    }
+
+    private void validateExists(Long id) {
+        if (id == null || elderlyDiapersGetRecordMapper.selectById(id) == null) {
+            throw exception(COMMON_NOT_FOUND);
+        }
+    }
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyDisinfectRecordServiceImpl.java

@@ -53,8 +53,7 @@ public class ElderlyDisinfectRecordServiceImpl implements ElderlyDisinfectRecord
 
     @Override
     public PageResult<ElderlyDisinfectRecordRespVO> getPage(ElderlyDisinfectRecordPageReqVO pageReqVO) {
-        PageResult<ElderlyDisinfectRecordDO> pageResult = elderlyDisinfectRecordMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyDisinfectRecordRespVO.class);
+        return elderlyDisinfectRecordMapper.selectPageWithBuildInfo(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/biz/ElderlyFacilityEquipmentCheckServiceImpl.java

@@ -53,8 +53,7 @@ public class ElderlyFacilityEquipmentCheckServiceImpl implements ElderlyFacility
 
     @Override
     public PageResult<ElderlyFacilityEquipmentCheckRespVO> getPage(ElderlyFacilityEquipmentCheckPageReqVO pageReqVO) {
-        PageResult<ElderlyFacilityEquipmentCheckDO> pageResult = elderlyFacilityEquipmentCheckMapper.selectPage(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyFacilityEquipmentCheckRespVO.class);
+        return elderlyFacilityEquipmentCheckMapper.selectPageWithBuildInfo(pageReqVO);
     }
 
     private void validateExists(Long id) {

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyBuildCleanDisinfectRecordMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyBuildCleanDisinfectRecordMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.buildcleandisinfectrecord.ElderlyBuildCleanDisinfectRecordRespVO">
+        SELECT
+            ebcdr.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_build_clean_disinfect_record ebcdr
+        LEFT JOIN org_build ob ON ebcdr.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON ebcdr.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND ebcdr.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null">
+            AND ebcdr.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length >= 1">
+            AND ebcdr.assess_month &gt;= #{reqVO.assessMonth[0]}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length == 2">
+            AND ebcdr.assess_month &lt; #{reqVO.assessMonth[1]}
+        </if>
+        ORDER BY ebcdr.assess_month DESC, ebcdr.id DESC
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDailyCleanDisinfectRecordMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyDailyCleanDisinfectRecordMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.dailycleandisinfectrecord.ElderlyDailyCleanDisinfectRecordRespVO">
+        SELECT
+            edcdr.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_daily_clean_disinfect_record edcdr
+        LEFT JOIN org_build ob ON edcdr.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON edcdr.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND edcdr.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null">
+            AND edcdr.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length >= 1">
+            AND edcdr.assess_month &gt;= #{reqVO.assessMonth[0]}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length == 2">
+            AND edcdr.assess_month &lt; #{reqVO.assessMonth[1]}
+        </if>
+        ORDER BY edcdr.assess_month DESC, edcdr.id DESC
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDangerMaterialRegisterMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyDangerMaterialRegisterMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydangermaterialregister.ElderlyDangerMaterialRegisterRespVO">
+        SELECT
+            edmr.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_danger_material_register edmr
+        LEFT JOIN org_build ob ON edmr.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON edmr.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND edmr.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null ">
+            AND edmr.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length >= 1">
+            AND edmr.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND edmr.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        ORDER BY edmr.assess_date DESC, edmr.id DESC
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDiaperUsageRecodMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyDiaperUsageRecodMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.diaperusagerecod.ElderlyDiaperUsageRecodRespVO">
+        SELECT
+            edur.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_diaper_usage_recod edur
+        LEFT JOIN org_build ob ON edur.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON edur.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND edur.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null">
+            AND edur.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length >= 1">
+            AND edur.assess_month gt;= #{reqVO.assessMonth[0]}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length == 2">
+            AND edur.assess_month lt;= #{reqVO.assessMonth[1]}
+        </if>
+        ORDER BY edur.assess_month DESC, edur.id DESC
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDiapersGetRecordMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyDiapersGetRecordMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.diapersgetrecord.ElderlyDiapersGetRecordRespVO">
+        SELECT
+            edgr.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_diapers_get_record edgr
+        LEFT JOIN org_build ob ON edgr.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON edgr.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND edgr.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null">
+            AND edgr.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length >= 1">
+            AND edgr.assess_date &gt;= #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND edgr.assess_date &lt;= #{reqVO.assessDate[1]}
+        </if>
+        ORDER BY edgr.assess_date DESC, edgr.id DESC
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyDisinfectRecordMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyDisinfectRecordMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlydisinfectrecord.ElderlyDisinfectRecordRespVO">
+        SELECT
+            edr.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_disinfect_record edr
+        LEFT JOIN org_build ob ON edr.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON edr.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND edr.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null">
+            AND edr.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length >= 1">
+            AND  edr.assess_date &gt; #{reqVO.assessDate[0]}
+        </if>
+        <if test="reqVO.assessDate != null and reqVO.assessDate.length == 2">
+            AND  edr.assess_date &lt; #{reqVO.assessDate[1]}
+        </if>
+        ORDER BY edr.assess_date DESC, edr.id DESC
+    </select>
+
+</mapper>

yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/ElderlyFacilityEquipmentCheckMapper.xml

@@ -0,0 +1,32 @@
+<?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.biz.ElderlyFacilityEquipmentCheckMapper">
+
+    <!--
+        带楼栋和楼层信息的分页查询
+    -->
+    <select id="selectPageWithBuildInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyfacilityequipmentcheck.ElderlyFacilityEquipmentCheckRespVO">
+        SELECT
+            efec.*,
+            ob.build_name AS buildName,
+            obf.floor_name AS floorName
+        FROM elderly_facility_equipment_check efec
+        LEFT JOIN org_build ob ON efec.build_id = ob.id
+        LEFT JOIN org_build_floor obf ON efec.floor_id = obf.id AND obf.build_id = ob.id
+        WHERE 1=1
+        <if test="reqVO.buildId != null">
+            AND efec.build_id = #{reqVO.buildId}
+        </if>
+        <if test="reqVO.floorId != null">
+            AND efec.floor_id = #{reqVO.floorId}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length >= 1">
+            AND efec.assess_month &gt;= #{reqVO.assessMonth[0]}
+        </if>
+        <if test="reqVO.assessMonth != null and reqVO.assessMonth.length == 2">
+            AND efec.assess_month &lt;= #{reqVO.assessMonth[1]}
+        </if>
+        ORDER BY efec.assess_month DESC, efec.id DESC
+    </select>
+
+</mapper>