From 54e7f06671f70cee10f82576dbe412a14a957084 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期四, 12 五月 2022 17:25:08 +0800
Subject: [PATCH] 完成巡检 通知员工功能
---
service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
old mode 100644
new mode 100755
index 85ceddd..402c72e
--- a/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeDiscountApi.java
@@ -3,8 +3,8 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.feeDiscount.FeeDiscountDto;
-import com.java110.dto.feeDiscountRule.FeeDiscountRuleDto;
-import com.java110.dto.feeDiscountRuleSpec.FeeDiscountRuleSpecDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleDto;
+import com.java110.dto.feeDiscount.FeeDiscountRuleSpecDto;
import com.java110.dto.payFeeDetailDiscount.PayFeeDetailDiscountDto;
import com.java110.fee.bmo.feeDiscount.IDeleteFeeDiscountBMO;
import com.java110.fee.bmo.feeDiscount.IGetFeeDiscountBMO;
@@ -23,6 +23,8 @@
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+
+import java.text.ParseException;
@RestController
@@ -119,6 +121,9 @@
@RequestMapping(value = "/queryFeeDiscount", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeDiscount(@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "discountType", required = false) String discountType,
+ @RequestParam(value = "discountName", required = false) String discountName,
+ @RequestParam(value = "discountId", required = false) String discountId,
+ @RequestParam(value = "ruleName", required = false) String ruleName,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeDiscountDto feeDiscountDto = new FeeDiscountDto();
@@ -126,6 +131,9 @@
feeDiscountDto.setRow(row);
feeDiscountDto.setCommunityId(communityId);
feeDiscountDto.setDiscountType(discountType);
+ feeDiscountDto.setDiscountName(discountName);
+ feeDiscountDto.setRuleName(ruleName);
+ feeDiscountDto.setDiscountId(discountId);
return getFeeDiscountBMOImpl.get(feeDiscountDto);
}
@@ -179,9 +187,12 @@
public ResponseEntity<String> computeFeeDiscount(@RequestParam(value = "feeId") String feeId,
@RequestParam(value = "communityId") String communityId,
@RequestParam(value = "cycles") double cycles,
+ @RequestParam(value = "payerObjId") String payerObjId,
+ @RequestParam(value = "payerObjType") String payerObjType,
+ @RequestParam(value = "endTime") String endTime,
@RequestParam(value = "page") int page,
- @RequestParam(value = "row") int row) {
- return computeFeeDiscountBMOImpl.compute(feeId, communityId, cycles, page, row);
+ @RequestParam(value = "row") int row) throws ParseException {
+ return computeFeeDiscountBMOImpl.compute(feeId, communityId, cycles, payerObjId, payerObjType, endTime, page, row);
}
--
Gitblit v1.8.0