From 0b3ff378a9faaf9d7a4831b7f0de67378fe0dfea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 30 五月 2023 12:20:15 +0800
Subject: [PATCH] optimize 统计
---
service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java | 39 +++++++++++++++++++++++++++++++++++++--
1 files changed, 37 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
old mode 100644
new mode 100755
index f73f93d..d9c625b
--- a/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
+++ b/service-fee/src/main/java/com/java110/fee/api/ImportFeeApi.java
@@ -2,7 +2,8 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.importFee.ImportFeeDto;
-import com.java110.dto.importFeeDetail.ImportFeeDetailDto;
+import com.java110.dto.importFee.ImportFeeDetailDto;
+import com.java110.fee.bmo.importFee.IFeeSharingBMO;
import com.java110.fee.bmo.importFee.IGetImportFeeBMO;
import com.java110.fee.bmo.importFeeDetail.IDeleteImportFeeDetailBMO;
import com.java110.fee.bmo.importFeeDetail.IGetImportFeeDetailBMO;
@@ -32,6 +33,9 @@
@Autowired
private IGetImportFeeBMO getImportFeeBMOImpl;
+
+ @Autowired
+ private IFeeSharingBMO feeSharingBMOImpl;
/**
* 寰俊淇濆瓨娑堟伅妯℃澘
@@ -104,7 +108,8 @@
@RequestParam(value = "floorNum", required = false) String floorNum,
@RequestParam(value = "unitNum", required = false) String unitNum,
@RequestParam(value = "roomNum", required = false) String roomNum,
- @RequestParam(value = "importFeeId") String importFeeId) {
+ @RequestParam(value = "feeId", required = false) String feeId,
+ @RequestParam(value = "importFeeId", required = false) String importFeeId) {
ImportFeeDetailDto importFeeDetailDto = new ImportFeeDetailDto();
importFeeDetailDto.setPage(page);
importFeeDetailDto.setRow(row);
@@ -113,6 +118,7 @@
importFeeDetailDto.setFloorNum(floorNum);
importFeeDetailDto.setUnitNum(unitNum);
importFeeDetailDto.setRoomNum(roomNum);
+ importFeeDetailDto.setFeeId(feeId);
return getImportFeeDetailBMOImpl.get(importFeeDetailDto);
}
@@ -140,4 +146,33 @@
importFeeDto.setCommunityId(communityId);
return getImportFeeBMOImpl.get(importFeeDto);
}
+
+ /**
+ * 璐圭敤鍏憡
+ *
+ * @param reqJson 鍏憡淇℃伅
+ * @return
+ * @serviceCode /importFee/feeSharing
+ * @path /app/importFee/feeSharing
+ */
+ @RequestMapping(value = "/feeSharing", method = RequestMethod.POST)
+ public ResponseEntity<String> feeSharing(@RequestBody String reqJson,
+ @RequestHeader(value = "store-id") String storeId,
+ @RequestHeader(value = "user-id") String userId) {
+ JSONObject reqObj = JSONObject.parseObject(reqJson);
+ Assert.hasKeyAndValue(reqObj, "communityId", "鏈寘鍚皬鍖篒D");
+ Assert.hasKeyAndValue(reqObj, "totalDegrees", "鏈寘鍚娇鐢ㄩ噺");
+ Assert.hasKeyAndValue(reqObj, "scope", "鏈寘鍚叕鎽婅寖鍥�");
+ Assert.hasKeyAndValue(reqObj, "formulaId", "鏈寘鍚叕鎽婂叕寮�");
+ Assert.hasKeyAndValue(reqObj, "feeName", "鏈寘鍚垂鐢ㄥ悕绉�");
+ Assert.hasKeyAndValue(reqObj, "startTime", "鏈寘鍚紑濮嬫椂闂�");
+ Assert.hasKeyAndValue(reqObj, "endTime", "鏈寘鍚粨鏉熸椂闂�");
+ Assert.hasKeyAndValue(reqObj, "objId", "鏈寘鍚叕鎽婂璞�");
+ Assert.hasKeyAndValue(reqObj, "feeTypeCd", "鏈寘鍚垂鐢ㄧ被鍨�");
+ Assert.hasKeyAndValue(reqObj, "roomType", "鏈寘鍚埧灞嬬被鍨�");
+ reqObj.put("storeId", storeId);
+ reqObj.put("userId", userId);
+
+ return feeSharingBMOImpl.share(reqObj);
+ }
}
--
Gitblit v1.8.0