From 8954429263a75e3c7d19db20a60370fca005f2bd Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 08 八月 2023 15:44:49 +0800
Subject: [PATCH] 优化代码
---
service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 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 827d549..3cc690d 100755
--- a/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeReceiptApi.java
@@ -1,9 +1,9 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.feeReceipt.FeeReceiptDto;
-import com.java110.dto.feeReceipt.FeeReceiptDtoNew;
-import com.java110.dto.feeReceipt.FeeReceiptDetailDto;
+import com.java110.dto.fee.FeeReceiptDto;
+import com.java110.dto.fee.FeeReceiptDtoNew;
+import com.java110.dto.fee.FeeReceiptDetailDto;
import com.java110.dto.store.StoreUserDto;
import com.java110.fee.bmo.feeReceipt.IDeleteFeeReceiptBMO;
import com.java110.fee.bmo.feeReceipt.IGetFeeReceiptBMO;
@@ -14,8 +14,8 @@
import com.java110.fee.bmo.feeReceiptDetail.ISaveFeeReceiptDetailBMO;
import com.java110.fee.bmo.feeReceiptDetail.IUpdateFeeReceiptDetailBMO;
import com.java110.intf.store.IStoreInnerServiceSMO;
-import com.java110.po.feeReceipt.FeeReceiptPo;
-import com.java110.po.feeReceiptDetail.FeeReceiptDetailPo;
+import com.java110.po.fee.FeeReceiptPo;
+import com.java110.po.fee.FeeReceiptDetailPo;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.StringUtil;
@@ -131,6 +131,7 @@
@RequestParam(value = "detailIds", required = false) String detailIds,
@RequestParam(value = "qstartTime", required = false) String qstartTime,
@RequestParam(value = "qendTime", required = false) String qendTime,
+ @RequestParam(value = "feeId", required = false) String feeId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row,
@RequestHeader(value = "user_id") String userId) {
@@ -158,6 +159,7 @@
feeReceiptDto.setObjId(objId);
feeReceiptDto.setStoreName(storeName);
feeReceiptDto.setPayObjId(payObjId);
+ feeReceiptDto.setFeeId(feeId);
if (!StringUtil.isEmpty(qstartTime)) {
feeReceiptDto.setQstartTime(qstartTime + " 00:00:00");
}
@@ -270,6 +272,7 @@
@RequestParam(value = "receiptId", required = false) String receiptId,
@RequestParam(value = "receiptIds", required = false) String receiptIds,
@RequestParam(value = "detailIds", required = false) String detailIds,
+ @RequestParam(value = "orderBy", required = false) String orderBy,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeReceiptDetailDto feeReceiptDetailDto = new FeeReceiptDetailDto();
@@ -277,6 +280,7 @@
feeReceiptDetailDto.setRow(row);
feeReceiptDetailDto.setCommunityId(communityId);
feeReceiptDetailDto.setReceiptId(receiptId);
+ feeReceiptDetailDto.setOrderBy(orderBy);
if (!StringUtil.isEmpty(receiptIds)) {
feeReceiptDetailDto.setReceiptIds(receiptIds.split(","));
}
--
Gitblit v1.8.0