|
@@ -113,19 +113,6 @@ public class MeetingServiceImpl implements MeetingService {
|
|
|
|
|
|
return compareChineseNumbers(number1, number2);
|
|
|
});
|
|
|
- for (MeetingVo vo : vos) {
|
|
|
- if("一会议室".equals(vo.getFixedData())){
|
|
|
- vo.setFloor("6楼");
|
|
|
- } else if ("二会议室".equals(vo.getFixedData())) {
|
|
|
- vo.setFloor("6楼");
|
|
|
- }else if ("三会议室".equals(vo.getFixedData())) {
|
|
|
- vo.setFloor("4楼");
|
|
|
- }else if ("四会议室".equals(vo.getFixedData())) {
|
|
|
- vo.setFloor("3楼");
|
|
|
- }else if ("五会议室".equals(vo.getFixedData())) {
|
|
|
- vo.setFloor("2楼");
|
|
|
- }
|
|
|
- }
|
|
|
UserInfoVO vo = new UserInfoVO();
|
|
|
vo.setSystem("dingding");
|
|
|
vo.setContractId(1L);
|
|
@@ -147,8 +134,8 @@ public class MeetingServiceImpl implements MeetingService {
|
|
|
// 提取会议室名称中的中文数字部分
|
|
|
private String extractChineseNumber(String roomName) {
|
|
|
// 假设格式为 "一会议室"、"二会议室" 等,提取前面的中文数字
|
|
|
- if (roomName != null && roomName.endsWith("会议室")) {
|
|
|
- return roomName.substring(0, roomName.length() - 3); // 去掉"会议室"三个字
|
|
|
+ if (roomName != null) {
|
|
|
+ return roomName.substring(0, 1); // 去掉"会议室"三个字
|
|
|
}
|
|
|
return roomName;
|
|
|
}
|