From e10ff52c2bbb86eac5b2c4bdf12b852912a1f798 Mon Sep 17 00:00:00 2001 From: eight <641137800@qq.com> Date: 星期三, 28 八月 2024 14:44:12 +0800 Subject: [PATCH] update --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java index 5abba9a..e40ee02 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/dal/mysql/room/RoomMapper.java @@ -3,17 +3,17 @@ import java.util.*; import cn.lihu.jh.framework.common.pojo.PageResult; -import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX; import cn.lihu.jh.framework.mybatis.core.mapper.BaseMapperX; - -import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO; -import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO; -import cn.lihu.jh.module.ecg.enums.BedStatusEnum; +import cn.lihu.jh.framework.mybatis.core.query.LambdaQueryWrapperX; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; import org.apache.ibatis.annotations.Update; + +import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO; +import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomStatisticsDO; +import cn.lihu.jh.module.ecg.enums.BedStatusEnum; /** * 璇婂鍜岃瘖鐤楀簥 Mapper @@ -21,14 +21,14 @@ * @author 鑺嬮亾婧愮爜 */ @Mapper -public interface RoomMapper extends BaseMapperX<RoomResVO> { +public interface RoomMapper extends BaseMapperX<RoomDO> { - default PageResult<RoomResVO> selectPage(RoomPageReqVO reqVO) { - return selectPage(reqVO, new LambdaQueryWrapperX<RoomResVO>() - .eqIfPresent(RoomResVO::getRoomId, reqVO.getRoomId()) - .eqIfPresent(RoomResVO::getBedNo, reqVO.getBedNo()) - .betweenIfPresent(RoomResVO::getCreateTime, reqVO.getCreateTime()) - .orderByDesc(RoomResVO::getId)); + default PageResult<RoomDO> selectPage(RoomPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX<RoomDO>() + .eqIfPresent(RoomDO::getRoomId, reqVO.getRoomId()) + .eqIfPresent(RoomDO::getBedNo, reqVO.getBedNo()) + .betweenIfPresent(RoomDO::getCreateTime, reqVO.getCreateTime()) + .orderByDesc(RoomDO::getId)); } @Select({ "SELECT room_id, room_name, count(1) as bed_num FROM lihu.clinic_room group by room_id;" }) @@ -41,10 +41,10 @@ " #{curStatus.status} " + " </foreach> );" + "</script>") - List<RoomResVO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList); + List<RoomDO> simpleRoomList(@Param("curStatusList") List<BedStatusEnum> curStatusList); @Select("SELECT * FROM lihu.clinic_room where room_id=#{roomId} and bed_no=#{bedNo} and doc_id=#{docId}") - RoomResVO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId); + RoomDO getRoom(@Param("roomId")Long roomId, @Param("bedNo")String bedNo, @Param("docId")Long docId); @Update("<script> " + "update lihu.clinic_room set status=#{newStatus.status} where room_id=#{roomId} and bed_no=#{bedNo} " + -- Gitblit v1.9.3