From 0b04f664887c73e90bf684a4e69c0fdbfe26349d Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 29 三月 2023 13:35:20 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java
old mode 100644
new mode 100755
index 737697d..85ddd7e
--- a/service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeManualCollectionApi.java
@@ -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;
@@ -47,6 +48,9 @@
@Autowired
private IGetFeeManualCollectionDetailBMO getFeeManualCollectionDetailBMOImpl;
+
+ @Autowired
+ private IGetExportCollectionBMO getExportCollectionBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -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);
+ }
}
--
Gitblit v1.8.0