Merge branch 'usky-zyj' of uskycloud/usky-modules into server-165

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingInfoServiceImpl.java

@@ -319,82 +319,83 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
                 }
             }
         }
-
-        LambdaQueryWrapper<MeetingInfo> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()),MeetingInfo::getRoomName,requestVO.getRoomName())
-                .in(CollectionUtils.isNotEmpty(initiatorIdList),MeetingInfo::getInitiatorId,initiatorIdList)
-                .eq(null != requestVO.getMeetingStatus(),MeetingInfo::getMeetingStatus,requestVO.getMeetingStatus())
-                .eq(null != requestVO.getApproveStatus(),MeetingInfo::getApproveStatus,requestVO.getApproveStatus())
-                .between(StringUtils.isNotBlank(requestVO.getStartDate()) && StringUtils.isNotBlank(requestVO.getEndDate()),MeetingInfo::getStartDate,requestVO.getStartDate(),requestVO.getEndDate())
-                .between(StringUtils.isNotBlank(requestVO.getStartDate()) && StringUtils.isNotBlank(requestVO.getEndDate()),MeetingInfo::getEndDate,requestVO.getStartDate(),requestVO.getEndDate())
-                .eq(MeetingInfo::getTenantId,SecurityUtils.getTenantId())
-                .orderByDesc(MeetingInfo::getMeetingId);
-        page = this.page(page,queryWrapper);
-        if(page.getRecords().size() > 0){
-            List<Long> roomIdList = new ArrayList<>();
-            List<Long> initIdList = new ArrayList<>();
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                if(!roomIdList.contains(page.getRecords().get(i).getRoomId())){
-                    roomIdList.add(page.getRecords().get(i).getRoomId());
-                }
-                if(!initIdList.contains(page.getRecords().get(i).getInitiatorId())){
-                    initIdList.add(Long.valueOf(page.getRecords().get(i).getInitiatorId()));
-                }
-            }
-            //房间以及对应楼层信息
-            if(roomIdList.size() > 0){
-                LambdaQueryWrapper<MeetingRoom> meetingRoomQuery = Wrappers.lambdaQuery();
-                meetingRoomQuery.in(MeetingRoom::getRoomId,roomIdList)
-                        .eq(MeetingRoom::getTenantId,SecurityUtils.getTenantId())
-                        .eq(MeetingRoom::getStatus,0);
-                List<MeetingRoom> meetingRoomList = meetingRoomMapper.selectList(meetingRoomQuery);
-
-                List<Long> floorIdList = new ArrayList<>();
-                if(meetingRoomList.size() > 0){
-                    for (int i = 0; i < meetingRoomList.size(); i++) {
-                        if(!floorIdList.contains(meetingRoomList.get(i).getFloorId())){
-                            floorIdList.add(meetingRoomList.get(i).getFloorId());
-                        }
+        if(CollectionUtils.isNotEmpty(initiatorIdList)){
+            LambdaQueryWrapper<MeetingInfo> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()),MeetingInfo::getRoomName,requestVO.getRoomName())
+                    .in(CollectionUtils.isNotEmpty(initiatorIdList),MeetingInfo::getInitiatorId,initiatorIdList)
+                    .eq(null != requestVO.getMeetingStatus(),MeetingInfo::getMeetingStatus,requestVO.getMeetingStatus())
+                    .eq(null != requestVO.getApproveStatus(),MeetingInfo::getApproveStatus,requestVO.getApproveStatus())
+                    .between(StringUtils.isNotBlank(requestVO.getStartDate()) && StringUtils.isNotBlank(requestVO.getEndDate()),MeetingInfo::getStartDate,requestVO.getStartDate(),requestVO.getEndDate())
+                    .between(StringUtils.isNotBlank(requestVO.getStartDate()) && StringUtils.isNotBlank(requestVO.getEndDate()),MeetingInfo::getEndDate,requestVO.getStartDate(),requestVO.getEndDate())
+                    .eq(MeetingInfo::getTenantId,SecurityUtils.getTenantId())
+                    .orderByDesc(MeetingInfo::getMeetingId);
+            page = this.page(page,queryWrapper);
+            if(page.getRecords().size() > 0){
+                List<Long> roomIdList = new ArrayList<>();
+                List<Long> initIdList = new ArrayList<>();
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    if(!roomIdList.contains(page.getRecords().get(i).getRoomId())){
+                        roomIdList.add(page.getRecords().get(i).getRoomId());
                     }
-                    LambdaQueryWrapper<MeetingFloor> floorWrapper = Wrappers.lambdaQuery();
-                    floorWrapper.in(MeetingFloor::getFloorId,floorIdList)
-                            .eq(MeetingFloor::getTenantId,SecurityUtils.getTenantId());
-                    List<MeetingFloor> meetingFloorList = meetingFloorMapper.selectList(floorWrapper);
-                    for (int i = 0; i < page.getRecords().size(); i++) {
-                        for (int j = 0; j < meetingRoomList.size(); j++) {
-                            if(page.getRecords().get(i).getRoomId().equals(meetingRoomList.get(j).getRoomId())){
-                                page.getRecords().get(i).setRoomInfo(meetingRoomList.get(j));
-                                break;
+                    if(!initIdList.contains(page.getRecords().get(i).getInitiatorId())){
+                        initIdList.add(Long.valueOf(page.getRecords().get(i).getInitiatorId()));
+                    }
+                }
+                //房间以及对应楼层信息
+                if(roomIdList.size() > 0){
+                    LambdaQueryWrapper<MeetingRoom> meetingRoomQuery = Wrappers.lambdaQuery();
+                    meetingRoomQuery.in(MeetingRoom::getRoomId,roomIdList)
+                            .eq(MeetingRoom::getTenantId,SecurityUtils.getTenantId())
+                            .eq(MeetingRoom::getStatus,0);
+                    List<MeetingRoom> meetingRoomList = meetingRoomMapper.selectList(meetingRoomQuery);
+
+                    List<Long> floorIdList = new ArrayList<>();
+                    if(meetingRoomList.size() > 0){
+                        for (int i = 0; i < meetingRoomList.size(); i++) {
+                            if(!floorIdList.contains(meetingRoomList.get(i).getFloorId())){
+                                floorIdList.add(meetingRoomList.get(i).getFloorId());
                             }
                         }
-                        for (int j = 0; j < meetingFloorList.size(); j++) {
-                            if(page.getRecords().get(i).getRoomInfo().getFloorId().equals(meetingFloorList.get(j).getFloorId())){
-                                page.getRecords().get(i).getRoomInfo().setMeetingFloor(meetingFloorList.get(j));
-                                break;
+                        LambdaQueryWrapper<MeetingFloor> floorWrapper = Wrappers.lambdaQuery();
+                        floorWrapper.in(MeetingFloor::getFloorId,floorIdList)
+                                .eq(MeetingFloor::getTenantId,SecurityUtils.getTenantId());
+                        List<MeetingFloor> meetingFloorList = meetingFloorMapper.selectList(floorWrapper);
+                        for (int i = 0; i < page.getRecords().size(); i++) {
+                            for (int j = 0; j < meetingRoomList.size(); j++) {
+                                if(page.getRecords().get(i).getRoomId().equals(meetingRoomList.get(j).getRoomId())){
+                                    page.getRecords().get(i).setRoomInfo(meetingRoomList.get(j));
+                                    break;
+                                }
+                            }
+                            for (int j = 0; j < meetingFloorList.size(); j++) {
+                                if(page.getRecords().get(i).getRoomInfo().getFloorId().equals(meetingFloorList.get(j).getFloorId())){
+                                    page.getRecords().get(i).getRoomInfo().setMeetingFloor(meetingFloorList.get(j));
+                                    break;
+                                }
                             }
                         }
                     }
                 }
-            }
-            //发起人信息
-            if(initIdList.size() > 0){
-                LambdaQueryWrapper<SysUser> initIdQuery = Wrappers.lambdaQuery();
-                initIdQuery.in(SysUser::getUserId,initIdList)
-                        .eq(SysUser::getTenantId,SecurityUtils.getTenantId());
-                List<SysUser> userList = sysUserService.list(initIdQuery);
-                if(userList.size() > 0){
-                    for (int i = 0; i < page.getRecords().size(); i++) {
-                        for (int j = 0; j < userList.size(); j++) {
-                            if(page.getRecords().get(i).getInitiatorId().equals(userList.get(j).getUserId().toString())){
-                                page.getRecords().get(i).setInitiatorUser(userList.get(j));
-                                break;
+                //发起人信息
+                if(initIdList.size() > 0){
+                    LambdaQueryWrapper<SysUser> initIdQuery = Wrappers.lambdaQuery();
+                    initIdQuery.in(SysUser::getUserId,initIdList)
+                            .eq(SysUser::getTenantId,SecurityUtils.getTenantId());
+                    List<SysUser> userList = sysUserService.list(initIdQuery);
+                    if(userList.size() > 0){
+                        for (int i = 0; i < page.getRecords().size(); i++) {
+                            for (int j = 0; j < userList.size(); j++) {
+                                if(page.getRecords().get(i).getInitiatorId().equals(userList.get(j).getUserId().toString())){
+                                    page.getRecords().get(i).setInitiatorUser(userList.get(j));
+                                    break;
+                                }
                             }
                         }
                     }
                 }
-            }
 
 
+            }
         }
 
         return new CommonPage<>(page.getRecords(),page.getTotal(),requestVO.getSize(),requestVO.getCurrent());
@@ -404,6 +405,7 @@ public class MeetingInfoServiceImpl extends AbstractCrudService<MeetingInfoMappe
     public void cancel(Long meetingId){
         MeetingInfo one = this.getById(meetingId);
         one.setIsCancel(1);
+        one.setMeetingStatus(2);
         this.updateById(one);
     }
 

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/impl/MeetingRoomServiceImpl.java

@@ -94,43 +94,44 @@ public class MeetingRoomServiceImpl extends AbstractCrudService<MeetingRoomMappe
             }
         }
 
-        LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
-        queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
-                .eq(StringUtils.isNotBlank(floorId), MeetingRoom::getFloorId, floorId)
-                .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())
-                .eq(null != requestVO.getRoomStatus(), MeetingRoom::getRoomStatus, requestVO.getRoomStatus())
-                .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId())
-                .orderByDesc(MeetingRoom::getRoomId);
-        page = this.page(page, queryWrapper);
-        if (CollectionUtils.isNotEmpty(page.getRecords())) {
-            //查询楼层信息和本地存储信息
-            List<Long> floorIdList = new ArrayList<>();
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                Long floorId1 = page.getRecords().get(i).getFloorId();
-                if (!floorIdList.contains(floorId1)) {
-                    floorIdList.add(floorId1);
+        if(StringUtils.isNotBlank(floorId)){
+            LambdaQueryWrapper<MeetingRoom> queryWrapper = Wrappers.lambdaQuery();
+            queryWrapper.like(StringUtils.isNotBlank(requestVO.getRoomName()), MeetingRoom::getRoomName, requestVO.getRoomName())
+                    .eq(StringUtils.isNotBlank(floorId), MeetingRoom::getFloorId, floorId)
+                    .eq(null != requestVO.getStatus(), MeetingRoom::getStatus, requestVO.getStatus())
+                    .eq(null != requestVO.getRoomStatus(), MeetingRoom::getRoomStatus, requestVO.getRoomStatus())
+                    .eq(MeetingRoom::getTenantId, SecurityUtils.getTenantId())
+                    .orderByDesc(MeetingRoom::getRoomId);
+            page = this.page(page, queryWrapper);
+            if (CollectionUtils.isNotEmpty(page.getRecords())) {
+                //查询楼层信息和本地存储信息
+                List<Long> floorIdList = new ArrayList<>();
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    Long floorId1 = page.getRecords().get(i).getFloorId();
+                    if (!floorIdList.contains(floorId1)) {
+                        floorIdList.add(floorId1);
+                    }
                 }
-            }
-            LambdaQueryWrapper<MeetingFloor> floorQuery = Wrappers.lambdaQuery();
-            floorQuery.in(CollectionUtils.isNotEmpty(floorIdList), MeetingFloor::getFloorId, floorIdList)
-                    .eq(MeetingFloor::getTenantId, SecurityUtils.getTenantId());
-            List<MeetingFloor> floorList = dmFloorService.list(floorQuery);
-
-            //会议室匹配对应楼层信息和本地存储信息
-            for (int i = 0; i < page.getRecords().size(); i++) {
-                if (CollectionUtils.isNotEmpty(floorList)) {
-                    Long frId = Long.valueOf(page.getRecords().get(i).getFloorId());
-                    for (int j = 0; j < floorList.size(); j++) {
-                        if (frId.equals(floorList.get(j).getFloorId())) {
-                            page.getRecords().get(i).setMeetingFloor(floorList.get(j));
-                            break;
+                LambdaQueryWrapper<MeetingFloor> floorQuery = Wrappers.lambdaQuery();
+                floorQuery.in(CollectionUtils.isNotEmpty(floorIdList), MeetingFloor::getFloorId, floorIdList)
+                        .eq(MeetingFloor::getTenantId, SecurityUtils.getTenantId());
+                List<MeetingFloor> floorList = dmFloorService.list(floorQuery);
+
+                //会议室匹配对应楼层信息和本地存储信息
+                for (int i = 0; i < page.getRecords().size(); i++) {
+                    if (CollectionUtils.isNotEmpty(floorList)) {
+                        Long frId = Long.valueOf(page.getRecords().get(i).getFloorId());
+                        for (int j = 0; j < floorList.size(); j++) {
+                            if (frId.equals(floorList.get(j).getFloorId())) {
+                                page.getRecords().get(i).setMeetingFloor(floorList.get(j));
+                                break;
+                            }
                         }
                     }
                 }
             }
         }
 
-
         return new CommonPage<>(page.getRecords(), page.getTotal(), requestVO.getSize(), requestVO.getCurrent());
     }