From 4248fbfb4f6a43cbb4884523f599d7719d1ba1c6 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 13:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java |  395 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 316 insertions(+), 79 deletions(-)

diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
index ee12e34..666174e 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java
@@ -1,5 +1,6 @@
 package com.doumee.service.business.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -7,9 +8,11 @@
 import com.doumee.biz.system.SystemDictDataBiz;
 import com.doumee.core.constants.ResponseStatus;
 import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.dao.UserActionMapper;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
 import com.doumee.core.utils.*;
 import com.doumee.core.wx.MeetConstants;
 import com.doumee.core.wx.SendWxMessage;
@@ -39,6 +42,7 @@
 import com.doumee.service.business.ProjectsService;
 import com.doumee.service.system.SystemUserService;
 import com.github.yulichang.wrapper.MPJLambdaWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
@@ -66,6 +70,7 @@
  * @date 2023/05/04 18:18
  */
 @Service
+@Slf4j
 public class BookingsServiceImpl implements BookingsService {
 
     @Value("${des_pwd}")
@@ -85,6 +90,8 @@
 
     @Autowired
     private RoomsMapper roomsMapper;
+    @Autowired
+    private UserActionMapper userActionMapper;
     @Autowired
     private ProjectRelJoinMapper projectRelJoinMapper;
     @Autowired
@@ -132,7 +139,7 @@
     public Integer create(Bookings bookings) {
         LoginUserInfo user = bookings.getLoginUserInfo();
         Rooms rooms = roomsMapper.selectById(bookings.getRoomId());
-        if(rooms==null ){
+        if(rooms==null||Constants.equalsInteger(rooms.getIsdeleted(),Constants.ONE) ){
             throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ細璁鏆傛椂鏃犳硶棰勭害");
         }
         bookings.setRoomName(rooms.getName());
@@ -155,6 +162,12 @@
             this.sendNotice(bookings, MeetConstants.TWO);
             SystemUser systemUser = systemUserMapper.selectById(user.getId());
             this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
+            //鍒涘缓浼氳鍗冲皢鍒版湡涓庝細璁嵆灏嗙粨鏉熺殑閫氱煡
+            if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+                WxPlatNotice wxPlatNotice = new WxPlatNotice();
+                wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+                wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+            } 
         }
 
         return bookings.getId();
@@ -172,7 +185,7 @@
                 s.setCreator(user.getId());
                 s.setObjId(bookings.getId());
                 s.setType(MeetConstants.TWO);
-                s.setObjType(MeetConstants.ZERO);
+                s.setObjType(Constants.MultiFile.MEETING_BOOKS.getKey());
                 multifileJoinMapper.insert(s);
             });
         }
