1、优化查询，便于模糊查询条件2、界面查询条件调整

xiaogang

2023-11-02 62f2b98b64f6726ca7cb90cbfa996deaac4ffba9

 service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsByOwnerCmd.java

@@ -62,24 +62,17 @@
    @Autowired
    private IRoomInnerServiceSMO roomInnerServiceSMOImpl;


    @Autowired
    private IQueryRoomStatisticsBMO queryRoomStatisticsBMOImpl;



    @Override
    public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException {
        Assert.hasKeyAndValue(reqJson, "communityId", "请求中未包含communityId信息");
        //Assert.jsonObjectHaveKey(reqJson, "ownerId", "请求中未包含ownerId信息");

        Assert.hasLength(reqJson.getString("communityId"), "小区ID不能为空");
        //Assert.hasLength(reqJson.getString("ownerId"), "业主ID不能为空");

        String ownerId = reqJson.getString("ownerId");

        String ownerNameLike = reqJson.getString("ownerNameLike");

        if(StringUtil.isEmpty(ownerId) && StringUtil.isEmpty(ownerNameLike)){
            throw new IllegalArgumentException("未包含业主信息");
        }
@@ -90,6 +83,14 @@

        RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);

        if (reqJson.containsKey("roomNum") && !StringUtil.isEmpty(reqJson.getString("roomNum"))) {
            String[] roomNums = reqJson.getString("roomNum").split("-");
            if (roomNums != null && roomNums.length == 3) {
                roomDto.setFloorNum(roomNums[0]);
                roomDto.setUnitNum(roomNums[1]);
                roomDto.setRoomNum(roomNums[2]);
            }
        }
        ApiRoomVo apiRoomVo = new ApiRoomVo();
        List<RoomDto> roomDtoList = roomInnerServiceSMOImpl.queryRoomsByOwner(roomDto);
        roomDtoList = queryRoomStatisticsBMOImpl.queryRoomOweFee(roomDtoList);