From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java b/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java
old mode 100644
new mode 100755
index 26ca796..e62b143
--- a/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java
+++ b/service-report/src/main/java/com/java110/report/api/ReportFeeYearCollectionApi.java
@@ -1,10 +1,10 @@
package com.java110.report.api;
import com.alibaba.fastjson.JSONObject;
-import com.java110.dto.reportFeeYearCollection.ReportFeeYearCollectionDto;
-import com.java110.dto.reportFeeYearCollectionDetail.ReportFeeYearCollectionDetailDto;
-import com.java110.po.reportFeeYearCollection.ReportFeeYearCollectionPo;
-import com.java110.po.reportFeeYearCollectionDetail.ReportFeeYearCollectionDetailPo;
+import com.java110.dto.reportFee.ReportFeeYearCollectionDto;
+import com.java110.dto.reportFee.ReportFeeYearCollectionDetailDto;
+import com.java110.po.reportFee.ReportFeeYearCollectionPo;
+import com.java110.po.reportFee.ReportFeeYearCollectionDetailPo;
import com.java110.report.bmo.reportFeeYearCollection.IDeleteReportFeeYearCollectionBMO;
import com.java110.report.bmo.reportFeeYearCollection.IGetReportFeeYearCollectionBMO;
import com.java110.report.bmo.reportFeeYearCollection.ISaveReportFeeYearCollectionBMO;
@@ -116,9 +116,10 @@
*/
@RequestMapping(value = "/queryReportFeeYear", method = RequestMethod.GET)
public ResponseEntity<String> queryReportFeeYear(@RequestParam(value = "communityId") String communityId,
- @RequestParam(value = "objType") String objType,
- @RequestParam(value = "objName",required = false) String objName,
- @RequestParam(value = "configId",required = false) String configId,
+ @RequestParam(value = "objType", required = false) String objType,
+ @RequestParam(value = "feeTypeCd", required = false) String feeTypeCd,
+ @RequestParam(value = "objName", required = false) String objName,
+ @RequestParam(value = "configId", required = false) String configId,
@RequestParam(value = "page") int page,
@RequestParam(value = "row") int row) {
ReportFeeYearCollectionDto reportFeeYearCollectionDto = new ReportFeeYearCollectionDto();
@@ -128,9 +129,9 @@
reportFeeYearCollectionDto.setObjType(objType);
reportFeeYearCollectionDto.setObjName(objName);
reportFeeYearCollectionDto.setConfigId(configId);
+ reportFeeYearCollectionDto.setFeeTypeCd(feeTypeCd);
return getReportFeeYearCollectionBMOImpl.get(reportFeeYearCollectionDto);
}
-
/**
--
Gitblit v1.8.0