@@ -219,7 +232,7 @@
         for (int i = 0; i < bookings.getBookingTimeList().size(); i++) {
             BookingTime s = bookings.getBookingTimeList().get(i);
             RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
-            if(Objects.isNull(roomTime)){
+            if(Objects.isNull(roomTime) ||Constants.equalsInteger(roomTime.getIsdeleted(),Constants.ONE)){
                 throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀛樺湪鏈煡璇㈠埌鐨勯厤缃棩鏈燂紝璇峰埛鏂伴噸璇�");
             }
             String endRoomTime = gsDate + " " + roomTime.getEndTime()+":00";
@@ -328,12 +341,40 @@
 
     @Override
     public void deleteById(Integer id,LoginUserInfo user) {
+        Bookings model = bookingsMapper.selectById(id);
+        if(model==null ||Constants.equalsInteger(Constants.ONE,model.getIsdeleted())) {
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
+
+        Date date = new Date();
         Bookings bookings = new Bookings();
         bookings.setId(id);
         bookings.setIsdeleted(MeetConstants.ONE);
-        bookings.setEditDate(new Date());
+        bookings.setEditDate(date);
         bookings.setEditor(user.getId());
         bookingsMapper.updateById(bookings);
+
+        String[] params = new String[3];
+        params[0] = user.getRealname();
+        params[1]=DateUtil.getPlusTime2(date);
+        params[2]=model.getName()+"-銆愪細璁锛�"+model.getRoomName()+" 銆�-銆愭椂闂达細"+DateUtil.getPlusTime2(model.getStartTime())+"-"+DateUtil.getPlusTime2(model.getEndTime())+"銆�";
+        String info = Constants.UserActionType.MEET_BOOK_DEL.getInfo();
+        if(params!=null){
+            for (int i = 0; i < params.length; i++) {
+                info = info.replace("${param"+(i+1)+"}",params[i]);
+            }
+        }
+        UserAction userAction=new UserAction();
+        userAction.setIsdeleted(Constants.ZERO);
+        userAction.setCreateDate(date);
+        userAction.setCreator(user.getId());
+        userAction.setBeforeStatus(Constants.ZERO);
+        userAction.setType( Constants.UserActionType.MEET_BOOK_DEL.getKey());
+        userAction.setContent(JSONObject.toJSONString(model));
+        userAction.setRemark(info);
+        userAction.setMemberId(id+"");
+        userActionMapper.insert(userAction);
+
     }
 
     @Override
@@ -352,7 +393,7 @@
            Integer s=ids.get(i);
 
            Bookings bkjs = bookingsMapper.selectById(s);
-           if (Objects.isNull(bkjs)) {
+           if (Objects.isNull(bkjs)||Constants.equalsInteger(bkjs.getIsdeleted(),Constants.ONE)) {
                throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
            }
 
@@ -372,11 +413,14 @@
     @Transactional(rollbackFor = {BusinessException.class, Exception.class})
     public void updateById(Bookings bookings) {
         Bookings dbBookings = bookingsMapper.selectById(bookings.getId());
+        if(dbBookings==null ||Constants.equalsInteger(dbBookings.getIsdeleted(),Constants.ONE)){
+            throw new BusinessException(ResponseStatus.DATA_EMPTY);
+        }
         if(dbBookings.getStatus().equals(MeetConstants.ONE)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈鎿嶄綔澶辫触,棰勭害鐘舵�佸凡娴佽浆");
         }
         Rooms rooms = roomsMapper.selectById(dbBookings.getRoomId());
-        if(rooms==null ){
+        if(rooms==null||Constants.equalsInteger(rooms.getIsdeleted(),Constants.ONE) ){
             throw  new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝璇ヤ細璁鏆傛椂鏃犳硶棰勭害");
         }
         bookings.setRoomName(rooms.getName());
@@ -399,6 +443,11 @@
             this.sendNotice(bookings, MeetConstants.TWO);
             SystemUser systemUser = systemUserMapper.selectById(bookings.getCreator());
             this.sendWxNotice(bookings,Objects.isNull(systemUser)||StringUtils.isBlank(systemUser.getOpenid())?null:systemUser.getOpenid(),Constants.ZERO);
+            if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+                WxPlatNotice wxPlatNotice = new WxPlatNotice();
+                wxPlatNotice.createBeginWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+                wxPlatNotice.createEndWxNotice(systemDictDataBiz,smsEmailMapper,bookings,systemUser.getOpenid());
+            }
         }
     }
 
@@ -447,7 +496,7 @@
         bookingsMapper.updateById(bookings);*/
 
         Bookings bookings = bookingsMapper.selectById(bs.getId());
-        if (Objects.isNull(bookings)) {
+        if (Objects.isNull(bookings)||Constants.equalsInteger(bookings.getIsdeleted(),Constants.ONE)) {
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
         }
 
@@ -490,12 +539,13 @@
         IPage<Bookings> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
         MPJLambdaWrapper<Bookings> queryWrapper = new MPJLambdaWrapper<>();
         Utils.MP.blankToNull(pageWrap.getModel());
+        Integer minute =getNearStartMinut();
 
         queryWrapper.selectAll(Bookings.class);
         queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
         queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
         queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
-        queryWrapper.select(" CASE WHEN t.START_TIME_REAL IS NULL AND t.`STATUS` = 0 THEN 1  WHEN ( ( t.END_TIME < now()  AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ");
+//        queryWrapper.select(" CASE WHEN t.START_TIME_REAL IS NULL AND t.`STATUS` = 0 THEN 1  WHEN ( ( t.END_TIME < now()  AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ");
         queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
         queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
         queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
@@ -527,22 +577,25 @@
         queryWrapper.eq(pageWrap.getModel().getStatus() != null, Bookings::getStatus, pageWrap.getModel().getStatus());
         queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getRealName()), SystemUser::getRealname, pageWrap.getModel().getRealName());
         queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, Company::getId, pageWrap.getModel().getDepartmentId());
-
+        //status 鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉�
+        //浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�
         queryWrapper.apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                         &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
-                " ( now() < t.START_TIME and t.status = 0 ) "
+                " ( now() < t.START_TIME and t.status = 0  AND SUBDATE( now(), INTERVAL -"+minute+" MINUTE ) <  t.START_TIME ) "
         )
         .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                         &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
-                " ( now() >= t.START_TIME and t.END_TIME >= now() and t.status = 0 ) "
+                " ( t.status = 0 and t.START_TIME_REAL is not null  ) "
         )
         .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                         &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
-                " ( ( now() > t.END_TIME  and  t.`STATUS` = 0  ) or   t.`STATUS` = 2  )  "
+                " (   t.`STATUS` = 2  )  "
+                //" ( ( now() > t.END_TIME  and  t.`STATUS` = 0  ) or   t.`STATUS` = 2  )  "
         )
         .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                         &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
