java110
2021-08-23 1d4e7dc07b0ef56d852a02ffc6f02df0d28d4549
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
old mode 100644 new mode 100755
@@ -3,7 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeReceipt.FeeReceiptDto;
import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
import com.java110.dto.feeReceiptDetail.FeeReceiptDetailDto;
import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
@@ -125,8 +125,11 @@
                                                  @RequestParam(value = "objType", required = false) String objType,
                                                  @RequestParam(value = "objId", required = false) String objId,
                                                  @RequestParam(value = "roomId", required = false) String roomId,
                                                  @RequestParam(value = "payObjId", required = false) String payObjId,
                                                  @RequestParam(value = "receiptId", required = false) String receiptId,
                                                  @RequestParam(value = "receiptIds", required = false) String receiptIds,
                                                  @RequestParam(value = "qstartTime", required = false) String qstartTime,
                                                  @RequestParam(value = "qendTime", required = false) String qendTime,
                                                  @RequestParam(value = "page") int page,
                                                  @RequestParam(value = "row") int row,
                                                  @RequestHeader(value = "user_id") String userId) {
@@ -150,6 +153,13 @@
        feeReceiptDto.setObjName(roomId);
        feeReceiptDto.setObjId(objId);
        feeReceiptDto.setStoreName(storeName);
        feeReceiptDto.setPayObjId(payObjId);
        if (!StringUtil.isEmpty(qstartTime)) {
            feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
        }
        if (!StringUtil.isEmpty(qendTime)) {
            feeReceiptDto.setQendTime(qendTime + " 23:59:59");
        }
        return getFeeReceiptBMOImpl.get(feeReceiptDto);
    }
@@ -159,8 +169,8 @@
     *
     * @param communityId 小区ID
     * @return
     * @serviceCode /feeReceipt/queryFeeReceipt
     * @path /app/feeReceipt/queryFeeReceipt
     * @serviceCode /feeReceipt/queryFeeReceiptNew
     * @path /app/feeReceipt/queryFeeReceiptNew
     */
    @RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
    public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,