From db689e5e2cb730b2cf08796fa224084f00758a71 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 12 三月 2022 17:05:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java b/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
old mode 100644
new mode 100755
index 0ddce74..c80eab0
--- a/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/PayFeeAuditApi.java
@@ -39,7 +39,7 @@
@RequestMapping(value = "/savePayFeeAudit", method = RequestMethod.POST)
public ResponseEntity<String> savePayFeeAudit(@RequestBody JSONObject reqJson,
@RequestHeader(value = "user-id") String userId,
- @RequestHeader(value="user-name")String userName) {
+ @RequestHeader(value = "user-name") String userName) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "feeId", "璇锋眰鎶ユ枃涓湭鍖呭惈feeId");
@@ -105,12 +105,19 @@
*/
@RequestMapping(value = "/queryPayFeeAudit", method = RequestMethod.GET)
public ResponseEntity<String> queryPayFeeAudit(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "payObjType", required = false) String payObjType,
+ @RequestParam(value = "payerObjId", required = false) String payerObjId,
+ @RequestParam(value = "state", required = false) String state,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
+
PayFeeAuditDto payFeeAuditDto = new PayFeeAuditDto();
payFeeAuditDto.setPage(page);
payFeeAuditDto.setRow(row);
payFeeAuditDto.setCommunityId(communityId);
+ payFeeAuditDto.setState(state);
+ payFeeAuditDto.setPayerObjType(payObjType);
+ payFeeAuditDto.setPayerObjId(payerObjId);
return getPayFeeAuditBMOImpl.get(payFeeAuditDto);
}
}
--
Gitblit v1.8.0