From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 20:39:32 +0800
Subject: [PATCH] 最新版本541200007
---
server/meeting/meeting_service/src/main/java/com/doumee/service/business/impl/BookingsServiceImpl.java | 545 +++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 454 insertions(+), 91 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 fb949c1..19d048f 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
@@ -16,27 +16,27 @@
import com.doumee.core.utils.Utils;
import com.doumee.core.wx.MeetConstants;
import com.doumee.core.wx.SendWxMessage;
+import com.doumee.dao.admin.request.BusinessOverDTO;
import com.doumee.dao.admin.request.QrOpenDoorDto;
import com.doumee.dao.admin.response.DevWgResponseParam;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.*;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.RoomStatisticsVo;
+import com.doumee.dao.system.MultifileMapper;
import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.UserStatisticsDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
-import com.doumee.dao.system.model.Notices;
-import com.doumee.dao.system.model.SystemDepartment;
-import com.doumee.dao.system.model.SystemDepartmentUser;
-import com.doumee.dao.system.model.SystemUser;
+import com.doumee.dao.system.model.*;
+import com.doumee.dao.system.vo.UserResponse;
import com.doumee.dao.system.vo.UserStatisticsVo;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
+import com.doumee.dao.web.request.UserPageRequest;
import com.doumee.dao.web.response.*;
import com.doumee.service.business.BookingsService;
import com.doumee.service.business.DevicesService;
import com.doumee.service.business.ProjectsService;
-import com.doumee.service.system.NoticesService;
import com.doumee.service.system.SystemUserService;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import org.apache.commons.lang3.StringUtils;
@@ -49,6 +49,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;
@@ -74,6 +75,7 @@
private SystemUserMapper systemUserMapper;
@Autowired
private RoomRecordMapper roomRecordMapper;
+
@Autowired
private BookingsJoinMapper bookingsJoinMapper;
@@ -123,8 +125,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class, Exception.class})
public Integer create(Bookings bookings) {
- LoginUserInfo user = new LoginUserInfo();
- user.setId(bookings.getCreator());
+ LoginUserInfo user = bookings.getLoginUserInfo();
isCreateParamValid(bookings, user);
bookings.setCreateDate(new Date());
bookings.setCreator(user.getId());
@@ -141,7 +142,7 @@
//鍙戦�佷細璁绾︽垚鍔熼�氱煡
this.sendNotice(bookings, MeetConstants.TWO);
//鍙戦�佸井淇¤闃呴�氱煡
- sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+// sendWxMessage.bookingsReservation(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
return bookings.getId();
}
@@ -188,6 +189,7 @@
bookquery.selectAs(BookingTime::getTimeId, Bookings::getRoomTimeId);
bookquery.selectAs(BookingTime::getId, Bookings::getBookingTimeId);
bookquery.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
+ bookquery.eq(BookingTime::getIsdeleted, MeetConstants.ZERO);
bookquery.eq(Bookings::getRoomId, bookings.getRoomId());
bookquery.eq(Bookings::getStatus, MeetConstants.ZERO);
//bookquery.ge(Bookings::getStartTime, bookings.getStartTime());
@@ -199,8 +201,15 @@
List<Bookings> bookList = bookingsJoinMapper.selectJoinList(Bookings.class, bookquery);
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)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀛樺湪鏈煡璇㈠埌鐨勯厤缃棩鏈燂紝璇峰埛鏂伴噸璇�");
+ }
+ String endRoomTime = gsDate + " " + roomTime.getEndTime()+":00";
+ if(DateUtil.StringToDate(endRoomTime, "yyyy-MM-dd HH:mm:ss").getTime()<=System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),endRoomTime + "宸茶秴杩囧綋鍓嶆椂闂达紝鏃犳硶杩涜棰勭害");
+ }
if (!Objects.isNull(bookList) && bookList.size() > MeetConstants.ZERO) {
-
List<Bookings> detailDataDtoStream =
bookList.stream().filter(a -> MeetConstants.equalsInteger(s.getTimeId(), a.getRoomTimeId())
).collect(Collectors.toList());
@@ -214,7 +223,6 @@
.filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
.collect(Collectors.toList());
if (chriList.size() > 0) {
- RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ細璁細" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "鏃堕棿娈靛唴宸茶浣跨敤");
}
} else {
@@ -224,7 +232,6 @@
.filter(a -> MeetConstants.equalsInteger(a.getRoomTimeId(), s.getTimeId()))
.collect(Collectors.toList());
if (chriList.size() > 0) {
- RoomTime roomTime = roomTimeJoinMapper.selectById(s.getTimeId());
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "璇ヤ細璁細" + roomTime.getStartTime() + "-" + roomTime.getEndTime() + "鏃堕棿娈靛唴宸茶浣跨敤");
}
}
@@ -246,14 +253,13 @@
bookings.getBookingTimeList().stream().forEach(s -> {
+ s.setId(null);
s.setCreator(user.getId());
s.setCreateDate(new Date());
s.setIsdeleted(MeetConstants.ZERO);
s.setBookingId(bookings.getId());
bookingTimeJoinMapper.insert(s);
});
-
-
}
public void updateManager(Bookings bookings, LoginUserInfo user) {
@@ -266,16 +272,18 @@
userRel.setIsdeleted(MeetConstants.ONE);
userRelJoinMapper.update(userRel, updateWrapper);
}
- bookings.getSysList().stream().forEach(s -> {
- s.setIsdeleted(MeetConstants.ZERO);
- s.setCreateDate(new Date());
- s.setCreator(user.getId());
- s.setUserId(s.getUserId());
- s.setObjId(bookings.getId());
- s.setObjType(MeetConstants.ONE);
- userRelJoinMapper.insert(s);
- });
-
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(bookings.getSysList())){
+ bookings.getSysList().stream().forEach(s -> {
+ s.setId(null);
+ s.setIsdeleted(MeetConstants.ZERO);
+ s.setCreateDate(new Date());
+ s.setCreator(user.getId());
+ s.setUserId(s.getUserId());
+ s.setObjId(bookings.getId());
+ s.setObjType(MeetConstants.ONE);
+ userRelJoinMapper.insert(s);
+ });
+ }
}
public void updateProjectRel(Bookings rooms, LoginUserInfo user) {
@@ -289,7 +297,7 @@
projectRelJoinMapper.update(projectRel, updateWrapper);
rooms.getProjectList().stream().forEach(s -> {
-
+ s.setId(null);
s.setIsdeleted(MeetConstants.ZERO);
s.setCreateDate(new Date());
s.setCreator(user.getId());
@@ -302,8 +310,7 @@
}
@Override
- public void deleteById(Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void deleteById(Integer id,LoginUserInfo user) {
Bookings bookings = new Bookings();
bookings.setId(id);
bookings.setIsdeleted(MeetConstants.ONE);
@@ -313,14 +320,13 @@
}
@Override
- public void delete(Bookings bookings) {
+ public void delete(Bookings bookings,LoginUserInfo user) {
UpdateWrapper<Bookings> deleteWrapper = new UpdateWrapper<>(bookings);
bookingsMapper.delete(deleteWrapper);
}
@Override
- public void deleteByIdInBatch(List<Integer> ids) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void deleteByIdInBatch(List<Integer> ids,LoginUserInfo user) {
if (CollectionUtils.isEmpty(ids)) {
return;
}
@@ -352,8 +358,7 @@
if(dbBookings.getStatus().equals(MeetConstants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈鎿嶄綔澶辫触,棰勭害鐘舵�佸凡娴佽浆");
}
- LoginUserInfo user = new LoginUserInfo();
- user.setId(bookings.getCreator());
+ LoginUserInfo user = bookings.getLoginUserInfo();
isCreateParamValid(bookings, user);
bookings.setEditDate(new Date());
bookings.setEditor(user.getId());
@@ -388,6 +393,9 @@
@Override
public void cancelById(Bookings bs) {
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ if(user == null){
+ user = bs.getLoginUserInfo();
+ }
/*
if(Objects.isNull(bookings)||bookings.getId()==null){
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(), ResponseStatus.BAD_REQUEST.getMessage());
@@ -455,22 +463,60 @@
queryWrapper.selectAll(Bookings.class);
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
- queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
-
+ 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(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
- queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
-
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
queryWrapper.orderByDesc(Bookings::getCreateDate);
queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
+
+ //鏁版嵁鏉冮檺寮�濮�--------------------start----------------
+ LoginUserInfo userInfo =pageWrap.getModel().getLoginUserInfo();
+ if(userInfo!=null && userInfo.getCompanyIdList()!=null){
+ if( userInfo.getCompanyIdList().size() ==0){
+ //鍙湅鑷繁
+ queryWrapper.and(wrapper ->{
+ wrapper.eq(Bookings::getCreator,userInfo.getId())
+ .or().exists("select rel.id from meeting_user_rel rel where rel.OBJ_TYPE=0 and rel.obj_id=t.id and rel.isdeleted=0 and rel.user_id="+userInfo.getId());
+ });
+ queryWrapper.eq(Bookings::getCreator,userInfo.getId());
+ }else{
+ //鏉冮檺鑼冨洿鍐�
+ queryWrapper.and(wrapper ->{
+ wrapper.in(SystemUser::getCompanyId ,userInfo.getCompanyIdList())
+ .or().exists("select rel.id from meeting_user_rel rel where rel.OBJ_TYPE=0 and rel.obj_id=t.id and rel.isdeleted=0 and rel.user_id="+userInfo.getId());
+ });
+ }
+ }
+ //鏁版嵁鏉冮檺寮�濮�--------------------end----------------
queryWrapper.eq(pageWrap.getModel().getRoomId() != null, Bookings::getRoomId, pageWrap.getModel().getRoomId());
queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()), Bookings::getName, pageWrap.getModel().getName());
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, SystemDepartment::getId, pageWrap.getModel().getDepartmentId());
+ queryWrapper.eq(pageWrap.getModel().getDepartmentId() != null, Company::getId, pageWrap.getModel().getDepartmentId());
+
+ queryWrapper.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() "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
+ " t.STATUS = 1 "
+ );
if (pageWrap.getModel().getStartTime() != null) {
queryWrapper.ge(Bookings::getStartTime, pageWrap.getModel().getStartTime());
@@ -481,19 +527,28 @@
}
queryWrapper.orderByDesc(Bookings::getCreateDate);
- String path = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
SimpleDateFormat format = new SimpleDateFormat("MM-dd HH:mm");
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);
+ }
+ }
+ }
MPJLambdaWrapper<Multifile> bookquery = new MPJLambdaWrapper<>();
bookquery.eq(Multifile::getIsdeleted, MeetConstants.ZERO);
bookquery.eq(Multifile::getObjId, s.getId());
List<Multifile> filelist = multifileJoinMapper.selectList(bookquery);
filelist.stream().forEach(a -> {
if (StringUtils.isNotBlank(a.getFileurl())) {
- a.setFileFullUrl(path + a.getFileurl());
+ a.setFileurlFull(path + a.getFileurl());
}
});
s.setFileList(filelist);
@@ -516,7 +571,7 @@
prquery.selectAll(ProjectRel.class);
prquery.eq(ProjectRel::getIsdeleted, MeetConstants.ZERO);
prquery.eq(ProjectRel::getObjId, s.getId());
- prquery.select("(select p.name from projects p where t.PROJECT_ID = p.id and p.ISDELETED = 0 ) as projectName");
+ 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);
@@ -536,11 +591,10 @@
queryWrapper.selectAll(Bookings.class);
queryWrapper.selectAs(Rooms::getName, Bookings::getRoomName);
queryWrapper.selectAs(SystemUser::getRealname, Bookings::getRealName);
- queryWrapper.selectAs(SystemDepartment::getName, Bookings::getDepartmentName);
+ queryWrapper.selectAs(Company::getName, Bookings::getDepartmentName);
queryWrapper.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId);
queryWrapper.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator);
- queryWrapper.leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator);
- queryWrapper.leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId);
+ queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
queryWrapper.eq(Bookings::getIsdeleted, MeetConstants.ZERO);
queryWrapper.eq(queryParam.getId() != null, Bookings::getId, queryParam.getId());
queryWrapper.eq(queryParam.getRoomId() != null, Bookings::getRoomId, queryParam.getRoomId());
@@ -554,7 +608,7 @@
queryWrapper.orderByDesc(Bookings::getCreateDate);
// String path = systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
- String path = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
Bookings result = bookingsJoinMapper.selectOne(queryWrapper.last("limit 1"));
if (result != null) {
@@ -564,7 +618,7 @@
List<Multifile> filelist = multifileJoinMapper.selectList(bookquery);
filelist.stream().forEach(a -> {
if (StringUtils.isNotBlank(a.getFileurl())) {
- a.setFileFullUrl(path + a.getFileurl());
+ a.setFileurlFull(path + a.getFileurl());
}
});
result.setFileList(filelist);
@@ -747,10 +801,10 @@
@Override
public List<Bookings> getMyBookings(Integer userId, String dateMsg) {
return bookingsMapper.selectList(new QueryWrapper<Bookings>()
- .apply(" id in ( select u.OBJ_ID from user_rel u where u.USER_ID = '" + userId + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ) ")
+ .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)
// .eq("STATUS",MeetConstants.ZERO)
- .apply(" ROOM_ID in ( select r.id from rooms r where r.ISDELETED = 0 and r.STATUS = 0 )")
+ .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));
}
@@ -763,32 +817,80 @@
*/
@Override
public IPage<MeetingListResponse> getMyMeetingPage(PageWrap<MeetingPageRequest> pageWrap) {
- IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), new QueryWrapper<MeetingListResponse>()
+
+ 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()))
- .exists(pageWrap.getModel().getQueryType().equals(MeetConstants.ONE) && !Objects.isNull(pageWrap.getModel().getUserId()),
- " select 1 from user_rel u where a.id = u.OBJ_ID and u.USER_ID = '" + pageWrap.getModel().getUserId() + "' and u.ISDELETED = 0 and OBJ_TYPE = 1 ")
- .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),
- j -> j.apply("now() >= a.END_TIME ").or()
- .eq(" a.STATUS", MeetConstants.ONE))
- .eq("b.ISDELETED",MeetConstants.ZERO)
- .eq("b.STATUS",MeetConstants.ZERO)
- .eq("a.ISDELETED",MeetConstants.ZERO)
- .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")
- );
- String prefixUrl = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
- ;
- page.getRecords().forEach(i -> {
- i.setPrefixUrl(prefixUrl);
- });
+ .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 ")
+ .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),
+ j -> j.apply("now() >= a.END_TIME ").or()
+ .eq(" a.STATUS", MeetConstants.ONE))
+ .eq("b.ISDELETED",MeetConstants.ZERO)
+ .eq("b.STATUS",MeetConstants.ZERO)
+ .eq("a.ISDELETED",MeetConstants.ZERO)
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.ONE),
+ " ( now() < a.START_TIME and a.status = 0 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.TWO),
+ " ( now() >= a.START_TIME and a.END_TIME >= now() and a.status = 0 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.THREE),
+ " ( ( now() > a.END_TIME and a.`STATUS` = 0 ) or a.`STATUS` = 2 ) "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FOUR),
+ " now() < a.START_TIME AND SUBDATE( a.START_TIME, INTERVAL 120 MINUTE ) < NOW() "
+ )
+ .apply(Objects.nonNull(pageWrap.getModel().getMeetingStatus())
+ &&Constants.equalsInteger(pageWrap.getModel().getMeetingStatus(),Constants.FIVE),
+ " a.STATUS = 1 "
+ )
+// .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");
+
+ IPage<MeetingListResponse> page = bookingsMapper.myMeetingPage(pageWrap.toPage(), queryWrapper);
+ this.dealMeetingStatus(page.getRecords());
return page;
}
+
+
+ @Override
+ public MeetingDetailResponse getMeetingDetailByDate(Bookings bean){
+ try {
+ if(Objects.isNull(bean)
+ || Objects.isNull(bean.getRoomId())
+ || Objects.isNull(bean.getStartTime())
+ || Objects.isNull(bean.getEndTime())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Bookings bookings = bookingsMapper.selectOne(new QueryWrapper<Bookings>().lambda()
+ .eq(Bookings::getRoomId,bean.getRoomId())
+ .ge(Bookings::getEndTime,DateUtil.getPlusTime(bean.getEndTime()))
+ .le(Bookings::getStartTime,DateUtil.getPlusTime(bean.getStartTime()))
+ );
+ if(Objects.isNull(bookings)){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY);
+ }
+ return getMeetingDetail(bookings.getId(),null);
+ }catch (Exception e){
+ e.printStackTrace();
+ }
+ return null;
+ }
+
+
+
/**
* 浼氳璇︽儏
@@ -797,7 +899,7 @@
* @return
*/
@Override
- public MeetingDetailResponse getMeetingDetail(Integer id) {
+ public MeetingDetailResponse getMeetingDetail(Integer id,Integer sysUserId) {
MeetingDetailResponse meetingDetailResponse = bookingsMapper.meetingDetail(id);
if (Objects.isNull(meetingDetailResponse)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌浼氳璇︽儏");
@@ -809,11 +911,10 @@
.eq("BOOKING_ID", id)
.eq("ISDELETED", MeetConstants.ZERO)
));
-
//鍙備細浜哄憳鍒楄〃
- SystemUser param = new SystemUser();
- List<SystemUser> userResponseList = systemUserService.findList(param);
- String avatarPath = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ List<UserResponse> userResponseList = systemUserService.getUserList(id);
+ String avatarPath = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
userResponseList.forEach(i -> {
if(StringUtils.isNotBlank(i.getAvatar())){
i.setAvatar(avatarPath+i.getAvatar());
@@ -821,7 +922,8 @@
});
meetingDetailResponse.setUserResponseList(userResponseList);
//鏈嶅姟椤�
- String projectsPath = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.FILE_DIR).getCode() + systemDictDataBiz.queryByCode(MeetConstants.OSS, MeetConstants.PROJECTS).getCode();
+ String projectsPath = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode()
+ + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
List<ProjectsResponse> projectsResponseList = projectsService.getProjectsList(id, MeetConstants.ONE);
projectsResponseList.forEach(i -> {
i.setPrefixUrl(projectsPath);
@@ -832,7 +934,7 @@
.eq("OBJ_TYPE", MeetConstants.ZERO)
);
multiFileList.forEach(i -> {
- i.setFileFullUrl(projectsPath);
+ i.setFileurlFull(projectsPath);
});
//闄勪欢淇℃伅
meetingDetailResponse.setMultiFileList(multiFileList);
@@ -842,9 +944,18 @@
.eq("OBJ_ID", meetingDetailResponse.getRoomId())
.eq("OBJ_TYPE",MeetConstants.ZERO)
);
+ if(Constants.equalsInteger(sysUserId,meetingDetailResponse.getBookingUserId())){
+ meetingDetailResponse.setIsAdmin(Constants.ONE);
+ }
if (!Objects.isNull(userRelList) && userRelList.size() > 0) {
meetingDetailResponse.setRoomUser(systemUserService.findById(userRelList.get(MeetConstants.ZERO).getUserId()));
+ if( Objects.nonNull(sysUserId) &&
+ userRelList.stream().filter(i->Constants.equalsInteger(i.getUserId(),sysUserId)).collect(Collectors.toList()).size()>Constants.ZERO
+ ){
+ meetingDetailResponse.setIsAdmin(Constants.ONE);
+ }
}
+
return meetingDetailResponse;
}
@@ -892,35 +1003,253 @@
/**
* 浼氳棰勭害璁板綍鍙栨秷
- *
- * @param id
- * @param userId
*/
@Override
- public void reservationCancel(Integer id, Integer userId) {
- Bookings bookings = bookingsMapper.selectById(id);
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void reservationCancel(BusinessOverDTO businessOverDTO) {
+ Bookings bookings = bookingsMapper.selectById(businessOverDTO.getId());
if (Objects.isNull(bookings)) {
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
}
- if (!bookings.getCreator().equals(userId)) {
+ if (!bookings.getCreator().equals(businessOverDTO.getUserId())) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰綘鐨勯绾﹁褰�,鏃犳硶杩涜鍙栨秷");
}
- if (System.currentTimeMillis() > bookings.getStartTime().getTime()) {
+ if (Objects.nonNull(bookings.getStartTimeReal()) && System.currentTimeMillis() > bookings.getStartTimeReal().getTime()) {
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸插紑濮�,鏃犳硶杩涜鍙栨秷");
}
if(bookings.getStatus().equals(MeetConstants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "鏈鎿嶄綔澶辫触,棰勭害鐘舵�佸凡娴佽浆");
}
bookings.setCancelTime(new Date());
- bookings.setCancelUser(userId);
+ bookings.setCancelUser(businessOverDTO.getUserId());
+ bookings.setCancelInfo(businessOverDTO.getBusinessRemark());
bookings.setStatus(MeetConstants.ONE);
bookings.setEditDate(new Date());
- bookings.setEditor(userId);
+ bookings.setEditor(businessOverDTO.getUserId());
bookingsMapper.updateById(bookings);
//鍙栨秷浼氳 鍙戦�佸彇娑堥�氱煡
this.sendNotice(bookings, 3);
//鍙戦�佸井淇¤闃呴�氱煡
- sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+// sendWxMessage.bookingsCancel(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+ }
+
+
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void reservationOver(BusinessOverDTO businessOverDTO) {
+ if(Objects.isNull(businessOverDTO)
+ || Objects.isNull(businessOverDTO.getUserId())
+ || Objects.isNull(businessOverDTO.getId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Bookings bookings = bookingsMapper.selectById(businessOverDTO.getId());
+ if (Objects.isNull(bookings)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
+ }
+ Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
+ .eq(UserRel::getIsdeleted,Constants.ZERO)
+ .eq(UserRel::getObjId,bookings.getRoomId())
+ .eq(UserRel::getObjType,Constants.ZERO)
+ .eq(UserRel::getUserId,businessOverDTO.getUserId()));
+
+ if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰綘鐨勯绾﹁褰�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if (System.currentTimeMillis() < bookings.getStartTimeReal().getTime()) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳鏈紑濮�,鏃犳硶杩涜缁撴潫锛屽闇�璇ユ搷浣滆浣跨敤鍙栨秷鍔熻兘");
+ }
+ 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(), "鏈鎿嶄綔澶辫触,浼氳鐘舵�佸凡娴佽浆");
+ }
+ bookings.setDoneDate(new Date());
+ bookings.setDoneUserId(businessOverDTO.getUserId());
+ bookings.setStatus(MeetConstants.TWO);
+ bookings.setEditDate(new Date());
+ bookings.setEditor(businessOverDTO.getUserId());
+ bookingsMapper.updateById(bookings);
+
+ //鏌ヨ鎵�鏈夌殑棰勭害鏃堕棿
+ List<BookingTime> bookingTimeList = bookingTimeJoinMapper.selectJoinList(BookingTime.class,
+ new MPJLambdaWrapper<BookingTime>()
+ .selectAll(BookingTime.class)
+ .selectAs(RoomTime::getEndTime,BookingTime::getEndTime)
+ .leftJoin(RoomTime.class,RoomTime::getId,BookingTime::getTimeId)
+ .eq(BookingTime::getBookingId,bookings.getId()));
+ //鑾峰彇褰撳ぉ 鍙湁褰撳ぉ鏃ユ湡鍐呭彲浠ュ鐞�
+ String today = DateUtil.dateToString(new Date(),"yyyy-mm-dd");
+ //寰幆鏍囪鏁版嵁涓哄凡鍒犻櫎 涓嶅啀鍗犵敤
+ for (BookingTime bookingTime:bookingTimeList) {
+ if(DateUtil.getDateFromString(today + " " + bookingTime.getEndTime() +":00").getTime()>System.currentTimeMillis()){
+ bookingTime.setIsdeleted(Constants.ZERO);
+ bookingTimeJoinMapper.updateById(bookingTime);
+ }
+ }
+ }
+
+ /**
+ * 姝ｅ父寮�濮�
+ * @param businessOverDTO
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void start(BusinessOverDTO businessOverDTO) {
+ this.startEarly(businessOverDTO);
+ }
+
+ /**
+ * 鎻愬墠寮�濮�
+ * @param businessOverDTO
+ */
+ @Override
+ @Transactional(rollbackFor = {Exception.class,BusinessException.class})
+ public void startEarly(BusinessOverDTO businessOverDTO) {
+ if(Objects.isNull(businessOverDTO)
+ || Objects.isNull(businessOverDTO.getUserId())
+ || Objects.isNull(businessOverDTO.getStartType())
+ || Objects.isNull(businessOverDTO.getId())
+ ){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST);
+ }
+ Bookings bookings = bookingsMapper.selectById(businessOverDTO.getId());
+ if (Objects.isNull(bookings)) {
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(), "鏈煡璇㈠埌棰勭害璁板綍");
+ }
+ Long userRelList = userRelMapper.selectCount(new QueryWrapper<UserRel>().lambda()
+ .eq(UserRel::getIsdeleted,Constants.ZERO)
+ .eq(UserRel::getObjId,bookings.getRoomId())
+ .eq(UserRel::getObjType,Constants.ZERO)
+ .eq(UserRel::getUserId,businessOverDTO.getUserId()));
+
+ if (!bookings.getCreator().equals(businessOverDTO.getUserId()) && userRelList <= 0) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "闈炰綘鐨勯绾﹁褰�,鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(!Constants.equalsInteger(bookings.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳鐘舵�佸凡娴佽浆锛屾棤娉曡繘琛岃鎿嶄綔");
+ }
+ if(Objects.nonNull(bookings.getStartTimeReal())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸插紑濮嬶紝璇峰嬁閲嶅鎿嶄綔");
+ }
+ if (System.currentTimeMillis() > bookings.getEndTime().getTime()) {
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(), "浼氳宸茬粨鏉燂紝鏃犳硶杩涜璇ユ搷浣�");
+ }
+ if(Constants.equalsInteger(businessOverDTO.getStartType(),Constants.ZERO)){
+ //鏍规嵁閰嶇疆鑾峰彇鎻愬墠寮�濮嬬殑鍒嗛挓鏁伴噺
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.EARLY_START).getCode();
+ Integer beforeMinutes = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
+ if(DateUtil.afterMinutesDate(bookings.getStartTime(),-beforeMinutes).getTime()>System.currentTimeMillis()){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳浠呭彲浠ユ彁鍓�"+beforeMinutes+"鍒嗛挓寮�濮�");
+ }
+ //鏌ヨ鏄惁瀛樺湪鍏朵粬鏈紑濮嬬殑浼氳 闃叉棰楃矑搴︿笌鎻愬墠寮�濮嬬殑闂
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
+ .lambda()
+ .apply(" now() < START_TIME and END_TIME <= '" + DateUtil.DateToStr(bookings.getStartTime(),"yyyy-MM-dd HH:mm:ss") +"'" )
+ .isNull(Bookings::getStartTimeReal)
+ .isNull(Bookings::getDoneDate)
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .eq(Bookings::getRoomId,bookings.getRoomId())
+ .ne(Bookings::getId,bookings.getId())
+ )>Constants.ZERO){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏈紑鍚細璁紝鏃犳硶寮�濮嬩細璁�");
+ };
+
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
+ .lambda()
+ .apply(" ( ( END_TIME > now() and START_TIME < now() ) or ( END_TIME > now() and START_TIME_REAL < now() ) ) ")
+ .isNotNull(Bookings::getStartTimeReal)
+ .isNull(Bookings::getDoneDate)
+ .eq(Bookings::getStatus,Constants.ZERO)
+ .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(),"鏈埌浼氳鐢宠寮�濮嬫椂闂达紝鏃犳硶寮�濮�");
+ }
+ }
+ bookings.setStartTimeReal(new Date());
+ bookings.setEditDate(new Date());
+ bookings.setEditor(businessOverDTO.getUserId());
+ bookingsMapper.updateById(bookings);
+ //鏇存柊宸茬粨鏉熶絾鏈粨鏉熺殑浼氳淇℃伅涓哄凡缁撴潫
+ bookingsMapper.update(null,new UpdateWrapper<Bookings>()
+ .lambda()
+ .set(Bookings::getStatus,Constants.TWO)
+ .set(Bookings::getDoneDate,new Date())
+ .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)
+ .eq(Bookings::getRoomId,bookings.getRoomId())
+ );
+
+ }
+
+
+ @Override
+ public RoomDetailResponse getRoomDetail(Integer roomId){
+ Rooms rooms = roomsMapper.selectById(roomId);
+ if(Objects.isNull(rooms) || !Constants.equalsInteger(rooms.getIsdeleted(),Constants.ZERO)
+ || !Constants.equalsInteger(rooms.getStatus(),Constants.ZERO)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"浼氳瀹や俊鎭棤鏁堬紝璇疯仈绯荤鐞嗗憳");
+ }
+ RoomDetailResponse response = new RoomDetailResponse();
+ response.setRoomName(rooms.getName());
+ response.setFileType(rooms.getFileType());
+
+ List<Multifile> multifileList = multifileJoinMapper.selectList(new QueryWrapper<Multifile>().lambda()
+ .eq(Multifile::getObjId,roomId)
+ .eq(Multifile::getObjType,Constants.FOUR)
+ );
+
+ String prefix = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.MEET_CODE_PREFIX).getCode() ;
+ response.setPrefix(prefix);
+
+ 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();
+ for (Multifile multifile:multifileList) {
+ multifile.setFileurlFull(path + multifile.getFileurl());
+ }
+ 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);
+ return response;
+ }
+
+
+ public void dealMeetingStatus(List<MeetingListResponse> meetingResponseList){
+ if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(meetingResponseList)){
+ String path = systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.FTP_RESOURCE_PATH).getCode() + systemDictDataBiz.queryByCode(MeetConstants.FTP, MeetConstants.PROJECTS).getCode();
+ String configMinute = systemDictDataBiz.queryByCode(MeetConstants.SYSTEM, MeetConstants.SOON_START).getCode();
+ Integer minute = StringUtils.isNotBlank(configMinute) ? Integer.valueOf(configMinute) : 120;
+ for (MeetingListResponse m:meetingResponseList) {
+ if(Constants.equalsInteger(m.getStatus(),Constants.ZERO)&&Constants.equalsInteger(m.getMeetingStatus(),Constants.ONE)){
+ //寮�濮嬪墠120鍒嗛挓 澶т簬褰撳墠鏃堕棿 鍒欐樉绀哄嵆灏嗗紑濮�
+ if(DateUtil.afterMinutesDate(m.getStartTime(),-minute).getTime()>System.currentTimeMillis()){
+ m.setMeetingStatus(4);
+ }
+ }
+ m.setPrefixUrl(path);
+ }
+ }
}
@@ -946,7 +1275,7 @@
bookingsMapper.updateById(bookings);
this.sendNotice(bookings, MeetConstants.ONE);
//鍙戦�佸井淇￠�氱煡
- sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
+// sendWxMessage.bookingsStart(systemUserMapper.selectById(bookings.getCreator()), bookings, roomsMapper.selectById(bookings.getRoomId()));
}
}
@@ -983,7 +1312,7 @@
Notices notices = new Notices(noticeObjectType,bookings.getId(),noticeObjectType.getInfo(),bookings.getCreator(), Constants.ZERO);
noticeList.add(notices);
if(noticeList.size()>0){
- noticesMapper.insertBatchSomeColumn(noticeList);
+ noticesMapper.insert(noticeList);
}
}
@@ -1000,7 +1329,7 @@
lambdaWrapper.selectAll(Bookings.class)
.selectAs(SystemUser::getRealname, Bookings::getRealName)
- .selectAs(SystemDepartment::getName, Bookings::getDepartmentName)
+ .selectAs(Company::getName, Bookings::getDepartmentName)
.selectAs(Rooms::getName, Bookings::getRoomName)
.select("CASE DAYOFWEEK(t.START_TIME)\n" +
"\tWHEN 1 THEN \t\"鏄熸湡鏃" \tWHEN 2 THEN \"鏄熸湡涓�\"\n" +
@@ -1014,8 +1343,7 @@
// .leftJoin(RoomTime.class, RoomTime::getId, BookingTime::getTimeId)
.leftJoin(SystemUser.class, SystemUser::getId, Bookings::getCreator)
.leftJoin(Rooms.class, Rooms::getId, Bookings::getRoomId)
- .leftJoin(SystemDepartmentUser.class, SystemDepartmentUser::getUserId, Bookings::getCreator)
- .leftJoin(SystemDepartment.class, SystemDepartment::getId, SystemDepartmentUser::getDepartmentId)
+ .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
.eq(Objects.nonNull(roomId), Bookings::getRoomId, roomId)
.eq(Bookings::getIsdeleted, MeetConstants.ZERO)
.eq(Bookings::getStatus, MeetConstants.ZERO)
@@ -1086,5 +1414,40 @@
return PageData.from(userStatistics);
}
+ /**
+ * 鏌ヨ鍙備細浜哄憳鍒嗛〉
+ * @param pageWrap
+ * @return
+ */
+ @Override
+ public IPage<UserResponse> getUserPage(PageWrap<UserPageRequest> pageWrap) {
+ IPage<UserResponse> page = systemUserMapper.getUserPage(pageWrap.toPage(),new QueryWrapper<UserResponse>()
+ .and(StringUtils.isNotBlank(pageWrap.getModel().getKeyword()), i -> i.like("c.realName", pageWrap.getModel().getKeyword())
+ .or().like("d.COMPANY_NAME_PATH", pageWrap.getModel().getKeyword())
+ )
+ .eq("c.DELETED",0)
+ .eq("c.status",0)
+ .orderByAsc("c.id")
+ );
+ String path = systemDictDataBiz.queryByCode(Constants.FTP,Constants.FTP_RESOURCE_PATH).getCode()
+ +systemDictDataBiz.queryByCode(Constants.FTP,Constants.MEMBER_IMG).getCode();
+ //鏌ヨ鏄惁澶勪簬浼氳涓�
+ page.getRecords().forEach(j->{
+ j.setPrefixUrl(path);
+ if(bookingsMapper.selectCount(new QueryWrapper<Bookings>()
+ .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")
+ )
+ )>Constants.ZERO){
+ j.setStatus(Constants.ONE);
+ }else{
+ j.setStatus(Constants.ZERO);
+ }
+ });
+ return page;
+ }
+
+
}
--
Gitblit v1.9.3