-                " now() < t.START_TIME  AND SUBDATE( t.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
+                " (t.status = 0  AND SUBDATE( now(), INTERVAL -"+minute+" MINUTE ) >  t.START_TIME and t.START_TIME_REAL is null ) "
+                //" now() < t.START_TIME  AND SUBDATE( t.START_TIME, INTERVAL "+minute+" MINUTE ) < NOW() "
         )
         .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
                         &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
@@ -564,15 +617,7 @@
         SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
         IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
         result.getRecords().stream().forEach(s -> {
-
-            if(s.getMeetingStatus().equals(Constants.ZERO)){
-                if(s.getMeetingStatus()==Constants.ONE){
-                    //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
-                    if(DateUtil.afterMinutesDate(s.getStartTime(),-120).getTime()>System.currentTimeMillis()){
-                        s.setMeetingStatus(4);
-                    }
-                }
-            }
+            dealMeetingStatusByModel(s,minute);
             MPJLambdaWrapper<Multifile> bookquery = new MPJLambdaWrapper<>();
             bookquery.eq(Multifile::getIsdeleted, MeetConstants.ZERO);
             bookquery.eq(Multifile::getObjId, s.getId());
@@ -591,20 +636,31 @@
             //鍙備細浜哄憳鍒楄〃
             MPJLambdaWrapper<UserRel> urquery = new MPJLambdaWrapper<>();
             urquery.selectAll(UserRel.class);
+            urquery.eq(UserRel::getObjType, MeetConstants.ONE);
             urquery.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
             urquery.eq(UserRel::getObjId, s.getId());
             urquery.select("(select REALNAME from system_user s where t.USER_ID = s.id and s.DELETED = 0  ) as realName");
             List<UserRel> userrelList = userRelJoinMapper.selectJoinList(UserRel.class, urquery);
             s.setSysList(userrelList);
+            //浼氳瀹ょ鐞嗗憳
+            MPJLambdaWrapper<UserRel> param = new MPJLambdaWrapper<>();
+            urquery.selectAll(UserRel.class);
+            urquery.eq(UserRel::getObjType, MeetConstants.ZERO);
+            urquery.eq(UserRel::getIsdeleted, MeetConstants.ZERO);
+            urquery.eq(UserRel::getObjId, s.getRoomId());
+            List<UserRel> adminList = userRelJoinMapper.selectJoinList(UserRel.class, urquery);
+            s.setAdminList(adminList);
 
-            //鏈嶅姟椤�
+            //鏌ヨ鏄惁鏈夋潈闄�
+            s.setHasRole(getHasRoleByParam(s,userInfo,adminList));
+            /*  //鏈嶅姟椤�
             MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>();
             prquery.selectAll(ProjectRel.class);
             prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
             prquery.eq(ProjectRel::getObjId, s.getId());
             prquery.select("(select p.name from meeting_projects p where t.PROJECT_ID = p.id and p.ISDELETED = 0  ) as projectName");
             List<ProjectRel> prList = projectRelJoinMapper.selectJoinList(ProjectRel.class, prquery);
-            s.setProjectList(prList);
+            s.setProjectList(prList);*/
 
             s.setFlag(MeetConstants.ZERO);
             if (System.currentTimeMillis() > s.getStartTime().getTime()) {
@@ -613,6 +669,44 @@
 
         });
         return PageData.from(result);
+    }
+    public int getHasRoleByParam(Bookings s,LoginUserInfo userInfo,List<UserRel> adminList){
+        if(Constants.equalsInteger(userInfo.getId(),s.getCreator())  ){
+              return 1;
+        }
+        if(adminList!=null){
+            for(UserRel u : adminList){
+                if(Constants.equalsInteger(userInfo.getId(),u.getUserId())  ){
+                    return 1;
+                }
+            }
+        }
+        return  0;
+    }
+    private void dealMeetingStatusByModel(Bookings s,Integer minute) {
+        //浼氳鐘舵��: 1=鏈紑濮嬶紱2=杩涜涓紱3=宸茬粨鏉� ; 4=鍗冲皢寮�濮�; 5=宸叉挙閿�
+        //status鐘舵�� 0宸查绾� 1宸叉挙閿� 2宸茬粨鏉�
+        if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
+            //宸叉挙閿�
+            s.setMeetingStatus(Constants.FIVE);
+        }else if(Constants.equalsInteger(s.getStatus(),Constants.TWO)){
+            //宸茬粨鏉�
+            s.setMeetingStatus(Constants.THREE);
+        }else if(Constants.equalsInteger(s.getStatus(),Constants.ZERO)){
+            //0宸查绾�
+            if(s.getStartTimeReal() ==null){
+                //濡傛灉鏈紑濮�
+                s.setMeetingStatus(Constants.ONE);
+                //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+                if(DateUtil.afterMinutesDate(s.getStartTime(),-minute).getTime()<=System.currentTimeMillis()  ){
+                    s.setMeetingStatus(Constants.FOUR);//鍒欐樉绀哄嵆灏嗗紑濮�
+                }
+            }else{
+                //浼氳涓�
+                s.setMeetingStatus(Constants.TWO);
+            }
+        }
+
     }
 
     @Override
