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 | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 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 a7898d8..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
@@ -539,6 +539,7 @@
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);
@@ -576,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),
@@ -612,7 +616,6 @@
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
- Integer minute =getNearStartMinut();
result.getRecords().stream().forEach(s -> {
dealMeetingStatusByModel(s,minute);
MPJLambdaWrapper<Multifile> bookquery = new MPJLambdaWrapper<>();
@@ -1313,21 +1316,24 @@
for (Rooms rooms:roomList) {
//鏌ヨ褰撳墠浼氳瀹ゆ槸鍚﹀瓨鍦ㄨ繘琛屼腑鐨勪細璁�
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>().lambda().eq(Bookings::getIsdeleted,Constants.ZERO)
- .eq(Bookings::getStatus,Constants.ZERO).isNotNull(Bookings::getStartTimeReal)
+ .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 ")
+ .apply(" now() > START_TIME and now() < END_TIME ")
.isNull(Bookings::getStartTimeReal)
.orderByAsc(Bookings::getStartTime)
.last(" limit 1 ")
);
- bookings.setStartTimeReal(new Date());
- bookings.setEditDate(new Date());
- bookingsMapper.updateById(bookings);
+ if(Objects.nonNull(bookings)){
+ bookings.setStartTimeReal(new Date());
+ bookings.setEditDate(bookings.getStartTimeReal());
+ bookingsMapper.updateById(bookings);
+ }
}
}
}
@@ -1463,7 +1469,10 @@
.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.end_time > now()")//瀛愭煡璇㈠綋澶╃殑
+ .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);
--
Gitblit v1.9.3