From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java
index 52a2076..58967c7 100644
--- a/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java
@@ -1,12 +1,12 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.feeCollectionOrder.FeeCollectionOrderDto;
+import com.java110.dto.fee.FeeCollectionOrderDto;
import com.java110.fee.bmo.feeCollectionOrder.IDeleteFeeCollectionOrderBMO;
import com.java110.fee.bmo.feeCollectionOrder.IGetFeeCollectionOrderBMO;
import com.java110.fee.bmo.feeCollectionOrder.ISaveFeeCollectionOrderBMO;
import com.java110.fee.bmo.feeCollectionOrder.IUpdateFeeCollectionOrderBMO;
-import com.java110.po.feeCollectionOrder.FeeCollectionOrderPo;
+import com.java110.po.fee.FeeCollectionOrderPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -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);
}
}
--
Gitblit v1.8.0