fix 团队预约不校验人数，校验团队数

ruoyi-admin/src/main/java/com/ruoyi/web/controller/reservat/BomanReservatController.java

@@ -76,7 +76,7 @@ public class BomanReservatController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody BomanReservat bomanReservat) {
         int i = bomanReservatService.insertBomanReservat(bomanReservat);
-        return i > 0 ? AjaxResult.success(i) : AjaxResult.error("超过最大可预约人数或接待人员已满,请重新选择");
+        return i > 0 ? AjaxResult.success(i) : AjaxResult.error("超过最大可预约人数/团队或接待人员已满,请重新选择");
     }
 
     /**

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -149,6 +149,10 @@ public class Constants
      * 日期+对应时段id的预约人数
      */
     public static final String RESERVAT_NUM = "reservat_num:";
+    /**
+     * 日期+对应时段id的预约团队数
+     */
+    public static final String RESERVAT_TEAM = "reservat_team:";
     /**
      * 日期+对应时段id的接待人员已满的key value = N/Y
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/BomanReservatConfigTime.java

@@ -34,9 +34,13 @@ public class BomanReservatConfigTime extends BaseEntity
     @Excel(name = "可预约时间结束", width = 30, dateFormat = "HH:mm:ss")
     private Date reservatConfigTimeEnd;
 
-    /** 可预约次数 */
+    /** 可预约人次数 */
     @Excel(name = "可预约次数")
     private Long reservatConfigNum;
+    /**
+     * 可预约团队数
+     */
+    private Long reservatConfigTeam;
 
     /** 1: AM 2: PM */
     @Excel(name = "1: AM 2: PM")
@@ -52,6 +56,14 @@ public class BomanReservatConfigTime extends BaseEntity
     @Excel(name = "创建部门")
     private Long createDept;
 
+    public Long getReservatConfigTeam() {
+        return reservatConfigTeam;
+    }
+
+    public void setReservatConfigTeam(Long reservatConfigTeam) {
+        this.reservatConfigTeam = reservatConfigTeam;
+    }
+
     public String getReceptionPersonnelType() {
         return receptionPersonnelType;
     }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanReservatConfigTimeServiceImpl.java

@@ -136,6 +136,7 @@ public class BomanReservatConfigTimeServiceImpl implements IBomanReservatConfigT
                                 index++;
                             }
                         }
+
                         bomanReservatConfigTime.setReceptionPersonnelType("N");
                         //去查询该时间段接待人员是否已满
                         Object cacheObject = redisCache.getCacheObject(Constants.RESERVAT_PERSONNEL_NUM + dateMonth + "_" + reservatConfigTime.getReservatConfigTimeId());

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BomanReservatServiceImpl.java

