Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

java110

2021-08-12 4dbf61c9189796ec46d39ac4b839cfc064e70411

 service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java

@@ -98,12 +98,18 @@
     */
    @RequestMapping(value = "/queryFeeCollectionOrder", method = RequestMethod.GET)
    public ResponseEntity<String> queryFeeCollectionOrder(@RequestParam(value = "communityId") String communityId,
                                                          @RequestParam(value = "state",required = false) String state,
                                                          @RequestParam(value = "staffName",required = false) String staffName,
                                                          @RequestParam(value = "collectionWay",required = false) String collectionWay,
                                                          @RequestParam(value = "page") int page,
                                                          @RequestParam(value = "row") int row) {
        FeeCollectionOrderDto feeCollectionOrderDto = new FeeCollectionOrderDto();
        feeCollectionOrderDto.setPage(page);
        feeCollectionOrderDto.setRow(row);
        feeCollectionOrderDto.setCommunityId(communityId);
        feeCollectionOrderDto.setState(state);
        feeCollectionOrderDto.setStaffName(staffName);
        feeCollectionOrderDto.setCollectionWay(collectionWay);
        return getFeeCollectionOrderBMOImpl.get(feeCollectionOrderDto);
    }
}