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

java110

2022-03-12 db689e5e2cb730b2cf08796fa224084f00758a71

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

old mode 100644
new mode 100755
@@ -2,12 +2,13 @@

import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeManualCollection.FeeManualCollectionDto;
import com.java110.dto.feeManualCollectionDetail.FeeManualCollectionDetailDto;
import com.java110.dto.feeManualCollection.FeeManualCollectionDetailDto;
import com.java110.fee.bmo.feeManualCollection.IDeleteFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.IGetFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.ISaveFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollection.IUpdateFeeManualCollectionBMO;
import com.java110.fee.bmo.feeManualCollectionDetail.IDeleteFeeManualCollectionDetailBMO;
import com.java110.fee.bmo.feeManualCollectionDetail.IGetExportCollectionBMO;
import com.java110.fee.bmo.feeManualCollectionDetail.IGetFeeManualCollectionDetailBMO;
import com.java110.fee.bmo.feeManualCollectionDetail.ISaveFeeManualCollectionDetailBMO;
import com.java110.fee.bmo.feeManualCollectionDetail.IUpdateFeeManualCollectionDetailBMO;
@@ -48,6 +49,9 @@
    @Autowired
    private IGetFeeManualCollectionDetailBMO getFeeManualCollectionDetailBMOImpl;

    @Autowired
    private IGetExportCollectionBMO getExportCollectionBMOImpl;

    /**
     * 微信保存消息模板
     *
@@ -61,7 +65,7 @@

        Assert.hasKeyAndValue(reqJson, "communityId", "请求报文中未包含communityId");
        Assert.hasKeyAndValue(reqJson, "roomId", "请求报文中未包含roomId");
        Assert.hasKeyAndValue(reqJson, "ownerId", "请求报文中未包含ownerId");
        //Assert.hasKeyAndValue(reqJson, "ownerId", "请求报文中未包含ownerId");


        FeeManualCollectionPo feeManualCollectionPo = BeanConvertUtil.covertBean(reqJson, FeeManualCollectionPo.class);
@@ -101,7 +105,7 @@
    public ResponseEntity<String> deleteFeeManualCollection(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "receiptId", "receiptId不能为空");
        Assert.hasKeyAndValue(reqJson, "collectionId", "collectionId不能为空");


        FeeManualCollectionPo feeManualCollectionPo = BeanConvertUtil.covertBean(reqJson, FeeManualCollectionPo.class);
@@ -179,11 +183,11 @@
     *
     * @param reqJson
     * @return
     * @serviceCode /feeManualCollection/deleteFeeManualCollectionDetail
     * @path /app/feeManualCollection/deleteFeeManualCollectionDetail
     * @serviceCode /feeManualCollection/deleteCollectionDetail
     * @path /app/feeManualCollection/deleteCollectionDetail
     */
    @RequestMapping(value = "/deleteFeeManualCollectionDetail", method = RequestMethod.POST)
    public ResponseEntity<String> deleteFeeManualCollectionDetail(@RequestBody JSONObject reqJson) {
    @RequestMapping(value = "/deleteCollectionDetail", method = RequestMethod.POST)
    public ResponseEntity<String> deleteCollectionDetail(@RequestBody JSONObject reqJson) {
        Assert.hasKeyAndValue(reqJson, "communityId", "小区ID不能为空");

        Assert.hasKeyAndValue(reqJson, "detailId", "detailId不能为空");
@@ -198,14 +202,14 @@
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /feeManualCollection/queryFeeManualCollectionDetail
     * @path /app/feeManualCollection/queryFeeManualCollectionDetail
     * @serviceCode /feeManualCollection/queryCollectionDetail
     * @path /app/feeManualCollection/queryCollectionDetail
     */
    @RequestMapping(value = "/queryFeeManualCollectionDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryFeeManualCollectionDetail(@RequestParam(value = "communityId") String communityId,
                                                                 @RequestParam(value = "collectionId", required = false) String collectionId,
                                                                 @RequestParam(value = "page") int page,
                                                                 @RequestParam(value = "row") int row) {
    @RequestMapping(value = "/queryCollectionDetail", method = RequestMethod.GET)
    public ResponseEntity<String> queryCollectionDetail(@RequestParam(value = "communityId") String communityId,
                                                        @RequestParam(value = "collectionId", required = false) String collectionId,
                                                        @RequestParam(value = "page") int page,
                                                        @RequestParam(value = "row") int row) {
        FeeManualCollectionDetailDto feeManualCollectionDetailDto = new FeeManualCollectionDetailDto();
        feeManualCollectionDetailDto.setPage(page);
        feeManualCollectionDetailDto.setRow(row);
@@ -213,4 +217,20 @@
        feeManualCollectionDetailDto.setCollectionId(collectionId);
        return getFeeManualCollectionDetailBMOImpl.get(feeManualCollectionDetailDto);
    }

    /**
     * 微信删除消息模板
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /feeManualCollection/queryExportCollections
     * @path /app/feeManualCollection/queryExportCollections
     */
    @RequestMapping(value = "/queryExportCollections", method = RequestMethod.GET)
    public ResponseEntity<String> queryExportCollections(@RequestParam(value = "communityId") String communityId) {
        FeeManualCollectionDetailDto feeManualCollectionDetailDto = new FeeManualCollectionDetailDto();
        feeManualCollectionDetailDto.setCommunityId(communityId);

        return getExportCollectionBMOImpl.get(feeManualCollectionDetailDto);
    }
}