@@ -86,6 +86,7 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
 
     /**
      * 新增陵园预约
+     * 每个时段只能预约一个团队，不校验团队人数
      *
      * @param bomanReservat 陵园预约
      * @return 结果
@@ -95,32 +96,51 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         Long reservatConfigTimeId = bomanReservat.getReservatConfigTimeId();
         //查询可预约人数
         BomanReservatConfigTime bomanReservatConfigTime = bomanReservatConfigTimeMapper.selectBomanReservatConfigTimeByReservatConfigTimeId(reservatConfigTimeId);
+        bomanReservat.setCreateTime(DateUtils.getNowDate());
+        String reservatType = bomanReservat.getReservatType();
         //组装key
         //去redis找对应日期,对应时段id的预约数量 reservat_num:2023-10-10_1
         String key = Constants.RESERVAT_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
-        //已经预约人数
-        Object reservatNum = redisCache.getCacheObject(key);
+        String keyTeam = Constants.RESERVAT_TEAM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
         //最新预约人数
-        long numNew = Long.parseLong(bomanReservat.getVisitNum());
-        if (ObjectUtils.isNotEmpty(reservatNum)) {
-            //最新预约人数 = 已经预约人数 + 新增预约人数
-            numNew = (long) reservatNum + numNew;
-        }
-        //是否超过最大可预约人数
-        //判断已预约人数+新增预约人数=是否大于可预约人数
-        //如果 x==y 返回0；x<y 返回负数(-1)；x>y 返回正数(1)
-        if (NumberUtils.compare(bomanReservatConfigTime.getReservatConfigNum(), numNew) < 0) {
-            return 0;
-        }
-
-
-        bomanReservat.setCreateTime(DateUtils.getNowDate());
-        String reservatType = bomanReservat.getReservatType();
+        long numNew = 0L;
+        //最新预约团队数
+        long teamNew = 1L;
         if ("2".equals(reservatType)) {
+            //已经预约人数
+            Object reservatNum = redisCache.getCacheObject(key);
+            //最新预约人数
+            numNew = Long.parseLong(bomanReservat.getVisitNum());
+            if (ObjectUtils.isNotEmpty(reservatNum)) {
+                //最新预约人数 = 已经预约人数 + 新增预约人数
+                numNew = (long) reservatNum + numNew;
+            }
+            //是否超过最大可预约人数
+            //判断已预约人数+新增预约人数=是否大于可预约人数
+            //如果 x==y 返回0；x<y 返回负数(-1)；x>y 返回正数(1)
+            if (NumberUtils.compare(bomanReservatConfigTime.getReservatConfigNum(), numNew) < 0) {
+                return 0;
+            }
             bomanReservat.setVisitType("3");
         } else {
+            //如果是团队判断当前时段可接待的最大团队数
+            Long reservatConfigTeam = bomanReservatConfigTime.getReservatConfigTeam();
+            //查询当前时段预约了多少个团队
+            keyTeam = Constants.RESERVAT_TEAM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
+            //已经预约团队数
+            Object reservatTeam = redisCache.getCacheObject(keyTeam);
+            if (ObjectUtils.isNotEmpty(reservatTeam)) {
+                //最新预约团队数 = 已经预约团队数 + 新增预约团队数
+                teamNew = (long) reservatTeam + teamNew;
+            }
+            //是否超过最大可预约团队数
+            //判断已预约团队数+新增预约团队数=是否大于可预约团队数
+            //如果 x==y 返回0；x<y 返回负数(-1)；x>y 返回正数(1)
+            if (NumberUtils.compare(reservatConfigTeam, teamNew) < 0) {
+                return 0;
+            }
             //如果是团队,判断是否需要接待
-            if ("Y".equals(bomanReservat.getIsReception())){
+            if ("Y".equals(bomanReservat.getIsReception())) {
                 BomanReservat br = new BomanReservat();
                 br.setReservatConfigTimeId(bomanReservat.getReservatConfigTimeId());
                 br.setVisitType("3");
@@ -129,14 +149,14 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
                 List<BomanReservat> bomanReservats = bomanReservatMapper.selectBomanReservatList(br);
                 //再去查询接待人员数量
                 int num = receptionPersonnelMapper.selectReceptionPersonnelCount();
-                if (bomanReservats != null){
-                    if (bomanReservats.size() >= num ){
+                if (bomanReservats != null) {
+                    if (bomanReservats.size() >= num) {
                         return 0;
                     }
-                    if (bomanReservats.size() + 1 == num){
+                    if (bomanReservats.size() + 1 == num) {
                         //插入redis该时段接待人员已满
                         String keyPersonnel = Constants.RESERVAT_PERSONNEL_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
-                        redisCache.setCacheObject(keyPersonnel,"Y",24, TimeUnit.HOURS);
+                        redisCache.setCacheObject(keyPersonnel, "Y", 24, TimeUnit.HOURS);
                     }
                 }
             }
@@ -149,7 +169,7 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
                 //团队预约,给管理员发送短信
                 //陵园预约通知 = SMS_464376020
                 SendSmsUtils.sendSms(phonenumber, "SMS_464376020", null);
-                System.out.println("给(" + phonenumber + ")陵园管理员发送了("+bomanReservat.getVisitPhone()+")申请预约的短信");
+                System.out.println("给(" + phonenumber + ")陵园管理员发送了(" + bomanReservat.getVisitPhone() + ")申请预约的短信");
             }
 
         }
@@ -158,7 +178,8 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
             i = Math.toIntExact(bomanReservat.getReservatId());
         }
         //新增预约往redis中存放数据
-        redisCache.setCacheObject(key, numNew,24, TimeUnit.HOURS);
+        redisCache.setCacheObject(key, numNew, 24, TimeUnit.HOURS);
+        redisCache.setCacheObject(keyTeam, teamNew, 24, TimeUnit.HOURS);
         return i;
     }
 
@@ -171,14 +192,14 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
     @Override
     public AjaxResult updateBomanReservat(BomanReservat bomanReservat) {
         //判断该接待人员当前时段是否已经被选择过, 需要传入预约时段id
-        if (bomanReservat.getReceptionId() != null){
+        if (bomanReservat.getReceptionId() != null) {
             List<BomanReservat> bomanReservats = bomanReservatMapper.selectBomanReservatList(bomanReservat);
-            if (bomanReservats != null && bomanReservats.size() > 0){
+            if (bomanReservats != null && bomanReservats.size() > 0) {
                 return AjaxResult.error("当前讲解员已被选择");
             }
         }
         bomanReservat.setUpdateTime(DateUtils.getNowDate());
-        return bomanReservatMapper.updateBomanReservat(bomanReservat)> 0 ? AjaxResult.success() : AjaxResult.error("预约人数已满");
+        return bomanReservatMapper.updateBomanReservat(bomanReservat) > 0 ? AjaxResult.success() : AjaxResult.error("预约已满");
     }
 
     /**
@@ -193,21 +214,36 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         for (Long reservatId : reservatIds) {
             BomanReservat bomanReservat = bomanReservatMapper.selectBomanReservatByReservatId(reservatId);
             Long reservatConfigTimeId = bomanReservat.getReservatConfigTimeId();
-            String visitNum = bomanReservat.getVisitNum();
-            //去redis找对应日期,对应时段id的预约数量 reservat_num:2023-10-10_1
-            String key = Constants.RESERVAT_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
-            Object reservatNum = redisCache.getCacheObject(key);
-            if (ObjectUtils.isNotEmpty(reservatNum)) {
-                long reservatNumNew = (long) reservatNum - Long.parseLong(visitNum);
-                if (reservatNumNew < 0) {
-                    reservatNumNew = 0;
+            String reservatType = bomanReservat.getReservatType();
+            if ("1".equals(reservatType)) {
+                //判断是团队需要释放名额
+                String key = Constants.RESERVAT_TEAM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
+                Object reservatTeam = redisCache.getCacheObject(key);
+                if (ObjectUtils.isNotEmpty(reservatTeam)) {
+                    long reservatTeamNew = (long) reservatTeam - 1;
+                    if (reservatTeamNew < 0) {
+                        reservatTeamNew = 0;
+                    }
+                    redisCache.setCacheObject(key, reservatTeamNew, 24, TimeUnit.HOURS);
+                }
+                //判断是不是团队需要接待的续约
+                if ("Y".equals(bomanReservat.getIsReception())) {
+                    String keyPersonnel = Constants.RESERVAT_PERSONNEL_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
+                    redisCache.deleteObject(keyPersonnel);
+                }
+            } else {
+                //散客
+                String visitNum = bomanReservat.getVisitNum();
+                //去redis找对应日期,对应时段id的预约数量 reservat_num:2023-10-10_1
+                String key = Constants.RESERVAT_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
+                Object reservatNum = redisCache.getCacheObject(key);
+                if (ObjectUtils.isNotEmpty(reservatNum)) {
+                    long reservatNumNew = (long) reservatNum - Long.parseLong(visitNum);
+                    if (reservatNumNew < 0) {
+                        reservatNumNew = 0;
+                    }
+                    redisCache.setCacheObject(key, reservatNumNew, 24, TimeUnit.HOURS);
                 }
-                redisCache.setCacheObject(key, reservatNumNew,24, TimeUnit.HOURS);
-            }
-            //判断是不是团队需要接待的续约
-            if ("1".equals(bomanReservat.getReservatType()) && "Y".equals(bomanReservat.getIsReception())){
-                String keyPersonnel = Constants.RESERVAT_PERSONNEL_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
-                redisCache.deleteObject(keyPersonnel);
             }
         }
         return bomanReservatMapper.deleteBomanReservatByReservatIds(reservatIds);
@@ -224,6 +260,9 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         return bomanReservatMapper.deleteBomanReservatByReservatId(reservatId);
     }
 
+    /**
+     * 陵园预约审核
+     */
     @Override
     public AjaxResult examine(BomanReservat bomanReservat) {
 
@@ -241,9 +280,17 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
             String key = Constants.RESERVAT_NUM + reservat.getVisitDate() + "_" + reservatConfigTimeId;
             Object numString = redisCache.getCacheObject(key);
             long num = (long) numString - Long.parseLong(visitNum);
-            redisCache.setCacheObject(key, num < 0 ? 0 : num,24, TimeUnit.HOURS);
+            redisCache.setCacheObject(key, num < 0 ? 0 : num, 24, TimeUnit.HOURS);
             String keyPersonnel = Constants.RESERVAT_PERSONNEL_NUM + reservat.getVisitDate() + "_" + reservatConfigTimeId;
             redisCache.deleteObject(keyPersonnel);
+            //如果是团队，释放团队名额
+            if ("1".equals(reservat.getReservatType())) {
+                //去redis找对应日期,对应时段id的预约团队数量 reservat_num:2023-10-10_1
+                String keyTeam = Constants.RESERVAT_TEAM + reservat.getVisitDate() + "_" + reservatConfigTimeId;
+                Object teamString = redisCache.getCacheObject(keyTeam);
+                long teamNum = (long) teamString - 1L;
+                redisCache.setCacheObject(keyTeam, teamNum < 0 ? 0 : teamNum, 24, TimeUnit.HOURS);
+            }
         }
         bomanReservat.setUpdateTime(DateUtils.getNowDate());
         int i = bomanReservatMapper.updateBomanReservat(bomanReservat);