@@ -830,15 +924,21 @@
      * @return
      */
     @Override
-    public List<Bookings> getMyBookings(Integer userId, String dateMsg) {
-        return bookingsMapper.selectList(new QueryWrapper<Bookings>()
-                .apply(" id in ( select u.OBJ_ID from meeting_user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1  ) ")
-                .eq("ISDELETED",MeetConstants.ZERO)
+    public List<Bookings> getMyBookings(Integer userId, String dateMsg,Integer queryType) {
+        if(queryType==null ){
+            queryType  =1;
+        }
+        return bookingsMapper.selectJoinList(Bookings.class,new MPJLambdaWrapper<Bookings>()
+                .selectAll(Bookings.class)
+                 .leftJoin(Rooms.class,Rooms::getId,Bookings::getRoomId)
+                .exists(queryType!=3,"( select u.OBJ_ID from meeting_user_rel u where u.OBJ_ID =t.id and u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1  ) ")
+                .exists(queryType==3,"( select u.OBJ_ID from meeting_user_rel u where u.OBJ_ID =t1.id and  u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 0 ) ")
+                .eq(Bookings::getIsdeleted,MeetConstants.ZERO)
+                .eq(Rooms::getIsdeleted,MeetConstants.ZERO)
+                .eq(Rooms::getStatus,MeetConstants.ZERO)
 //                .eq("STATUS",MeetConstants.ZERO)
-                .apply(" ROOM_ID in ( select r.id from meeting_rooms r where r.ISDELETED = 0 and r.STATUS = 0  )")
-                .like(StringUtils.isNotBlank(dateMsg), "START_TIME", dateMsg));
+                .like(StringUtils.isNotBlank(dateMsg), Bookings::getStartTime, dateMsg));
     }
-
 
     /**
      * 鎴戠殑棰勭害/鎴戠殑浼氳
@@ -846,20 +946,81 @@
      * @param pageWrap
      * @return
      */
+    public IPage<Bookings> getMyMeetingPageNew(PageWrap<Bookings> pageWrap) {
+        IPage<Bookings> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
+        MPJLambdaWrapper<Bookings> queryWrapper = new MPJLambdaWrapper<>();
+        Utils.MP.blankToNull(pageWrap.getModel());
+
+        queryWrapper.selectAll(Bookings.class);
+        queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
+        queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
+        queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
+        queryWrapper.select(" CASE WHEN t.START_TIME_REAL IS NULL AND t.`STATUS` = 0 THEN 1  WHEN ( ( t.END_TIME < now()  AND t.`STATUS` = 0 ) or t.`STATUS` = 2 ) THEN 3 WHEN t.`STATUS` = 1 THEN 5 ELSE  2  END meetingStatus ");
+        queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
+        queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
+        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
+        queryWrapper.orderByDesc(Bookings::getCreateDate);
+        queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
+        queryWrapper.and(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),
+                j -> j.like(Bookings::getName,pageWrap.getModel().getRoomsName()).or().like(Rooms::getName, pageWrap.getModel().getRoomsName()))
+                .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
+                        " select u.id from meeting_user_rel u where t.id = u.OBJ_ID and  u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and u.OBJ_TYPE = 1  ")
+                .eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO)
+                        && !Objects.isNull(pageWrap.getModel().getUserId()), Bookings::getCreator, pageWrap.getModel().getUserId())
+                .like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()),  Bookings::getStartTime, pageWrap.getModel().getQueryDate())
+                .eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), Bookings::getRoomId, pageWrap.getModel().getRoomsId())
+                .apply(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.ONE),
+                        " now() < t.END_TIME and t.STATUS = 0   ")
+                .and(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
+                        j -> j.apply("now() >= t.END_TIME ").or()
+                                .eq(" t.STATUS", MeetConstants.ONE))
+                .eq(Rooms::getIsdeleted,MeetConstants.ZERO)
+                .eq(Rooms::getStatus,MeetConstants.ZERO)
+                .eq(Bookings::getIsdeleted,MeetConstants.ZERO)
+                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
+                        " ( now() < t.START_TIME and t.status = 0 ) "
+                )
+                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
+                        " ( now() >= t.START_TIME and t.END_TIME >= now() and t.status = 0 ) "
+                )
+                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
+                        " ( ( now() >t.END_TIME  and  t.`STATUS` = 0  ) or  t.`STATUS` = 2  )  "
+                )
+                .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
+                        " now() < t.START_TIME  AND SUBDATE( t.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
+                )
+                .eq(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+                                &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
+                        Bookings::getStatus,MeetConstants.ONE
+                )
+                .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),Bookings::getCreateDate)
+                .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),Bookings::getStartTime);
+
+        IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
+        return result;
+    }
     @Override
     public IPage<MeetingListResponse> getMyMeetingPage(PageWrap<MeetingPageRequest> pageWrap) {
 
         QueryWrapper queryWrapper = new QueryWrapper<MeetingListResponse>()
                 .and(StringUtils.isNotBlank(pageWrap.getModel().getRoomsName()),
-                        j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or()
-                                .like(" b.NAME", pageWrap.getModel().getRoomsName()))
+                        j -> j.like("a.NAME",pageWrap.getModel().getRoomsName()).or().like(" b.NAME", pageWrap.getModel().getRoomsName()))
                 .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
