fix 短信

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

@@ -124,15 +124,13 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
                 //查询一下,该时段接待人员是否已满
                 List<BomanReservat> bomanReservats = bomanReservatMapper.selectBomanReservatList(br);
                 //再去查询接待人员数量
-                int i = receptionPersonnelMapper.selectReceptionPersonnelCount();
+                int num = receptionPersonnelMapper.selectReceptionPersonnelCount();
                 if (bomanReservats != null){
-                    if (bomanReservats.size() >= i ){
-                        return 0;
-                    }
-                    if (bomanReservats.size() + 1 == i){
+                    if (bomanReservats.size() >= num ){
                         //插入redis该时段接待人员已满
                         String keyPersonnel = Constants.RESERVAT_PERSONNEL_NUM + bomanReservat.getVisitDate() + "_" + reservatConfigTimeId;
                         redisCache.setCacheObject(keyPersonnel,"Y",24, TimeUnit.HOURS);
+                        return 0;
                     }
                 }
             }
@@ -223,28 +221,6 @@ public class BomanReservatServiceImpl implements IBomanReservatService {
         if ("3".equals(bomanReservat.getVisitType()) && "Y".equals(reservat.getIsReception()) && StringUtils.isEmpty(reservat.getReceptionName())) {
             return AjaxResult.error("请先分配接待人员");
         }
-        //如果该时段接待员已满,往redis中插入数据,给前端H5日历进行标识
-        if ("3".equals(bomanReservat.getVisitType()) && "Y".equals(reservat.getIsReception()) && StringUtils.isNotEmpty(reservat.getReceptionName())) {
-            //审核通过且需要接待人员且分配了接待人员
-            BomanReservat br = new BomanReservat();
-            br.setReservatConfigTimeId(reservat.getReservatConfigTimeId());
-            br.setVisitDate(bomanReservat.getVisitDate());
-            br.setVisitType("3");
-            //查询一下,该时段接待人员是否已满
-            List<BomanReservat> bomanReservats = bomanReservatMapper.selectBomanReservatList(br);
-            //再去查询接待人员数量
-            int i = receptionPersonnelMapper.selectReceptionPersonnelCount();
-            if (bomanReservats != null){
-                if (bomanReservats.size() >= i ){
-                    return AjaxResult.error("当前时段接待人员已满");
-                }
-                if (bomanReservats.size() + 1 == i){
-                    //插入redis该时段接待人员已满
-                    String key = Constants.RESERVAT_PERSONNEL_NUM + reservat.getVisitDate() + "_" + reservatConfigTimeId;
-                    redisCache.setCacheObject(key,"Y",24, TimeUnit.HOURS);
-                }
-            }
-        }
         //拒绝,释放名额
         if ("2".equals(bomanReservat.getVisitType())) {
             String visitNum = reservat.getVisitNum();