From 3a38c84a8d021600ad555ce8e2b0b03b69d274d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 20 三月 2025 10:10:08 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 343 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 259 insertions(+), 84 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 fb8804e..e784118 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,6 +8,8 @@
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
+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;
@@ -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;
@@ -49,6 +53,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.awt.print.Book;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -65,6 +70,7 @@
* @date 2023/05/04 18:18
*/
@Service
+@Slf4j
public class BookingsServiceImpl implements BookingsService {
@Value("${des_pwd}")
@@ -84,6 +90,8 @@
@Autowired
private RoomsMapper roomsMapper;
+ @Autowired
+ private UserActionMapper userActionMapper;
@Autowired
private ProjectRelJoinMapper projectRelJoinMapper;
@Autowired
@@ -131,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());
@@ -177,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);
});
}
@@ -224,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";
@@ -333,12 +341,39 @@
@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
@@ -357,7 +392,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(), "鏈煡璇㈠埌棰勭害璁板綍");
}
@@ -377,11 +412,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());
@@ -457,7 +495,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(), "鏈煡璇㈠埌棰勭害璁板綍");
}
@@ -505,7 +543,7 @@
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);
@@ -573,29 +611,9 @@
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
SimpleDateFormat format1 = new SimpleDateFormat("HH:mm");
IPage<Bookings> result = bookingsJoinMapper.selectJoinPage(page, Bookings.class, queryWrapper);
-
- String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
- Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
+ Integer minute =getNearStartMinut();
result.getRecords().stream().forEach(s -> {
-
- if(Constants.equalsInteger(s.getStatus(),Constants.ZERO)&&Constants.equalsInteger(s.getMeetingStatus(),Constants.ONE)){
- //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
- if(
- DateUtil.afterMinutesDate(s.getStartTime(),-minute).getTime()<=System.currentTimeMillis()
- ){
- s.setMeetingStatus(4);
- }
- }
-
-
- 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());
@@ -614,20 +632,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()) {
@@ -636,6 +665,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
@@ -853,15 +920,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));
}
-
/**
* 鎴戠殑棰勭害/鎴戠殑浼氳
@@ -869,20 +942,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)
@@ -911,7 +1045,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());
@@ -929,6 +1064,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()))
@@ -955,15 +1091,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);
@@ -985,9 +1122,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);
@@ -995,10 +1133,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);
@@ -1047,6 +1185,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();
@@ -1123,9 +1262,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(), "鏈鎿嶄綔澶辫触,浼氳鐘舵�佸凡娴佽浆");
}
@@ -1188,7 +1327,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)){
@@ -1218,7 +1357,7 @@
.ne(Bookings::getId,bookings.getId())
)>Constants.ZERO){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
- };
+ }
if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
.lambda()
@@ -1229,7 +1368,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(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
@@ -1239,7 +1378,7 @@
bookings.setEditDate(new Date());
bookings.setEditor(businessOverDTO.getUserId());
bookingsMapper.updateById(bookings);
- //鏇存柊宸茬粨鏉熶絾鏈粨鏉熺殑浼氳淇℃伅涓哄凡缁撴潫
+ //鏇存柊宸茬粨鏉熶絾鏈粨鏉熺殑浼氳淇℃伅涓哄凡缁撴潫
bookingsMapper.update(null,new UpdateWrapper<Bookings>()
.lambda()
.set(Bookings::getStatus,Constants.TWO)
@@ -1247,11 +1386,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){
@@ -1272,9 +1411,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) {
@@ -1284,22 +1423,55 @@
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.end_time > now()")//瀛愭煡璇㈠綋澶╃殑
+ .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;
}
@@ -1409,7 +1581,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);
}
}
@@ -1435,6 +1608,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);
}
@@ -1608,10 +1782,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