From 1d4e7dc07b0ef56d852a02ffc6f02df0d28d4549 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期一, 23 八月 2021 16:58:31 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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
old mode 100644
new mode 100755
index b181920..257344b
--- a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
@@ -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;
@@ -18,6 +18,7 @@
import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -124,7 +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) {
@@ -141,10 +146,20 @@
feeReceiptDto.setRow(row);
feeReceiptDto.setCommunityId(communityId);
feeReceiptDto.setReceiptId(receiptId);
+ if (!StringUtil.isEmpty(receiptIds)) {
+ feeReceiptDto.setReceiptIds(receiptIds.split(","));
+ }
feeReceiptDto.setObjType(objType);
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);
}
@@ -154,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,
@@ -249,6 +264,7 @@
@RequestMapping(value = "/queryFeeReceiptDetail", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeReceiptDetail(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "receiptId", required = false) String receiptId,
+ @RequestParam(value = "receiptIds", required = false) String receiptIds,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -256,6 +272,9 @@
feeReceiptDetailDto.setRow(row);
feeReceiptDetailDto.setCommunityId(communityId);
feeReceiptDetailDto.setReceiptId(receiptId);
+ if (!StringUtil.isEmpty(receiptIds)) {
+ feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
+ }
return getFeeReceiptDetailBMOImpl.get(feeReceiptDetailDto);
}
--
Gitblit v1.8.0