From e46395d507a9eb1d4534c61184b4d60dbd75f888 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 18 五月 2023 18:28:27 +0800
Subject: [PATCH] optimize
---
service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java b/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java
index 41666d3..ab41ed6 100644
--- a/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/FeeCollectionOrderApi.java
@@ -1,7 +1,7 @@
package com.java110.fee.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.feeCollectionOrder.FeeCollectionOrderDto;
+import com.java110.dto.fee.FeeCollectionOrderDto;
import com.java110.fee.bmo.feeCollectionOrder.IDeleteFeeCollectionOrderBMO;
import com.java110.fee.bmo.feeCollectionOrder.IGetFeeCollectionOrderBMO;
import com.java110.fee.bmo.feeCollectionOrder.ISaveFeeCollectionOrderBMO;
@@ -12,7 +12,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
-
@RestController
@@ -38,11 +37,13 @@
* @path /app/feeCollectionOrder/saveFeeCollectionOrder
*/
@RequestMapping(value = "/saveFeeCollectionOrder", method = RequestMethod.POST)
- public ResponseEntity<String> saveFeeCollectionOrder(@RequestBody JSONObject reqJson) {
+ public ResponseEntity<String> saveFeeCollectionOrder(
+ @RequestHeader(value = "user-id") String userId,
+ @RequestBody JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈communityId");
Assert.hasKeyAndValue(reqJson, "collectionWay", "璇锋眰鎶ユ枃涓湭鍖呭惈collectionWay");
-
+ reqJson.put("staffId", userId);
FeeCollectionOrderPo feeCollectionOrderPo = BeanConvertUtil.covertBean(reqJson, FeeCollectionOrderPo.class);
return saveFeeCollectionOrderBMOImpl.save(feeCollectionOrderPo);
@@ -97,12 +98,18 @@
*/
@RequestMapping(value = "/queryFeeCollectionOrder", method = RequestMethod.GET)
public ResponseEntity<String> queryFeeCollectionOrder(@RequestParam(value = "communityId") String communityId,
+ @RequestParam(value = "state",required = false) String state,
+ @RequestParam(value = "staffName",required = false) String staffName,
+ @RequestParam(value = "collectionWay",required = false) String collectionWay,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
FeeCollectionOrderDto feeCollectionOrderDto = new FeeCollectionOrderDto();
feeCollectionOrderDto.setPage(page);
feeCollectionOrderDto.setRow(row);
feeCollectionOrderDto.setCommunityId(communityId);
+ feeCollectionOrderDto.setState(state);
+ feeCollectionOrderDto.setStaffName(staffName);
+ feeCollectionOrderDto.setCollectionWay(collectionWay);
return getFeeCollectionOrderBMOImpl.get(feeCollectionOrderDto);
}
}
--
Gitblit v1.8.0