-                        " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and  u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1  ")
+                        " select 1 from meeting_user_rel u where a.id = u.OBJ_ID and  u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
+                .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.THREE) && !Objects.isNull(pageWrap.getModel().getUserId()),
+                        " select 1 from meeting_user_rel u where b.id = u.OBJ_ID and  u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 0 ")//绠$悊鍛樻煡鐪�
                 .eq(pageWrap.getModel().getQueryType().equals(MeetConstants.TWO) && !Objects.isNull(pageWrap.getModel().getUserId()), "a.CREATOR", pageWrap.getModel().getUserId())
                 .like(StringUtils.isNotBlank(pageWrap.getModel().getQueryDate()), "a.START_TIME", pageWrap.getModel().getQueryDate())
                 .eq(!Objects.isNull(pageWrap.getModel().getRoomsId()), "b.id", pageWrap.getModel().getRoomsId())
-                .apply(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.ONE), " now() < a.END_TIME and a.STATUS = 0   ")
-                .and(!Objects.isNull(pageWrap.getModel().getStatus()) && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
+                .apply(!Objects.isNull(pageWrap.getModel().getStatus())
+                        && pageWrap.getModel().getStatus().equals(MeetConstants.ONE),
+                        " now() < a.END_TIME and a.STATUS = 0   ")
+                .and(!Objects.isNull(pageWrap.getModel().getStatus())
+                                && pageWrap.getModel().getStatus().equals(MeetConstants.TWO),
                         j -> j.apply("now() >= a.END_TIME ").or()
                                 .eq(" a.STATUS", MeetConstants.ONE))
                 .eq("b.ISDELETED",MeetConstants.ZERO)
@@ -888,7 +1049,8 @@
 //                        .orderByDesc(!Objects.isNull(pageWrap.getModel().getStatus())&&pageWrap.getModel().getStatus().equals(MeetConstants.TWO),"a.START_TIME")
 //                        .orderByAsc(Objects.isNull(pageWrap.getModel().getStatus())||pageWrap.getModel().getStatus().equals(MeetConstants.ONE),"a.START_TIME")
                 .orderByDesc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.TWO),"a.CREATE_DATE")
-                .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE),"a.START_TIME");
+                .orderByAsc(Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.ONE)
+                        || Constants.equalsInteger(pageWrap.getModel().getQueryType(),MeetConstants.THREE),"a.START_TIME");
 
         IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), queryWrapper);
         this.dealMeetingStatus(page.getRecords());
@@ -906,6 +1068,7 @@
                 throw new BusinessException(ResponseStatus.BAD_REQUEST);
             }
             Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
+                    .eq(Bookings::getIsdeleted,Constants.ZERO)
                     .eq(Bookings::getRoomId,bean.getRoomId())
                     .ge(Bookings::getEndTime,DateUtil.getPlusTime(bean.getEndTime()))
                     .le(Bookings::getStartTime,DateUtil.getPlusTime(bean.getStartTime()))
@@ -932,15 +1095,16 @@
     @Override
     public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
         MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
