Merge remote-tracking branch 'origin/main'

-修改预约记录导出表格的,消除了冗余字段

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<StaffOneStopRoomReservation> list = staffOneStopRoomReservationService.selectStaffOneStopRoomReservationList(staffOneStopRoomReservation);
+        List<StaffOneStopRoomReservation> list = staffOneStopRoomReservationService.selectStaffOneStopRoomReservationListExport(staffOneStopRoomReservation);
         ExcelUtil<StaffOneStopRoomReservation> util = new ExcelUtil<StaffOneStopRoomReservation>(StaffOneStopRoomReservation.class);
         util.exportExcel(response, list, "一站式社区-功能房-预约记录数据");
     }

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<StaffOneStopRoomReservation> staffOneStopRoomReservationList;
 
     /**
      * 功能房-开放时间
      */
     @ApiModelProperty(value = "功能房-开放时间", hidden = true)
-    @Excel(name = "功能房-开放时间")
+    //@Excel(name = "功能房-开放时间")
     private List<StaffOneStopRoomOpeningHours> staffOneStopRoomOpeningHoursList;
 }

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<StaffOneStopRoomOpeningHours> staffOneStopRoomOpeningHoursList;
 
     /**
      * 功能房-开放时间
      */
     @ApiModelProperty(value = "功能房", hidden = true)
-    @Excel(name = "功能房")
     private List<StaffOneStopRoom> 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; // 预约时间段起始

srs-staff/src/main/java/com/srs/staff/service/IStaffOneStopRoomReservationService.java

@@ -38,6 +38,14 @@ public interface IStaffOneStopRoomReservationService extends IService<StaffOneSt
      */
     List<StaffOneStopRoomReservation> selectStaffOneStopRoomReservationList(StaffOneStopRoomReservation staffOneStopRoomReservation);
 
+    /**
+     * 导出功能房预约记录列表
+     *
+     * @param staffOneStopRoomReservation 功能房预约记录
+     * @return 功能房预约记录列表
+     */
+    public List<StaffOneStopRoomReservation> selectStaffOneStopRoomReservationListExport(StaffOneStopRoomReservation staffOneStopRoomReservation);
+
     /**
      * 新增一站式社区-功能房-预约记录
      *

srs-staff/src/main/java/com/srs/staff/service/impl/StaffOneStopRoomReservationServiceImpl.java

@@ -105,6 +105,17 @@ public class StaffOneStopRoomReservationServiceImpl extends ServiceImpl<StaffOne
      */
     @Override
     public List<StaffOneStopRoomReservation> selectStaffOneStopRoomReservationList(StaffOneStopRoomReservation staffOneStopRoomReservation) {
+        return staffOneStopRoomReservationMapper.selectStaffOneStopRoomReservationList(staffOneStopRoomReservation);
+    }
+
+    /**
+     * 查询一站式社区-功能房-预约记录列表(用于导出)
+     *
+     * @param staffOneStopRoomReservation 一站式社区-功能房-预约记录
+     * @return 一站式社区-功能房-预约记录
+     */
+    @Override
+    public List<StaffOneStopRoomReservation> selectStaffOneStopRoomReservationListExport(StaffOneStopRoomReservation staffOneStopRoomReservation) {
         List<StaffOneStopRoomReservation> list = staffOneStopRoomReservationMapper.selectStaffOneStopRoomReservationList(staffOneStopRoomReservation);
         
         // 查询所有学年数据用于匹配
@@ -116,13 +127,25 @@ public class StaffOneStopRoomReservationServiceImpl extends ServiceImpl<StaffOne
                 String yearName = determineSchoolYearByTime(reservation.getRtTime(), allYears);
                 reservation.setYearName(yearName);
             }
+            
+            // 根据功能房编码获取功能房信息并填充到预约记录中
+            if (reservation.getRoomNo() != null) {
+                StaffOneStopRoom room = staffOneStopRoomMapper.selectStaffOneStopRoomByRoomNo(reservation.getRoomNo());
+                if (room != null) {
+                    reservation.setRoomCapacity(room.getRoomCapacity());//功能房容量
+                    reservation.setRoomMatter(room.getRoomMatter());
+                    reservation.setRoomRule(room.getRoomRule());
+                    reservation.setRoomInfo(room.getRoomInfo());
+                    reservation.setRoomPurp(room.getRoomPurp());
+                    reservation.setRoomImgs(room.getRoomImgs());
+                }
+            }
         }
         return list;
     }
     
     /**
      * 根据预约时间确定所属学年
-     * 
      * @param rtTime 预约时间
      * @param allYears 所有学年数据
      * @return 学年名称