1、优化访客预约2、优化报修设置3、优化缴费明细4、其他相关页面bug调整

xiaogang

2023-02-14 c2b97e88614a8c0bb641848a4d868f54cb8382df

 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);