From 5bf98bb248c057a4178fce83106d5edc132b9976 Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Fri, 4 Oct 2024 16:39:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=9A=E8=AE=AE=E5=AE=A4=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E5=AE=B9=E7=BA=B3=E4=BA=BA=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ics/admin/domain/MeetingRoom.java    | 15 +++++++++++++++
 .../resources/mapper/admin/MeetingRoomMapper.xml  |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingRoom.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingRoom.java
index a9d04c4..e3b48ef 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingRoom.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingRoom.java
@@ -2,6 +2,7 @@ package com.ics.admin.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.ics.common.core.domain.BaseEntity;
 import lombok.Data;
 
@@ -75,6 +76,20 @@ public class MeetingRoom extends BaseEntity<MeetingRoom> {
     @TableField(exist = false)
     private Integer status;
 
+    /**
+     * 容纳人数 下限
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @TableField(exist = false)
+    private Integer min;
+
+    /**
+     * 容纳人数 上限
+     */
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY)
+    @TableField(exist = false)
+    private Integer max;
+
     /**
      * 扩展1
      */
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingRoomMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingRoomMapper.xml
index 80ae815..0e0f8c6 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingRoomMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingRoomMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="name != null  and name != ''"> AND name LIKE CONCAT('%', #{name}, '%')</if>
             <if test="typeName != null  and typeName != ''"> AND type_name = #{typeName}</if>
             <if test="device != null  and device != ''"> AND device LIKE CONCAT('%', #{device}, '%')</if>
-            <if test="capacityNum != null"> AND capacity_num = #{capacityNum}</if>
+            <if test="min != null and max !=null"> and capacity_num &gt;= #{min} AND capacity_num &lt;= #{max}</if>
         </where>
         order by id
     </select>