From cce9d33e6c03ab48fb22c62fe5de3d1e902c598f Mon Sep 17 00:00:00 2001
From: eight <641137800@qq.com>
Date: 星期三, 28 八月 2024 14:25:51 +0800
Subject: [PATCH] update
---
jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
index c52395f..92c5998 100644
--- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
+++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/room/RoomController.java
@@ -1,10 +1,9 @@
package cn.lihu.jh.module.ecg.controller.admin.room;
-import cn.lihu.jh.framework.common.enums.CommonStatusEnum;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomPageReqVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomRespVO;
import cn.lihu.jh.module.ecg.controller.admin.room.vo.RoomSaveReqVO;
-import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomDO;
+import cn.lihu.jh.module.ecg.dal.dataobject.room.RoomResVO;
import cn.lihu.jh.module.ecg.service.room.RoomService;
import cn.lihu.jh.module.system.api.dept.DeptApi;
import cn.lihu.jh.module.system.api.dept.dto.DeptRespDTO;
@@ -78,7 +77,7 @@
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
@PreAuthorize("@ss.hasPermission('clinic:room:query')")
public CommonResult<RoomRespVO> getRoom(@RequestParam("id") Integer id) {
- RoomDO room = roomService.getRoom(id);
+ RoomResVO room = roomService.getRoom(id);
return success(BeanUtils.toBean(room, RoomRespVO.class));
}
@@ -86,7 +85,7 @@
@Operation(summary = "鑾峰緱璇婂鍜岃瘖鐤楀簥鍒嗛〉")
@PreAuthorize("@ss.hasPermission('clinic:room:query')")
public CommonResult<PageResult<RoomRespVO>> getRoomPage(@Valid RoomPageReqVO pageReqVO) {
- PageResult<RoomDO> pageResult = roomService.getRoomPage(pageReqVO);
+ PageResult<RoomResVO> pageResult = roomService.getRoomPage(pageReqVO);
return success(BeanUtils.toBean(pageResult, RoomRespVO.class));
}
@@ -97,7 +96,7 @@
public void exportRoomExcel(@Valid RoomPageReqVO pageReqVO,
HttpServletResponse response) throws IOException {
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList();
+ List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList();
// 瀵煎嚭 Excel
ExcelUtils.write(response, "璇婂鍜岃瘖鐤楀簥.xls", "鏁版嵁", RoomRespVO.class,
BeanUtils.toBean(list, RoomRespVO.class));
@@ -140,7 +139,7 @@
RoomPageReqVO pageReqVO = new RoomPageReqVO();
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
- List<RoomDO> list = roomService.getRoomPage(pageReqVO).getList();
+ List<RoomResVO> list = roomService.getRoomPage(pageReqVO).getList();
List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
@@ -151,7 +150,7 @@
@GetMapping(value = {"/list-simple-room"})
@Operation(summary = "鑾峰彇闂ㄨ瘖瀹ゅ垪琛�", description = "涓昏鐢ㄤ簬鍓嶇鐨勮瘖瀹ら�夋嫨")
public CommonResult<Map<String, List<RoomRespVO>>> getSimpleRoomList() {
- List<RoomDO> list = roomService.simpleRoomList();
+ List<RoomResVO> list = roomService.simpleRoomList();
List<RoomRespVO> list2 = BeanUtils.toBean(list, RoomRespVO.class);
Map<String, List<RoomRespVO>> map = list2.stream().collect(Collectors.groupingBy(RoomRespVO::getRoomName));
--
Gitblit v1.9.3