From 930183ea5d2ee2c6bccc3cf5093591f9f3e1b32b Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期三, 30 七月 2025 19:17:03 +0800 Subject: [PATCH] 代码提交 --- jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java | 58 ++++++++++++++++++++++++++++------------------------------ 1 files changed, 28 insertions(+), 30 deletions(-) diff --git a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java index 9bd1455..c1230ce 100644 --- a/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java +++ b/jh-module-ecg/jh-module-ecg-biz/src/main/java/cn/lihu/jh/module/ecg/controller/admin/appointment/AppointmentController.java @@ -1,42 +1,40 @@ package cn.lihu.jh.module.ecg.controller.admin.appointment; +import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog; +import cn.lihu.jh.framework.common.pojo.CommonResult; +import cn.lihu.jh.framework.common.pojo.PageParam; +import cn.lihu.jh.framework.common.pojo.PageResult; +import cn.lihu.jh.framework.common.util.object.BeanUtils; +import cn.lihu.jh.framework.excel.core.util.ExcelUtils; +import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentConfirmReqVO; +import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentPageReqVO; +import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentRespVO; +import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.AppointmentSaveReqVO; +import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO; +import cn.lihu.jh.module.ecg.service.appointment.AppointmentService; import cn.lihu.jh.module.ecg.service.devrent.DevRentService; import cn.lihu.jh.module.ecg.service.queue.QueueService; import cn.lihu.jh.module.ecg.service.room.RoomService; import cn.lihu.jh.module.system.api.dept.DeptApi; -import org.springframework.web.bind.annotation.*; -import org.springframework.validation.annotation.Validated; -import org.springframework.security.access.prepost.PreAuthorize; -import io.swagger.v3.oas.annotations.tags.Tag; -import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.Operation; - -import java.time.LocalDate; -import java.util.*; -import java.io.IOException; - -import cn.lihu.jh.framework.common.pojo.PageParam; -import cn.lihu.jh.framework.common.pojo.PageResult; -import cn.lihu.jh.framework.common.pojo.CommonResult; -import cn.lihu.jh.framework.common.util.object.BeanUtils; - -import static cn.lihu.jh.framework.common.pojo.CommonResult.error; -import static cn.lihu.jh.framework.common.pojo.CommonResult.success; - -import cn.lihu.jh.framework.excel.core.util.ExcelUtils; - -import cn.lihu.jh.framework.apilog.core.annotation.ApiAccessLog; - -import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.*; -import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.*; - -import cn.lihu.jh.module.ecg.controller.admin.appointment.vo.*; -import cn.lihu.jh.module.ecg.dal.dataobject.appointment.AppointmentDO; -import cn.lihu.jh.module.ecg.service.appointment.AppointmentService; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.io.IOException; +import java.time.LocalDate; +import java.util.List; + +import static cn.lihu.jh.framework.apilog.core.enums.OperateTypeEnum.EXPORT; +import static cn.lihu.jh.framework.common.pojo.CommonResult.error; +import static cn.lihu.jh.framework.common.pojo.CommonResult.success; +import static cn.lihu.jh.module.ecg.enums.ErrorCodeConstants.APPOINTMENT_NOT_BILLING; @Tag(name = "绠$悊鍚庡彴 - 棰勭害") @RestController @@ -128,10 +126,10 @@ return success(BeanUtils.toBean(appointmentList.get(0), AppointmentRespVO.class)); } - @PostMapping("/page") + @GetMapping("/page") @Operation(summary = "鑾峰緱棰勭害鍒嗛〉") @PreAuthorize("@ss.hasPermission('ecg:appointment:query')") - public CommonResult<PageResult<AppointmentRespVO>> getAppointmentPage(@RequestBody AppointmentPageReqVO pageReqVO) { + public CommonResult<PageResult<AppointmentRespVO>> getAppointmentPage(AppointmentPageReqVO pageReqVO) { pageReqVO.setOrderCreateTime("1"); PageResult<AppointmentDO> pageResult = appointmentService.getAppointmentPage(pageReqVO); return success(BeanUtils.toBean(pageResult, AppointmentRespVO.class)); -- Gitblit v1.9.3