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 | 111 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 31 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 a97b557..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
@@ -139,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());
@@ -185,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);
});
}
@@ -232,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";
@@ -374,6 +374,7 @@
userAction.setRemark(info);
userAction.setMemberId(id+"");
userActionMapper.insert(userAction);
+
}
@Override
@@ -392,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(), "鏈煡璇㈠埌棰勭害璁板綍");
}
@@ -412,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());
@@ -492,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(), "鏈煡璇㈠埌棰勭害璁板綍");
}
@@ -535,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);
@@ -572,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),
@@ -608,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<>();
@@ -646,7 +653,7 @@
//鏌ヨ鏄惁鏈夋潈闄�
s.setHasRole(getHasRoleByParam(s,userInfo,adminList));
- /* //鏈嶅姟椤�
+ /* //鏈嶅姟椤�
MPJLambdaWrapper<ProjectRel> prquery = new MPJLambdaWrapper<>();
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
@@ -1061,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()))
@@ -1087,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);
@@ -1117,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);
@@ -1127,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);
@@ -1179,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();
@@ -1297,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
*/
@@ -1350,7 +1392,7 @@
.ne(Bookings::getId,bookings.getId())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
- };
+ }
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
@@ -1361,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(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
@@ -1379,6 +1421,7 @@
.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())
);
@@ -1426,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);
@@ -1573,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);
}
}
@@ -1599,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);
}
@@ -1772,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