From 22480fdd717b34a168a4b821327cc57df14dd899 Mon Sep 17 00:00:00 2001 From: weishengyou <2454197255@qq.com> Date: Tue, 30 Dec 2025 18:02:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=B7=A5=E7=B3=BB=E7=BB=9F=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E6=88=BF=E5=8A=9F=E8=83=BD=E6=A8=A1=E5=9D=97=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9=20-=E4=BF=AE=E6=94=B9=E9=A2=84?= =?UTF-8?q?=E7=BA=A6=E8=AE=B0=E5=BD=95=E5=AF=BC=E5=87=BA=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E7=9A=84,=E6=B6=88=E9=99=A4=E4=BA=86=E5=86=97=E4=BD=99?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...StaffOneStopRoomReservationController.java | 2 +- .../srs/staff/domain/StaffOneStopRoom.java | 8 +-- .../domain/StaffOneStopRoomReservation.java | 69 ++++++++++++++++--- .../IStaffOneStopRoomReservationService.java | 8 +++ ...taffOneStopRoomReservationServiceImpl.java | 25 ++++++- 5 files changed, 95 insertions(+), 17 deletions(-) diff --git a/srs-admin/src/main/java/com/srs/web/controller/staff/StaffOneStopRoomReservationController.java b/srs-admin/src/main/java/com/srs/web/controller/staff/StaffOneStopRoomReservationController.java index df007f2..b06085c 100644 --- a/srs-admin/src/main/java/com/srs/web/controller/staff/StaffOneStopRoomReservationController.java +++ b/srs-admin/src/main/java/com/srs/web/controller/staff/StaffOneStopRoomReservationController.java @@ -65,7 +65,7 @@ public class StaffOneStopRoomReservationController extends BaseController { @PostMapping("/export") @ApiOperation("导出一站式社区-功能房-预约记录列表") public void export(HttpServletResponse response, StaffOneStopRoomReservation staffOneStopRoomReservation) { - List list = staffOneStopRoomReservationService.selectStaffOneStopRoomReservationList(staffOneStopRoomReservation); + List list = staffOneStopRoomReservationService.selectStaffOneStopRoomReservationListExport(staffOneStopRoomReservation); ExcelUtil util = new ExcelUtil(StaffOneStopRoomReservation.class); util.exportExcel(response, list, "一站式社区-功能房-预约记录数据"); } diff --git a/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoom.java b/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoom.java index db93133..87f55ba 100644 --- a/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoom.java +++ b/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoom.java @@ -40,7 +40,7 @@ public class StaffOneStopRoom extends BaseEntity { */ @ApiModelProperty("功能房编码") @TableField("room_no") - @Excel(name = "功能房编码") + //@Excel(name = "功能房编码") private String roomNo; /** @@ -146,20 +146,20 @@ public class StaffOneStopRoom extends BaseEntity { */ @ApiModelProperty("功能房图片") @TableField("room_imgs") - @Excel(name = "功能房图片") + //@Excel(name = "功能房图片") private String roomImgs; /** * 功能房-预约记录 */ @ApiModelProperty(value = "功能房-预约记录", hidden = true) - @Excel(name = "功能房-预约记录") + //@Excel(name = "功能房-预约记录") private List staffOneStopRoomReservationList; /** * 功能房-开放时间 */ @ApiModelProperty(value = "功能房-开放时间", hidden = true) - @Excel(name = "功能房-开放时间") + //@Excel(name = "功能房-开放时间") private List staffOneStopRoomOpeningHoursList; } diff --git a/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoomReservation.java b/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoomReservation.java index effdfeb..6c07d11 100644 --- a/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoomReservation.java +++ b/srs-staff/src/main/java/com/srs/staff/domain/StaffOneStopRoomReservation.java @@ -42,7 +42,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("功能房开放时间编码") @TableField("rt_no") - @Excel(name = "功能房开放时间编码") + //@Excel(name = "功能房开放时间编码") private String rtNo; /** @@ -50,7 +50,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("功能房编码") @TableField("room_no") - @Excel(name = "功能房编码") + //@Excel(name = "功能房编码") private String roomNo; /** @@ -97,7 +97,7 @@ private static final long serialVersionUID=1L; * 借用学期 */ @ApiModelProperty("借用学期") - @Excel(name = "借用学期") + @Excel(name = "借用学年") private String yearName; /** @@ -121,15 +121,15 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("使用状态0未使用 1使用中 2使用结束") @TableField("rt_state") - @Excel(name = "使用状态0未使用") + //@Excel(name = "使用状态") private Integer rtState; /** * 试用期间图片 */ - @ApiModelProperty("试用期间图片") + @ApiModelProperty("使用期间图片") @TableField("rt_imgs") - @Excel(name = "试用期间图片") + //@Excel(name = "使用期间图片") private String rtImgs; /** @@ -138,7 +138,7 @@ private static final long serialVersionUID=1L; @ApiModelProperty("创建时间") @TableField("rt_creat_time") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") + //@Excel(name = "创建时间" , width = 30, dateFormat = "yyyy-MM-dd") private Date rtCreatTime; /** @@ -147,7 +147,7 @@ private static final long serialVersionUID=1L; @ApiModelProperty("修改时间") @TableField("rt_up_time") @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "修改时间" , width = 30, dateFormat = "yyyy-MM-dd") + //@Excel(name = "修改时间" , width = 30, dateFormat = "yyyy-MM-dd") private Date rtUpTime; /** @@ -171,7 +171,7 @@ private static final long serialVersionUID=1L; */ @ApiModelProperty("审核状态 0待审核 1同意 2不同意") @TableField("audit_status") - @Excel(name = "审核状态") + @Excel(name = "审核状态",dictType = "rt_fu_audit_au_status") private Long auditStatus; @@ -205,16 +205,63 @@ private static final long serialVersionUID=1L; * 功能房-开放时间 */ @ApiModelProperty(value = "功能房-开放时间", hidden = true) - @Excel(name = "功能房-开放时间") + //@Excel(name = "功能房-开放时间") private List staffOneStopRoomOpeningHoursList; /** * 功能房-开放时间 */ @ApiModelProperty(value = "功能房", hidden = true) - @Excel(name = "功能房") private List staffOneStopRoom; + // 添加StaffOneStopRoom相关字段用于导出 + /** + * 功能房可承载人数 + */ + @ApiModelProperty("功能房可承载人数") + @TableField(exist = false) + @Excel(name = "功能房可承载人数") + private String roomCapacity; + + /** + * 使用事项 + */ + @ApiModelProperty("使用事项") + @TableField("room_matter") + @Excel(name = "使用事项") + private String roomMatter; + + /** + * 功能房预约规则 + */ + @ApiModelProperty("功能房预约规则") + @TableField(exist = false) + @Excel(name = "功能房预约规则") + private String roomRule; + + /** + * 功能房介绍 + */ + @ApiModelProperty("功能房介绍") + @TableField(exist = false) + @Excel(name = "功能房介绍") + private String roomInfo; + + /** + * 功能房用途 + */ + @ApiModelProperty("功能房用途") + @TableField(exist = false) + @Excel(name = "功能房用途") + private String roomPurp; + + /** + * 功能房图片 + */ + @ApiModelProperty("功能房图片") + @TableField(exist = false) + private String roomImgs; + // 时间范围查询 @TableField(exist = false) private String rtTimeStart; // 预约时间段起始 diff --git a/srs-staff/src/main/java/com/srs/staff/service/IStaffOneStopRoomReservationService.java b/srs-staff/src/main/java/com/srs/staff/service/IStaffOneStopRoomReservationService.java index 2dd9e71..6050c78 100644 --- a/srs-staff/src/main/java/com/srs/staff/service/IStaffOneStopRoomReservationService.java +++ b/srs-staff/src/main/java/com/srs/staff/service/IStaffOneStopRoomReservationService.java @@ -38,6 +38,14 @@ public interface IStaffOneStopRoomReservationService extends IService selectStaffOneStopRoomReservationList(StaffOneStopRoomReservation staffOneStopRoomReservation); + /** + * 导出功能房预约记录列表 + * + * @param staffOneStopRoomReservation 功能房预约记录 + * @return 功能房预约记录列表 + */ + public List selectStaffOneStopRoomReservationListExport(StaffOneStopRoomReservation staffOneStopRoomReservation); + /** * 新增一站式社区-功能房-预约记录 * diff --git a/srs-staff/src/main/java/com/srs/staff/service/impl/StaffOneStopRoomReservationServiceImpl.java b/srs-staff/src/main/java/com/srs/staff/service/impl/StaffOneStopRoomReservationServiceImpl.java index 36d3144..9833db8 100644 --- a/srs-staff/src/main/java/com/srs/staff/service/impl/StaffOneStopRoomReservationServiceImpl.java +++ b/srs-staff/src/main/java/com/srs/staff/service/impl/StaffOneStopRoomReservationServiceImpl.java @@ -105,6 +105,17 @@ public class StaffOneStopRoomReservationServiceImpl extends ServiceImpl selectStaffOneStopRoomReservationList(StaffOneStopRoomReservation staffOneStopRoomReservation) { + return staffOneStopRoomReservationMapper.selectStaffOneStopRoomReservationList(staffOneStopRoomReservation); + } + + /** + * 查询一站式社区-功能房-预约记录列表(用于导出) + * + * @param staffOneStopRoomReservation 一站式社区-功能房-预约记录 + * @return 一站式社区-功能房-预约记录 + */ + @Override + public List selectStaffOneStopRoomReservationListExport(StaffOneStopRoomReservation staffOneStopRoomReservation) { List list = staffOneStopRoomReservationMapper.selectStaffOneStopRoomReservationList(staffOneStopRoomReservation); // 查询所有学年数据用于匹配 @@ -116,13 +127,25 @@ public class StaffOneStopRoomReservationServiceImpl extends ServiceImpl