修改

1、调整巡房项目模块

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

@@ -4,10 +4,7 @@ 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.elderlyitemsround.ElderlyItemsRoundBatchSaveReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.*;
 import cn.iocoder.yudao.module.system.service.biz.ElderlyItemsRoundService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
@@ -67,17 +64,16 @@ public class ElderlyItemsRoundController {
     }
 
     @GetMapping("/get")
-    @Operation(summary = "获得长者巡房项目详情")
-    @Parameter(name = "id", description = "编号", required = true, example = "1")
+    @Operation(summary = "获得长者巡房项目详情（按长者分页）")
     @TenantIgnore
-    public CommonResult<ElderlyItemsRoundRespVO> get(@RequestParam("id") Long id) {
-        return success(elderlyItemsRoundService.get(id));
+    public CommonResult<ElderlyItemsRoundRespVO> get(@Valid ElderlyItemsRoundPageReqVO reqVO) {
+        return success(elderlyItemsRoundService.get(reqVO));
     }
 
     @GetMapping("/page")
     @Operation(summary = "获得长者巡房项目分页")
     @TenantIgnore
-    public CommonResult<PageResult<ElderlyItemsRoundRespVO>> page(@Valid ElderlyItemsRoundPageReqVO pageReqVO) {
+    public CommonResult<PageResult<ElderlyItemsRoundPageRespVO>> page(@Valid ElderlyItemsRoundPageReqVO pageReqVO) {
         if (pageReqVO.getTenantIds() == null) {
             pageReqVO.setTenantIds(new Long[]{TenantContextHolder.getTenantId()});
         }
@@ -95,4 +91,3 @@ public class ElderlyItemsRoundController {
         return success(elderlyItemsRoundService.batchCreate(reqVO));
     }
 }
-

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyitemsround/ElderlyItemsRoundBatchSaveReqVO.java

@@ -60,6 +60,9 @@ public class ElderlyItemsRoundBatchSaveReqVO {
 
         @Schema(description = "备注")
         private String remark;
+
+        @Schema(description = "状态，0：异常，1：正常")
+        private Integer status;
     }
 }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyitemsround/ElderlyItemsRoundPageReqVO.java

@@ -19,26 +19,16 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @ToString(callSuper = true)
 public class ElderlyItemsRoundPageReqVO extends PageParam {
 
+    @Schema(description = "长者id", example = "1")
+    private Long elderId;
+
     @Schema(description = "角色", example = "护理员")
     private String role;
 
     @Schema(description = "长者姓名（模糊匹配）", example = "张三")
     private String elderName;
 
-    @Schema(description = "楼栋id", example = "1")
-    private Long buildId;
-
-    @Schema(description = "楼层id", example = "1")
-    private Long floorId;
-
-    @Schema(description = "房间id", example = "1")
-    private Long roomId;
-
     @Schema(description = "巡房时间范围")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
     private LocalDate[] roundTime;
-
-    @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/elderlyitemsround/ElderlyItemsRoundPageRespVO.java

@@ -0,0 +1,27 @@
+package cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+
+
+@Schema(description = "管理后台 - 长者巡房项目分页 Response VO")
+@Data
+public class ElderlyItemsRoundPageRespVO {
+
+    @Schema(description = "长者id")
+    private String elderId;
+
+    @Schema(description = "记录人")
+    private String recorder;
+
+    @Schema(description = "角色", example = "护理员")
+    private String role;
+
+    @Schema(description = "长者姓名")
+    private String elderName;
+
+    @Schema(description = "机构id", example = "1")
+    private Long tenantId;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/biz/vo/elderlyitemsround/ElderlyItemsRoundRespVO.java

@@ -1,12 +1,11 @@
 package cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround;
 
-import com.baomidou.mybatisplus.annotation.TableField;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -14,59 +13,69 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
 @Data
 public class ElderlyItemsRoundRespVO {
 
-    @Schema(description = "id", example = "1")
-    private Long id;
-
-    @Schema(description = "记录人")
-    private String recorder;
-
-    @Schema(description = "角色", example = "护理员")
-    private String role;
-
     @Schema(description = "长者id", example = "1")
     private Long elderId;
 
     @Schema(description = "长者姓名")
     private String elderName;
 
-    @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 roomId;
+    @Schema(description = "房间号")
+    private String roomName;
 
-    @Schema(description = "巡视项目组")
-    private String items;
+    @Schema(description = "床位号")
+    private String bedName;
 
-    @Schema(description = "语音")
-    private String voice;
+    @Schema(description = "巡房记录明细分页")
+    private PageResult<Record> pageResult;
 
-    @Schema(description = "备注")
-    private String remark;
+    @Schema(description = "管理后台 - 长者巡房项目明细 Response VO")
+    @Data
+    public static class Record {
 
-    @Schema(description = "机构id", example = "1")
-    private Long tenantId;
+        @Schema(description = "id", example = "1")
+        private Long id;
 
-    @Schema(description = "巡房时间")
-    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private LocalDateTime roundTime;
+        @Schema(description = "记录人")
+        private String recorder;
 
-    @Schema(description = "房间号")
-    private String roomName;
+        @Schema(description = "角色", example = "护理员")
+        private String role;
 
-    @Schema(description = "创建时间")
-    private LocalDateTime createTime;
+        @Schema(description = "巡视项目组")
+        private String items;
 
-    @Schema(description = "更新时间")
-    private LocalDateTime updateTime;
+        @Schema(description = "语音")
+        private String voice;
 
-    @Schema(description = "创建人")
-    private String creator;
+        @Schema(description = "备注")
+        private String remark;
 
-    @Schema(description = "更新人")
-    private String updater;
-}
+        @Schema(description = "机构id", example = "1")
+        private Long tenantId;
+
+        @Schema(description = "巡房时间")
+        @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+        private LocalDateTime roundTime;
+
+        @Schema(description = "创建时间")
+        private LocalDateTime createTime;
+
+        @Schema(description = "更新时间")
+        private LocalDateTime updateTime;
 
+        @Schema(description = "创建人")
+        private String creator;
+
+        @Schema(description = "更新人")
+        private String updater;
+
+        @Schema(description = "状态，0：异常，1：正常")
+        private Integer status;
+    }
+}

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

@@ -64,6 +64,9 @@ public class ElderlyItemsRoundDO extends BaseNoDeleteDO {
     @Schema(description = "巡房时间")
     private LocalDateTime roundTime;
 
+    @Schema(description = "状态，0：异常，1：正常")
+    private Integer status;
+
     @TableField(exist = false)
     private String elderName;
     @TableField(exist = false)

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

@@ -2,26 +2,39 @@ 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.elderlyitemsround.ElderlyItemsRoundPageReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundPageRespVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyItemsRoundDO;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.time.LocalTime;
 import java.util.List;
 
 @Mapper
 public interface ElderlyItemsRoundMapper extends BaseMapperX<ElderlyItemsRoundDO> {
 
-    List<ElderlyItemsRoundDO> selectPageWithElderInfo(Page<ElderlyItemsRoundDO> page,
+    List<ElderlyItemsRoundPageRespVO> selectPageWithElderInfo(Page<ElderlyItemsRoundPageRespVO> page,
                                                       @Param("reqVO") ElderlyItemsRoundPageReqVO reqVO);
 
     ElderlyItemsRoundDO selectByIdWithElderInfo(@Param("id") Long id);
 
-    default PageResult<ElderlyItemsRoundDO> selectPageWithElderInfo(ElderlyItemsRoundPageReqVO reqVO) {
-        Page<ElderlyItemsRoundDO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
-        List<ElderlyItemsRoundDO> list = selectPageWithElderInfo(page, reqVO);
+    default PageResult<ElderlyItemsRoundPageRespVO> selectPageWithElderInfo(ElderlyItemsRoundPageReqVO reqVO) {
+        Page<ElderlyItemsRoundPageRespVO> page = new Page<>(reqVO.getPageNo(), reqVO.getPageSize());
+        List<ElderlyItemsRoundPageRespVO> list = selectPageWithElderInfo(page, reqVO);
         return new PageResult<>(list, page.getTotal());
     }
-}
 
+    default PageResult<ElderlyItemsRoundDO> selectDetailPage(ElderlyItemsRoundPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<ElderlyItemsRoundDO>()
+                .eq(ElderlyItemsRoundDO::getElderId, reqVO.getElderId())
+                .eqIfPresent(ElderlyItemsRoundDO::getRole, reqVO.getRole())
+                .geIfPresent(ElderlyItemsRoundDO::getRoundTime, reqVO.getRoundTime() != null && reqVO.getRoundTime().length >= 1
+                        ? reqVO.getRoundTime()[0].atStartOfDay() : null)
+                .ltIfPresent(ElderlyItemsRoundDO::getRoundTime, reqVO.getRoundTime() != null && reqVO.getRoundTime().length == 2
+                        ? reqVO.getRoundTime()[1].plusDays(1).atStartOfDay() : null)
+                .orderByDesc(ElderlyItemsRoundDO::getRoundTime, ElderlyItemsRoundDO::getId));
+    }
+}

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

@@ -369,9 +369,14 @@ public class DailyExpensesServiceImpl implements DailyExpensesService {
      * 验证并获取收费项目信息
      */
     private OverheadChargeDO validateAndGetOverheadCharge(DailyExpensesExcelVO excelVO) {
-        return sysOverheadChargeMapper.selectOne(new LambdaQueryWrapperX<OverheadChargeDO>()
+        OverheadChargeDO overheadChargeDO = sysOverheadChargeMapper.selectOne(new LambdaQueryWrapperX<OverheadChargeDO>()
                 .eq(OverheadChargeDO::getChargeName, excelVO.getItemName())
-                .eq(OverheadChargeDO::getPrice,excelVO.getPrice()));
+                .eq(OverheadChargeDO::getPrice, excelVO.getPrice()));
+        if(overheadChargeDO == null){
+            overheadChargeDO = sysOverheadChargeMapper.selectOne(new LambdaQueryWrapperX<OverheadChargeDO>()
+                    .eq(OverheadChargeDO::getChargeName, excelVO.getItemName()));
+        }
+        return overheadChargeDO;
     }
 
     /**

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

@@ -1,10 +1,7 @@
 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.elderlyitemsround.ElderlyItemsRoundBatchSaveReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.*;
 
 public interface ElderlyItemsRoundService {
 
@@ -14,10 +11,9 @@ public interface ElderlyItemsRoundService {
 
     void delete(Long id);
 
-    ElderlyItemsRoundRespVO get(Long id);
+    ElderlyItemsRoundRespVO get(ElderlyItemsRoundPageReqVO reqVO);
 
-    PageResult<ElderlyItemsRoundRespVO> getPage(ElderlyItemsRoundPageReqVO pageReqVO);
+    PageResult<ElderlyItemsRoundPageRespVO> getPage(ElderlyItemsRoundPageReqVO pageReqVO);
 
     Boolean batchCreate(ElderlyItemsRoundBatchSaveReqVO reqVO);
 }
-

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

@@ -5,12 +5,12 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundBatchSaveReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundPageReqVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundRespVO;
-import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundSaveReqVO;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.*;
+import cn.iocoder.yudao.module.system.controller.admin.biz.vo.BuildBedVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyItemsRoundDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyInfoDO;
 import cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyItemsRoundMapper;
+import cn.iocoder.yudao.module.system.dal.mysql.biz.ElderlyInfoMapper;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
@@ -19,6 +19,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.invalidParamException;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.COMMON_NOT_FOUND;
 
 @Service
@@ -28,6 +29,12 @@ public class ElderlyItemsRoundServiceImpl implements ElderlyItemsRoundService {
     @Resource
     private ElderlyItemsRoundMapper elderlyItemsRoundMapper;
 
+    @Resource
+    private ElderlyInfoMapper elderlyInfoMapper;
+
+    @Resource
+    private BuildService buildService;
+
     @Override
     public Long create(ElderlyItemsRoundSaveReqVO createReqVO) {
         ElderlyItemsRoundDO record = BeanUtils.toBean(createReqVO, ElderlyItemsRoundDO.class);
@@ -51,18 +58,36 @@ public class ElderlyItemsRoundServiceImpl implements ElderlyItemsRoundService {
     }
 
     @Override
-    public ElderlyItemsRoundRespVO get(Long id) {
-        ElderlyItemsRoundDO record = elderlyItemsRoundMapper.selectByIdWithElderInfo(id);
-        if (record == null) {
+    public ElderlyItemsRoundRespVO get(ElderlyItemsRoundPageReqVO reqVO) {
+        if (reqVO == null || reqVO.getElderId() == null) {
+            throw invalidParamException("elderId不能为空");
+        }
+        ElderlyInfoDO elderlyInfo = elderlyInfoMapper.selectById(reqVO.getElderId());
+        if (elderlyInfo == null) {
             throw exception(COMMON_NOT_FOUND);
         }
-        return BeanUtils.toBean(record, ElderlyItemsRoundRespVO.class);
+
+        ElderlyItemsRoundRespVO respVO = new ElderlyItemsRoundRespVO();
+        respVO.setElderId(elderlyInfo.getId());
+        respVO.setElderName(elderlyInfo.getElderName());
+        if (elderlyInfo.getBedId() != null) {
+            BuildBedVO bedInfo = buildService.getBedInfoById(elderlyInfo.getBedId());
+            if (bedInfo != null) {
+                respVO.setBuildName(bedInfo.getBuildName());
+                respVO.setFloorName(bedInfo.getBuildFloorName());
+                respVO.setRoomName(bedInfo.getBuildRoomName());
+                respVO.setBedName(bedInfo.getBuildBedName());
+            }
+        }
+
+        PageResult<ElderlyItemsRoundDO> pageResult = elderlyItemsRoundMapper.selectDetailPage(reqVO);
+        respVO.setPageResult(BeanUtils.toBean(pageResult, ElderlyItemsRoundRespVO.Record.class));
+        return respVO;
     }
 
     @Override
-    public PageResult<ElderlyItemsRoundRespVO> getPage(ElderlyItemsRoundPageReqVO pageReqVO) {
-        PageResult<ElderlyItemsRoundDO> pageResult = elderlyItemsRoundMapper.selectPageWithElderInfo(pageReqVO);
-        return BeanUtils.toBean(pageResult, ElderlyItemsRoundRespVO.class);
+    public PageResult<ElderlyItemsRoundPageRespVO> getPage(ElderlyItemsRoundPageReqVO pageReqVO) {
+        return elderlyItemsRoundMapper.selectPageWithElderInfo(pageReqVO);
     }
 
     @Override
@@ -83,6 +108,7 @@ public class ElderlyItemsRoundServiceImpl implements ElderlyItemsRoundService {
             record.setVoice(recordReq.getVoice());
             record.setRemark(recordReq.getRemark());
             record.setRoundTime(reqVO.getRoundTime());
+            record.setStatus(recordReq.getStatus());
             insertList.add(record);
         }
         return elderlyItemsRoundMapper.insertBatch(insertList);
@@ -116,4 +142,3 @@ public class ElderlyItemsRoundServiceImpl implements ElderlyItemsRoundService {
         }
     }
 }
-

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

@@ -2,19 +2,9 @@
 <!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.ElderlyItemsRoundMapper">
 
-    <resultMap id="ElderlyItemsRoundDOResultMap"
-               type="cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyItemsRoundDO"
-               autoMapping="true">
-        <id column="id" property="id"/>
-        <result column="items" property="items"/>
-        <result column="elderName" property="elderName"/>
-        <result column="roomName" property="roomName"/>
-    </resultMap>
-
-    <select id="selectPageWithElderInfo" resultMap="ElderlyItemsRoundDOResultMap">
+    <select id="selectPageWithElderInfo" resultType="cn.iocoder.yudao.module.system.controller.admin.biz.vo.elderlyitemsround.ElderlyItemsRoundPageRespVO">
         SELECT
-            eir.*,
-            ei.elder_name AS elderName
+        eir.elder_id,ei.elder_name AS elderName,eir.recorder,eir.role,eir.tenant_id
         FROM elderly_items_round eir
         LEFT JOIN elderly_info ei ON ei.id = eir.elder_id
         WHERE 1 = 1
@@ -30,25 +20,17 @@
         <if test="reqVO.elderName != null and reqVO.elderName != ''">
             AND ei.elder_name LIKE CONCAT('%', #{reqVO.elderName}, '%')
         </if>
-        <if test="reqVO.buildId != null">
-            AND eir.build_id = #{reqVO.buildId}
-        </if>
-        <if test="reqVO.floorId != null">
-            AND eir.floor_id = #{reqVO.floorId}
-        </if>
-        <if test="reqVO.roomId != null">
-            AND eir.room_id = #{reqVO.roomId}
-        </if>
         <if test="reqVO.roundTime != null and reqVO.roundTime.length &gt;= 1">
             AND eir.round_time &gt;= #{reqVO.roundTime[0]}
         </if>
         <if test="reqVO.roundTime != null and reqVO.roundTime.length == 2">
             AND eir.round_time &lt; #{reqVO.roundTime[1]} + INTERVAL 1 DAY
         </if>
+        GROUP BY eir.elder_id,ei.elder_name,eir.recorder,eir.role,eir.tenant_id
         ORDER BY eir.round_time DESC, eir.id DESC
     </select>
 
-    <select id="selectByIdWithElderInfo" resultMap="ElderlyItemsRoundDOResultMap">
+    <select id="selectByIdWithElderInfo" resultType="cn.iocoder.yudao.module.system.dal.dataobject.biz.ElderlyItemsRoundDO">
         SELECT
             eir.*,
             ei.elder_name AS elderName,