-        if (Objects.isNull(meetingDetailResponse)) {
+        if (Objects.isNull(meetingDetailResponse)
+                || Constants.equalsInteger(meetingDetailResponse.getIsdeleted(),Constants.ONE) ) {
             throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌浼氳璇︽儏");
         }
         //棰勭害浜�
         meetingDetailResponse.setBookingUser(systemUserService.findById(meetingDetailResponse.getBookingUserId()));
         //鏃堕棿娈靛垪琛�
-        meetingDetailResponse.setBookingTimeList(bookingTimeMapper.selectList(new QueryWrapper<BookingTime>()
-                .eq("BOOKING_ID", id)
-                .eq("ISDELETED", MeetConstants.ZERO)
+        meetingDetailResponse.setBookingTimeList(bookingTimeMapper.selectList(new QueryWrapper<BookingTime>().lambda()
+                .eq(BookingTime::getBookingId, id)
+                .eq(BookingTime::getIsdeleted, MeetConstants.ZERO)
         ));
         //鍙備細浜哄憳鍒楄〃
         List<UserResponse> userResponseList = systemUserService.getUserList(id);
@@ -962,9 +1126,10 @@
             i.setPrefixUrl(projectsPath);
         });
         meetingDetailResponse.setProjectsResponseList(projectsResponseList);
-        List<Multifile> multiFileList = multifileMapper.selectList(new QueryWrapper<Multifile>()
-                .eq("OBJ_ID", id)
-                .eq("OBJ_TYPE", MeetConstants.ZERO)
+        List<Multifile> multiFileList = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
+                .eq(Multifile::getObjId, id)
+                .eq(Multifile::getObjType, Constants.MultiFile.MEETING_BOOKS.getKey())
+                .eq(Multifile::getIsdeleted, MeetConstants.ZERO)
         );
         multiFileList.forEach(i -> {
             i.setFileurlFull(projectsPath);
@@ -972,10 +1137,10 @@
         //闄勪欢淇℃伅
         meetingDetailResponse.setMultiFileList(multiFileList);
         //浼氳瀹ょ鐞嗕汉鍛�
-        List<UserRel> userRelList = userRelMapper.selectList(new QueryWrapper<UserRel>()
-                .eq("ISDELETED",MeetConstants.ZERO)
-                .eq("OBJ_ID", meetingDetailResponse.getRoomId())
-                .eq("OBJ_TYPE",MeetConstants.ZERO)
+        List<UserRel> userRelList = userRelMapper.selectList(new QueryWrapper<UserRel>().lambda()
+                .eq(UserRel::getIsdeleted,MeetConstants.ZERO)
+                .eq(UserRel::getObjId, meetingDetailResponse.getRoomId())
+                .eq(UserRel::getObjType,MeetConstants.ZERO)
         );
         if(Constants.equalsInteger(sysUserId,meetingDetailResponse.getBookingUserId())){
             meetingDetailResponse.setIsAdmin(Constants.ONE);
@@ -1024,6 +1189,7 @@
     public Integer reservationMeeting(BookingsRequest bookingsRequest) {
         Bookings bookings = new Bookings();
         BeanUtils.copyProperties(bookingsRequest, bookings);
+        bookings.setJoinNotice(bookingsRequest.getJoinNotice());
         if (Objects.isNull(bookingsRequest.getId())) {
             this.create(bookings);
             return bookings.getId();
@@ -1100,9 +1266,9 @@
         if (System.currentTimeMillis() < bookings.getStartTimeReal().getTime()) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳鏈紑濮�,鏃犳硶杩涜缁撴潫锛屽闇�璇ユ搷浣滆浣跨敤鍙栨秷鍔熻兘");
         }
-        if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {
+        /*if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸茬粨鏉燂紝鏃犳硶杩涜璇ユ搷浣�");
-        }
+        }*/
         if(!bookings.getStatus().equals(MeetConstants.ZERO)){
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈鎿嶄綔澶辫触,浼氳鐘舵�佸凡娴佽浆");
         }
@@ -1142,6 +1308,37 @@
     }
 
     /**
+     * 鑷姩寮�濮嬩細璁�
+     */
+    @Override
+    public void autoStart(){
+        List<Rooms> roomList = roomsMapper.selectList(new QueryWrapper<Rooms>().lambda().eq(Rooms::getIsdeleted,Constants.ZERO).eq(Rooms::getStatus,Constants.ZERO));
+        for (Rooms rooms:roomList) {
+            //鏌ヨ褰撳墠浼氳瀹ゆ槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勪細璁�
+            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO)
+                    .eq(Bookings::getStatus,Constants.ZERO).eq(Bookings::getRoomId,rooms.getId()).isNotNull(Bookings::getStartTimeReal).
+                    apply(" DATE_FORMAT(NOW(), '%Y-%m-%d') = DATE_FORMAT(START_TIME, '%Y-%m-%d') ")
+            )<=Constants.ZERO){
+                //鏍规嵁浼氳瀹よ幏鍙栧彲浠ュ紑鍚殑浼氳璁板綍锛堢涓�鏉¤褰曪級
+                Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
+                        .eq(Bookings::getIsdeleted,Constants.ZERO)
+                        .eq(Bookings::getStatus,Constants.ZERO)
+                        .eq(Bookings::getRoomId,rooms.getId())
+                        .apply(" now() > START_TIME and now() < END_TIME ")
+                        .isNull(Bookings::getStartTimeReal)
+                        .orderByAsc(Bookings::getStartTime)
+                        .last(" limit 1 ")
+                );
+                if(Objects.nonNull(bookings)){
+                    bookings.setStartTimeReal(new Date());
+                    bookings.setEditDate(bookings.getStartTimeReal());
+                    bookingsMapper.updateById(bookings);
+                }
+            }
+        }
+    }
+
+    /**
      * 鎻愬墠寮�濮�
      * @param businessOverDTO
      */
@@ -1165,7 +1362,7 @@
                 .eq(UserRel::getObjType,Constants.ZERO)
                 .eq(UserRel::getUserId,businessOverDTO.getUserId()));
 
-        if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
+        if (!Constants.equalsInteger(bookings.getCreator(),businessOverDTO.getUserId()) && userRelList <= 0) {
             throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰綘鐨勯绾﹁褰�,鏃犳硶杩涜璇ユ搷浣�");
         }
         if(!Constants.equalsInteger(bookings.getStatus(),Constants.ZERO)){
@@ -1195,7 +1392,7 @@
                     .ne(Bookings::getId,bookings.getId())
             )>Constants.ZERO){
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
-            };
+            }
 
             if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
                     .lambda() 