@@ -260,6 +307,7 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         }
         return i > 0 ? AjaxResult.success() : AjaxResult.error();
     }
+
     /**
      * 预约首页统计
      *
@@ -269,20 +317,20 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
     @Override
     public AjaxResult indexStatistics(BomanReservat bomanReservat) {
         Map<String, Object> map = new HashMap<>(4);
-        map.put("canGuan" , 0);
-        map.put("yuYue" , 0);
-        map.put("todayYuYue" , 0);
-        map.put("todayCanGuan" , 0);
+        map.put("canGuan", 0);
+        map.put("yuYue", 0);
+        map.put("todayYuYue", 0);
+        map.put("todayCanGuan", 0);
         List<BomanReservat> bomanReservats = bomanReservatMapper.selectBomanReservatList(bomanReservat);
         if (bomanReservats != null && bomanReservats.size() > 0) {
             //来访数
             long canGuan = bomanReservats.stream().filter(s -> "2".equals(s.getVisitStatus())).count();
             long todayYuYue = bomanReservats.stream().filter(s -> DateUtils.getDate().equals(s.getVisitDate())).count();
             long todayCanGuan = bomanReservats.stream().filter(s -> DateUtils.getDate().equals(s.getVisitDate())).filter(s -> "2".equals(s.getVisitStatus())).count();
-            map.put("canGuan" , canGuan);
-            map.put("yuYue" , bomanReservats.size());
-            map.put("todayYuYue" , todayYuYue);
-            map.put("todayCanGuan" , todayCanGuan);
+            map.put("canGuan", canGuan);
+            map.put("yuYue", bomanReservats.size());
+            map.put("todayYuYue", todayYuYue);
+            map.put("todayCanGuan", todayCanGuan);
         }
         return AjaxResult.success(map);
     }
@@ -290,7 +338,7 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
     @Override
     public AjaxResult verification(Long reservatId) {
         BomanReservat reservat = bomanReservatMapper.selectBomanReservatByReservatId(reservatId);
-        if (!"3".equals(reservat.getVisitType())){
+        if (!"3".equals(reservat.getVisitType())) {
             return AjaxResult.error("当前预约未通过,禁止核销");
         }
         if ("2".equals(reservat.getVisitStatus())) {
@@ -299,10 +347,10 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         //判断时间是否一致 日期和时段
         String visitDate = reservat.getVisitDate();
         String visitTime = reservat.getVisitTime();
-        if (StringUtils.isNotBlank(visitDate) && !visitDate.equals(DateUtils.getDate())){
+        if (StringUtils.isNotBlank(visitDate) && !visitDate.equals(DateUtils.getDate())) {
             return AjaxResult.error("来访日期有误，请查看预约日期。");
         }
-        if (StringUtils.isNotBlank(visitTime)){
+        if (StringUtils.isNotBlank(visitTime)) {
             String[] s = visitTime.split("-");
             SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
             try {
@@ -322,13 +370,14 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
 
     /**
      * 管理员核销
+     *
      * @param reservatId
      * @return
      */
     @Override
     public AjaxResult verificationManage(Long reservatId) {
         BomanReservat reservat = bomanReservatMapper.selectBomanReservatByReservatId(reservatId);
-        if (!"3".equals(reservat.getVisitType())){
+        if (!"3".equals(reservat.getVisitType())) {
             return AjaxResult.error("当前预约未通过,禁止核销");
         }
         if ("2".equals(reservat.getVisitStatus())) {
@@ -336,7 +385,7 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         }
         //判断时间是否一致 日期和时段
         String visitDate = reservat.getVisitDate();
-        if (StringUtils.isNotBlank(visitDate) && DateUtils.sameDayCompareD(DateUtils.parseDate(visitDate),DateUtils.getNowDate()) ){
+        if (StringUtils.isNotBlank(visitDate) && DateUtils.sameDayCompareD(DateUtils.parseDate(visitDate), DateUtils.getNowDate())) {
             return AjaxResult.error("核销时间必须大于等于预约日期。");
         }
         BomanReservat bomanReservat = new BomanReservat();
@@ -357,36 +406,36 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         String configKey_1 = "lyssllsj_1";
         String configValue = Convert.toStr(redisCache.getCacheObject(configKey));
         String configValue_1 = Convert.toStr(redisCache.getCacheObject(configKey_1));
-        if(StringUtils.isEmpty(configValue) || "0".equals(configValue)){
+        if (StringUtils.isEmpty(configValue) || "0".equals(configValue)) {
             configValue = "0";
         }
-        if(StringUtils.isEmpty(configValue_1) || "0".equals(configValue_1)){
+        if (StringUtils.isEmpty(configValue_1) || "0".equals(configValue_1)) {
             configValue_1 = "0";
         }
 
 
         Map<String, Object> resultMap = new HashMap<>();
-        resultMap.put("scale" , "0%");
+        resultMap.put("scale", "0%");
 
-        if(!"0".equals(configValue) && !"0".equals(configValue_1)){
+        if (!"0".equals(configValue) && !"0".equals(configValue_1)) {
             BigDecimal num1 = new BigDecimal(configValue);
             BigDecimal num2 = new BigDecimal(configValue_1);
             BigDecimal subNum1 = num1.subtract(num2);
-            double result = Double.parseDouble(((subNum1.divide(num2,2,BigDecimal.ROUND_HALF_UP))).toString());
-            if(result<0){
+            double result = Double.parseDouble(((subNum1.divide(num2, 2, BigDecimal.ROUND_HALF_UP))).toString());
+            if (result < 0) {
                 result = result * -1;
             }
             DecimalFormat decimalFormat = new DecimalFormat("0%"); // 创建DecimalFormat对象并设置格式化模式为"0%"
             String percentage = decimalFormat.format((result)); // 使用DecimalFormat对象进行格式化操作
-            resultMap.put("scale" , percentage);
+            resultMap.put("scale", percentage);
         }
 
         //今天比昨天新增多少人
-        resultMap.put("addNum" , Long.parseLong(configValue)-Long.parseLong(configValue_1));
+        resultMap.put("addNum", Long.parseLong(configValue) - Long.parseLong(configValue_1));
         //昨天人数
-        resultMap.put("current" , configValue_1);
+        resultMap.put("current", configValue_1);
         //今天人数
-        resultMap.put("total" , configValue);
+        resultMap.put("total", configValue);
         return AjaxResult.success(resultMap);
     }
 
@@ -406,24 +455,24 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         long todayYy = 0;
         for (BomanReservat bomanReservat : bomanReservatYearList) {
             yearYy = yearYy + Long.parseLong(bomanReservat.getVisitNum());
-            if(bomanReservat.getVisitDate().contains(time.substring(0,time.lastIndexOf("-")))){
+            if (bomanReservat.getVisitDate().contains(time.substring(0, time.lastIndexOf("-")))) {
                 monthYy = monthYy + Long.parseLong(bomanReservat.getVisitNum());
             }
             if (bomanReservat.getVisitDate().equals(time)) {
                 todayYy = todayYy + Long.parseLong(bomanReservat.getVisitNum());
             }
         }
-        map.put("yearYy" , yearYy);
-        map.put("monthYy" , monthYy);
-        map.put("todayYy" , todayYy);
+        map.put("yearYy", yearYy);
+        map.put("monthYy", monthYy);
+        map.put("todayYy", todayYy);
         //todo 今日参观人数
 
         String configKey = "lyssllsj";
         String configValue = Convert.toStr(redisCache.getCacheObject(configKey));
-        if(StringUtils.isEmpty(configValue) || "0".equals(configValue)){
+        if (StringUtils.isEmpty(configValue) || "0".equals(configValue)) {
             configValue = "0";
         }
-        map.put("todayVisit" , configValue);
+        map.put("todayVisit", configValue);
 
         Map<String, Object> sevenMap = new HashMap<>();
         //获取近7天的数组
@@ -458,12 +507,12 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
             td = 0L;
         }
 
-        sevenMap.put("date" , sevenDate);
-        sevenMap.put("zrs" , zrsList);
-        sevenMap.put("sk" , skList);
-        sevenMap.put("td" , tdList);
+        sevenMap.put("date", sevenDate);
+        sevenMap.put("zrs", zrsList);
+        sevenMap.put("sk", skList);
+        sevenMap.put("td", tdList);
 
-        map.put("sevenMap" , sevenMap);
+        map.put("sevenMap", sevenMap);
         return AjaxResult.success(map);
     }
 

ruoyi-system/src/main/resources/mapper/system/BomanReservatConfigTimeMapper.xml

@@ -10,6 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="reservatConfigTimeBegin"    column="reservat_config_time_begin"    />
         <result property="reservatConfigTimeEnd"    column="reservat_config_time_end"    />
         <result property="reservatConfigNum"    column="reservat_config_num"    />
+        <result property="reservatConfigTeam"    column="reservat_config_team"    />
         <result property="reservatConfigType"    column="reservat_config_type"    />
         <result property="reservatConfigStatus"    column="reservat_config_status"    />
         <result property="createDept"    column="create_dept"    />
@@ -21,7 +22,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBomanReservatConfigTimeVo">
-        select reservat_config_time_id, reservat_config_date, reservat_config_time_begin, reservat_config_time_end, reservat_config_num, reservat_config_type, reservat_config_status, create_dept, create_by, create_time, update_by, update_time, remark from boman_reservat_config_time
+        select reservat_config_time_id, reservat_config_date, reservat_config_time_begin, reservat_config_time_end, reservat_config_num,reservat_config_team, reservat_config_type, reservat_config_status, create_dept, create_by, create_time, update_by, update_time, remark from boman_reservat_config_time
     </sql>
 
     <select id="selectBomanReservatConfigTimeList" parameterType="BomanReservatConfigTime" resultMap="BomanReservatConfigTimeResult">
@@ -49,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatConfigTimeBegin != null">reservat_config_time_begin,</if>
             <if test="reservatConfigTimeEnd != null">reservat_config_time_end,</if>
             <if test="reservatConfigNum != null">reservat_config_num,</if>
+            <if test="reservatConfigTeam != null">reservat_config_team,</if>
             <if test="reservatConfigType != null">reservat_config_type,</if>
             <if test="reservatConfigStatus != null">reservat_config_status,</if>
             <if test="createDept != null">create_dept,</if>
@@ -64,6 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatConfigTimeBegin != null">#{reservatConfigTimeBegin},</if>
             <if test="reservatConfigTimeEnd != null">#{reservatConfigTimeEnd},</if>
             <if test="reservatConfigNum != null">#{reservatConfigNum},</if>
+            <if test="reservatConfigTeam != null">#{reservatConfigTeam},</if>
             <if test="reservatConfigType != null">#{reservatConfigType},</if>
             <if test="reservatConfigStatus != null">#{reservatConfigStatus},</if>
             <if test="createDept != null">#{createDept},</if>
@@ -82,6 +85,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="reservatConfigTimeBegin != null">reservat_config_time_begin = #{reservatConfigTimeBegin},</if>
             <if test="reservatConfigTimeEnd != null">reservat_config_time_end = #{reservatConfigTimeEnd},</if>
             <if test="reservatConfigNum != null">reservat_config_num = #{reservatConfigNum},</if>
+            <if test="reservatConfigTeam != null">reservat_config_team = #{reservatConfigTeam},</if>
             <if test="reservatConfigType != null">reservat_config_type = #{reservatConfigType},</if>
             <if test="reservatConfigStatus != null">reservat_config_status = #{reservatConfigStatus},</if>
             <if test="createDept != null">create_dept = #{createDept},</if>