From c2b97e88614a8c0bb641848a4d868f54cb8382df Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 14 二月 2023 17:21:24 +0800
Subject: [PATCH] 1、优化访客预约2、优化报修设置3、优化缴费明细4、其他相关页面bug调整
---
service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
index ac2955c..21ec75e 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
@@ -10,11 +10,9 @@
import com.java110.dto.RoomDto;
import com.java110.dto.UnitDto;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IMenuInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.intf.community.*;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.utils.constant.ResponseConstant;
@@ -84,6 +82,9 @@
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
@Autowired
+ private IDataPrivilegeUnitV1InnerServiceSMO dataPrivilegeUnitV1InnerServiceSMOImpl;
+
+ @Autowired
private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
protected static final int MAX_ROW = 10000;
@@ -126,6 +127,15 @@
// roomDto.setRoomNumLike("");
// }
// }
+
+ //鍛樺伐鏁版嵁鏉冮檺
+ String staffId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ DataPrivilegeStaffDto dataPrivilegeStaffDto = new DataPrivilegeStaffDto();
+ dataPrivilegeStaffDto.setStaffId(staffId);
+ String[] unitIds = dataPrivilegeUnitV1InnerServiceSMOImpl.queryDataPrivilegeUnitsByStaff(dataPrivilegeStaffDto);
+
+
+
String roomId = "";
String unitId = "";
if (reqJson.containsKey("flag") && "0".equals(reqJson.getString("flag"))
@@ -141,6 +151,9 @@
UnitDto unitDto = new UnitDto();
unitDto.setFloorId(floor.getFloorId());
unitDto.setUnitNum(reqJson.getString("unitNum"));
+ if(unitIds != null && unitIds.length>0){
+ unitDto.setUnitIds(unitIds);
+ }
List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
if (unitDtos != null && unitDtos.size() > 0) {
for (UnitDto unit : unitDtos) {
@@ -197,6 +210,11 @@
}
}
ApiRoomVo apiRoomVo = new ApiRoomVo();
+
+ //鍛樺伐鏄惁 鏈夋潈闄愭煡璇�
+ if(unitIds != null && unitIds.length>0){
+ roomDto.setUnitIds(unitIds);
+ }
//鏌ヨ鎬昏褰曟暟
int total = roomInnerServiceSMOImpl.queryRoomsCount(roomDto);
apiRoomVo.setTotal(total);
--
Gitblit v1.8.0