diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java index 9578d55..fa967cc 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetBookingController.java @@ -38,25 +38,13 @@ public class MeetBookingController extends BaseController { private final IMeetBookingService meetBookingService; /** - * 查询会议预约列表 + * 查询会议预约记录列表 */ @SaCheckPermission("property:meetbooking:list") @GetMapping("/list") public TableDataInfo list(MeetBookingBo bo, PageQuery pageQuery) { return meetBookingService.queryPageList(bo, pageQuery); } - - ///** - // * 导出会议预约列表 - // */ - //@SaCheckPermission("property:meetbooking:export") - //@Log(title = "会议预约", businessType = BusinessType.EXPORT) - //@PostMapping("/export") - //public void export(MeetBookingBo bo, HttpServletResponse response) { - // List list = meetBookingService.queryList(bo); - // ExcelUtil.exportExcel(list, "会议预约", MeetBookingVo.class, response); - //} - /** * 获取会议预约详细信息 * @@ -91,16 +79,16 @@ public class MeetBookingController extends BaseController { return toAjax(meetBookingService.updateByBo(bo)); } - /** - * 删除会议预约 - * - * @param ids 主键串 - */ - @SaCheckPermission("property:meetbooking:remove") - @Log(title = "会议预约", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public R remove(@NotEmpty(message = "主键不能为空") - @PathVariable("ids") Long[] ids) { - return toAjax(meetBookingService.deleteWithValidByIds(List.of(ids), true)); - } + ///** + // * 删除会议预约 + // * + // * @param ids 主键串 + // */ + //@SaCheckPermission("property:meetbooking:remove") + //@Log(title = "会议预约", businessType = BusinessType.DELETE) + //@DeleteMapping("/{ids}") + //public R remove(@NotEmpty(message = "主键不能为空") + // @PathVariable("ids") Long[] ids) { + // return toAjax(meetBookingService.deleteWithValidByIds(List.of(ids), true)); + //} } diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java index 2db9909..fd08285 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/controller/MeetController.java @@ -50,6 +50,16 @@ public class MeetController extends BaseController { return meetService.queryPageList(bo, pageQuery); } + /** + * 查询未预约会议 + * @param bo + * @return + */ + @Operation + @GetMapping("/notlist") + public R> notlist(MeetBo bo) { + return R.ok(meetService.queryList(bo)); + } ///** // * 导出会议室管理列表 // */ diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingPayStatusEnum.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingPayStatusEnum.java new file mode 100644 index 0000000..0007e1e --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingPayStatusEnum.java @@ -0,0 +1,34 @@ +package org.dromara.property.domain.enums; + +/** + * @Author:yuyongle + * @Date:2025/7/4 17:58 + * @Description: + **/ +public enum BookingPayStatusEnum { + /** + * 待确认 + */ + ENAABLE("待支付", "0"), + /** + * 待提货 + */ + DEACTIVATE("已支付", "1"); + + + private final String name; + private final String value; + + BookingPayStatusEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return this.name; + } + + public String getValue() { + return this.value; + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingStatusEnum.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingStatusEnum.java new file mode 100644 index 0000000..d97a8f8 --- /dev/null +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/BookingStatusEnum.java @@ -0,0 +1,30 @@ +package org.dromara.property.domain.enums; + +/** + * @Author:yuyongle + * @Date:2025/7/5 14:13 + * @Description: + **/ +public enum BookingStatusEnum { + + READYTOSTART("待开始", "0"), + PENDINGREVIEW("待审核", "1"), + FINISHED("已结束", "1"); + + + private final String name; + private final String value; + + BookingStatusEnum(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return this.name; + } + + public String getValue() { + return this.value; + } +} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/PayStatusEnum.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/PayStatusEnum.java deleted file mode 100644 index 0b073c4..0000000 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/domain/enums/PayStatusEnum.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.dromara.property.domain.enums; - -/** - * @Author:yuyongle - * @Date:2025/7/4 17:58 - * @Description: - **/ -public enum PayStatusEnum { -} diff --git a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java index c0dd672..0c4aa14 100644 --- a/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java +++ b/ruoyi-modules/Property/src/main/java/org/dromara/property/service/impl/EnumFetcherServiceImpl.java @@ -1,6 +1,8 @@ package org.dromara.property.service.impl; import lombok.RequiredArgsConstructor; +import org.dromara.property.domain.enums.BookingPayStatusEnum; +import org.dromara.property.domain.enums.BookingStatusEnum; import org.dromara.property.domain.enums.MeetAttachStatusEnum; import org.dromara.property.domain.enums.MeetStatusEnum; import org.dromara.property.service.EnumFetcherService; @@ -41,10 +43,14 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { return meetAttachService.getMeetAttachSelectDate(type); case "getMeetAttachType": return meetAttachService.getMeetAttachSelectDate(type); - case "getMeetAttachStatus()": + case "getMeetAttachStatus": return getMeetAttachStatus(); - case "getMeetBookingPerson()": + case "getMeetBookingPerson": return meetBookingService.getMeetBooking(type); + case "getMeetBookingPayStatus": + return getMeetBookingPayStatus(); + case "getMeetBookingStatus": + return getMeetBookingStatus(); default: throw new IllegalArgumentException("Unknown type: " + type); } @@ -54,8 +60,19 @@ public class EnumFetcherServiceImpl implements EnumFetcherService { return java.util.Arrays.stream(MeetStatusEnum.values()) .collect(Collectors.toMap(MeetStatusEnum::getValue, MeetStatusEnum::getName)); } + + Map getMeetAttachStatus() { return java.util.Arrays.stream(MeetAttachStatusEnum.values()) .collect(Collectors.toMap(MeetAttachStatusEnum::getValue, MeetAttachStatusEnum::getName)); } + + Map getMeetBookingPayStatus() { + return java.util.Arrays.stream(BookingPayStatusEnum.values()) + .collect(Collectors.toMap(BookingPayStatusEnum::getValue, BookingPayStatusEnum::getName)); + } + MapgetMeetBookingStatus() { + return java.util.Arrays.stream(BookingStatusEnum.values()) + .collect(Collectors.toMap(BookingStatusEnum::getValue, BookingStatusEnum::getName)); + } }