@@ -1206,7 +1403,7 @@
                     .eq(Bookings::getRoomId,bookings.getRoomId())
             )>Constants.ZERO){
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"褰撳墠寮�鍚椂闂翠笌鍏朵粬浼氳瀛樺湪鍐茬獊锛屾棤娉曞紑濮嬩細璁�");
-            };
+            }
         }else{
             if(bookings.getStartTime().getTime() > System.currentTimeMillis()){
                 throw  new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
@@ -1216,7 +1413,7 @@
         bookings.setEditDate(new Date());
         bookings.setEditor(businessOverDTO.getUserId());
         bookingsMapper.updateById(bookings);
-        //鏇存柊宸茬粨鏉熶絾鏈粨鏉熺殑浼氳淇℃伅涓哄凡缁撴潫
+         //鏇存柊宸茬粨鏉熶絾鏈粨鏉熺殑浼氳淇℃伅涓哄凡缁撴潫
         bookingsMapper.update(null,new UpdateWrapper<Bookings>()
                 .lambda()
                 .set(Bookings::getStatus,Constants.TWO)
@@ -1224,11 +1421,11 @@
                 .set(Bookings::getDoneInfo,"鍏朵粬浼氳寮�濮嬶紝鑷姩鍏抽棴")
                 .apply(" ( END_TIME < now() or ( END_TIME > now() and START_TIME < now() and START_TIME_REAL is null  ) )")
                 .eq(Bookings::getStatus,Constants.ZERO)
+                .ne(Bookings::getId,bookings.getId())
                 .eq(Bookings::getRoomId,bookings.getRoomId())
         );
 
     }
-
 
     @Override
     public RoomDetailResponse getRoomDetail(Integer roomId){
@@ -1249,9 +1446,9 @@
         String prefix = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.MEET_CODE_PREFIX).getCode() ;
         response.setPrefix(prefix);
 
+        String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH)
+                .getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
         if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(multifileList)){
-            String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH)
-                    .getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
             String localPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_LOCAL_RESOURCE_PATH)
                     .getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
             for (Multifile multifile:multifileList) {
@@ -1261,22 +1458,58 @@
             response.setMultifileList(multifileList);
         }
 
