From 4023de1e3863c1c23a739a4bad551256771b442a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 10 十二月 2020 10:51:38 +0800
Subject: [PATCH] 优化 时间代码
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
index 5db07c8..b17868e 100644
--- a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
@@ -2,6 +2,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.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
@@ -113,7 +114,9 @@
*/
@RequestMapping(value = "/queryFeeReceipt", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceipt(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "receiptId") String receiptId,
+ @RequestParam(value = "objType",required = false) String objType,
+ @RequestParam(value = "roomId",required = false) String roomId,
+ @RequestParam(value = "receiptId",required = false) String receiptId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDto feeReceiptDto = new FeeReceiptDto();
@@ -121,9 +124,41 @@
feeReceiptDto.setRow(row);
feeReceiptDto.setCommunityId(communityId);
feeReceiptDto.setReceiptId(receiptId);
+ feeReceiptDto.setObjType(objType);
+ feeReceiptDto.setObjName(roomId);
return getFeeReceiptBMOImpl.get(feeReceiptDto);
}
+
+ /**
+ * 寰俊鍒犻櫎娑堟伅妯℃澘
+ *
+ * @param communityId 灏忓尯ID
+ * @return
+ * @serviceCode /feeReceipt/queryFeeReceipt
+ * @path /app/feeReceipt/queryFeeReceipt
+ */
+ @RequestMapping(value = "/queryFeeReceiptNew", method = RequestMethod.GET)
+ public ResponseEntity<String> queryFeeReceiptNew(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "objType",required = false) String objType,
+ @RequestParam(value = "roomName",required = false) String roomName,
+ @RequestParam(value = "type",required = false) String type,
+ @RequestParam(value = "qstartTime",required = false) String qstartTime,
+ @RequestParam(value = "qendTime",required = false) String qendTime,
+ @RequestParam(value = "page") int page,
+ @RequestParam(value = "row") int row
+ ) {
+ FeeReceiptDtoNew feeReceiptDto = new FeeReceiptDtoNew();
+ feeReceiptDto.setPage(page);
+ feeReceiptDto.setRow(row);
+ feeReceiptDto.setCommunityId(communityId);
+ feeReceiptDto.setType(type);
+ feeReceiptDto.setQstartTime(qstartTime);
+ feeReceiptDto.setQendTime(qendTime);
+ feeReceiptDto.setObjType(objType);
+ feeReceiptDto.setObjName(roomName );
+ return getFeeReceiptBMOImpl.gets(feeReceiptDto);
+ }
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
*
@@ -194,7 +229,7 @@
*/
@RequestMapping(value = "/queryFeeReceiptDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "receiptId") String receiptId,
+ @RequestParam(value = "receiptId",required = false) String receiptId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -204,4 +239,5 @@
feeReceiptDetailDto.setReceiptId(receiptId);
return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
}
+
}
--
Gitblit v1.8.0