-        //鏌ヨ浼氳鍒楄〃
-        List<MeetingListResponse> meetingList = bookingsMapper.meetingList(
-                new QueryWrapper<Bookings>()
-                .eq( "b.id", rooms.getId())
-                .eq("b.ISDELETED",MeetConstants.ZERO)
-                .eq("b.STATUS",MeetConstants.ZERO)
-                .eq("a.ISDELETED",MeetConstants.ZERO)
-                .eq("a.status",Constants.ZERO)
-                .ne("a.status",Constants.TWO)
-                .like("a.start_time",DateUtil.getCurrDate())
-                .apply(" not exists ( select 1  from  meeting_book mb where mb.END_TIME < now() and  mb.id = a.id and START_TIME_REAL is null  )   ")
-                .orderByAsc("a.start_time")
-        );
-        this.dealMeetingStatus(meetingList);
-        response.setMeetingListResponseList(meetingList);
+        MPJLambdaWrapper<Bookings> queryWrapper = new MPJLambdaWrapper<Bookings>()
+                 .selectAll(Bookings.class)
+                 .selectAs(Rooms::getName, Bookings::getRoomName)
+                 .selectAs(Rooms::getImgurl, Bookings::getImgurl)
+                 .selectAs(Rooms::getFileType, Bookings::getFileType)
+                 .selectAs(SystemUser::getRealname, Bookings::getRealName)
+                 .leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
+                 .leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
+                 .eq(Bookings::getIsdeleted, MeetConstants.ZERO)
+                 .eq(Bookings::getStatus, MeetConstants.ZERO)
+                 .eq(Rooms::getId, rooms.getId())
+                 .apply(" (  " +
+                         " to_days(t.start_time) = to_days(now()) " +
+                         " and ( t.START_TIME_REAL is not null or ( t.end_time > now()  and  t.START_TIME_REAL is  null ) ) " +
+                         " ) ")//瀛愭煡璇㈠綋澶╃殑
+                 .orderByAsc(Bookings::getStartTime);
+        Integer minute =getNearStartMinut();
+        List<Bookings> meetingList =bookingsMapper.selectJoinList(Bookings.class,queryWrapper);
+        List<MeetingListResponse> rList= new ArrayList<>();
+        if(meetingList!=null){
+            log.error(JSONObject.toJSONString(meetingList));
+            for(Bookings s : meetingList){
+                dealMeetingStatusByModel(s,minute);
+                MeetingListResponse d = new MeetingListResponse();
+                d.setId(s.getId());
+                d.setRoomName(s.getRoomName());
+                d.setBookingUser(s.getRealName());
+                d.setMeetingStatus(s.getMeetingStatus());
+                d.setPrefixUrl(path);
+                d.setImgUrl(s.getImgurl());
+                d.setFileType(s.getFileType());
+                d.setMeetingDate(DateUtil.getShortTime(s.getStartTime()));//
+                //CONCAT(date_format(a.START_TIME,'%H:%i') , ' ~ ',date_format(a.END_TIME,'%H:%i')) as meetingTime
+                d.setMeetingTime(DateUtil.formatDate(s.getStartTime(),"HH:mm")+"~"+DateUtil.formatDate(s.getEndTime(),"HH:mm"));
+                d.setMeetingName(s.getName());
+                d.setRemark(s.getRemark());
+                d.setStartTime(s.getStartTime());
+                rList.add(d);
+            }
+        }
+        response.setMeetingListResponseList(rList);
         return response;
+    }
+
+    private Integer getNearStartMinut() {
+        String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
+        try {
+            return  StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+      return  120;
     }
 
 
@@ -1378,6 +1611,7 @@
                     smsEmail.setStatus(Constants.TWO);//
                     smsEmail.setIsdeleted(Constants.ZERO);
                     smsEmail.setType(Constants.ZERO);
+                    smsEmail.setObjType(Constants.FIVE.toString());
                     smsEmail.setObjId(bookings.getId());
                     smsEmail.setCreateDate(new Date());
                     smsEmail.setTitle("浼氳瀹ょ敵璇峰弬浼氶�氱煡");
@@ -1385,7 +1619,8 @@
                             .replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(i.getRealName(),""))
                             .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
                             .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
-                            .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
+                            .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,""))
+                            .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�")));
                     smsEmailList.add(smsEmail);
                 }
             }
@@ -1411,6 +1646,7 @@
                             .replace("{鍙備細浜哄憳濮撳悕}",StringUtils.defaultString(systemUser.getRealname(),""))
                             .replace("{浼氳涓婚}",StringUtils.defaultString(bookings.getName(),""))
                             .replace("{浼氳瀹ゅ悕绉皚",StringUtils.defaultString(bookings.getRoomName(),""))
+                            .replace("{浼氳澶囨敞}",StringUtils.defaultString(bookings.getRemark(),"鏃�"))
                             .replace("{浼氳鏃堕棿娈祡",StringUtils.defaultString(timeInfo,"")));
                     smsEmailList.add(smsEmail);
                 }
@@ -1584,10 +1820,11 @@
         //鏌ヨ鏄惁澶勪簬浼氳涓�
         page.getRecords().forEach(j->{
             j.setPrefixUrl(path);
-            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
+            if(bookingsMapper.selectCount(new QueryWrapper<Bookings>() .lambda()
+                    .eq(Bookings::getIsdeleted,Constants.ZERO)
                     .exists(" select 1 from meeting_user_rel u where u.OBJ_ID = meeting_book.id and  u.USER_ID = '"+j.getId()+"' and u.OBJ_TYPE = 1    ")
-                    .and(i -> i.between("START_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
-                            .or().between("END_TIME", pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
+                    .and(i -> i.between(Bookings::getStartTime, pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
+                            .or().between(Bookings::getEndTime, pageWrap.getModel().getStartTime()+":00",pageWrap.getModel().getEndTime()+":00")
                     )
             )>Constants.ZERO){
                 j.setStatus(Constants.ONE);

--
Gitblit v1.9.3