From ace8009da36d622f72e4145eb0b38f0a344f3a45 Mon Sep 17 00:00:00 2001
From: chengf <cgf12138@163.com>
Date: 星期二, 26 八月 2025 13:56:24 +0800
Subject: [PATCH] 暂存0825、
---
service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeePropertyCmd.java | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git a/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeePropertyCmd.java b/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeePropertyCmd.java
index 765d5a0..25d35fe 100644
--- a/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeePropertyCmd.java
+++ b/service-fee/src/main/java/com/java110/fee/cmd/fee/ReportFeePropertyCmd.java
@@ -7,12 +7,14 @@
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.community.CommunityDto;
import com.java110.dto.dict.DictDto;
+import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.fee.FeeDto;
import com.java110.dto.report.ReportQueryRecord;
import com.java110.dto.room.RoomDto;
import com.java110.intf.community.ICommunityInnerServiceSMO;
import com.java110.intf.community.IRoomInnerServiceSMO;
import com.java110.intf.dev.IDictV1InnerServiceSMO;
+import com.java110.intf.fee.IFeeConfigInnerServiceSMO;
import com.java110.intf.fee.IReportFeeInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
@@ -43,6 +45,9 @@
@Autowired
private IRoomInnerServiceSMO roomInnerServiceSMOImpl;
+
+ @Autowired
+ private IFeeConfigInnerServiceSMO feeConfigInnerServiceSMOImpl;
@Override
public void validate(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
@@ -83,10 +88,25 @@
}
else{
-
+ int row = Integer.parseInt(reqJson.containsKey("row")?reqJson.getString("row"):"10");
+ int page = Integer.parseInt(reqJson.containsKey("page")?reqJson.getString("page"):"1");
+ startYear = 2016;
+ endYear = 2025;
+ Object[][] test = new Object[row][];
RoomDto roomDto = new RoomDto();
- roomDto.setRoomId(reqJson.getString("communityId"));
+ roomDto.setCommunityId(reqJson.getString("communityId"));
+ roomDto.setRow(row);
+ roomDto.setPage(page);
List<Map> rooms = roomInnerServiceSMOImpl.queryRoomsAsReport(roomDto);
+ FeeConfigDto feeConfigDto = new FeeConfigDto();
+ feeConfigDto.setCommunityId(reqJson.getString("communityId"));
+ feeConfigDto.setConfigIds(new String[]{"630000001","630000002"});
+ List<FeeConfigDto> feeConfigDtos = feeConfigInnerServiceSMOImpl.queryFeeConfigs(feeConfigDto);
+ int arrLength = 11 + (2 * feeConfigDtos.size()) + 8 + ((endYear - startYear + 1) * 3);
+ String[] header = new String[arrLength];
+ headerDoing(header,feeConfigDtos,startYear,endYear);
+ for(Map room : rooms){
+ }
reportQueryRecord.setCommunityId(reqJson.getString("communityId"));
@@ -105,4 +125,36 @@
context.setResponseEntity(responseEntity);
}
}
+
+ private void headerDoing(String[] header,List<FeeConfigDto> feeConfigDtos,int startYear, int endYear) {
+ int feeRow = feeConfigDtos.size();
+ header[0] = "搴忓彿";
+ header[1] = "鐗╀笟绫诲瀷";
+ header[2] = "妤兼爧鍙�/寮�";
+ header[3] = "闂ㄥ彿";
+ header[4] = "瀹ゅ彿";
+ header[5] = "闂ㄥ鍙�";
+ header[6] = "浜ц瘉鍦板潃";
+ header[7] = "鏀惰垂闈㈢Н锛坢虏锛�";
+ header[8] = "璐埧浜哄鍚�";
+ header[9] = "闂ㄥ鍙�";
+ for (int i=0;i<feeRow;i++){
+ header[9 + i + 1] = feeConfigDtos.get(0).getFeeName();
+ }
+ header[9 + feeRow + 1] = "骞村簲鏀舵";
+ header[9 + feeRow + 2] = "鍚堣(2020骞�1鏈�-鑷充粖)-搴旀敹";
+ header[9 + feeRow + 3] = "鍚堣(2020骞�1鏈�-鑷充粖)-瀹炴敹";
+ header[9 + feeRow + 4] = "鍚堣(2020骞�1鏈�-鑷充粖)-浠ｆ敹";
+ header[9 + feeRow + 5] = "鍚堣(2020骞�1鏈�-鑷充粖)-2026骞�";
+ header[9 + feeRow + 6] = "鍚堣(2020骞�1鏈�-鑷充粖)-2027骞�";
+ header[9 + feeRow + 7] = "鍚堣(2020骞�1鏈�-鑷充粖)-寰呮敹鏈堟暟";
+ header[9 + feeRow + 8] = "鍚堣(2020骞�1鏈�-鑷充粖)-寰呮敹閲戦";
+ header[9 + feeRow + 9] = "浠ｆ敹鍖洪棿";
+ for (int i = startYear ; i <= endYear ; i++){
+ header[9 + feeRow + 9 + ((i - startYear) * 3) + 1] = "鍘嗗勾瀹炴敹"+i+"-宸叉敹鏈堟暟";
+ header[9 + feeRow + 9 + ((i - startYear) * 3) + 2] = "鍘嗗勾瀹炴敹"+i+"-宸叉敹鍖洪棿";
+ header[9 + feeRow + 9 + ((i - startYear) * 3) + 3] = "鍘嗗勾瀹炴敹"+i+"-鏈敹鍖洪棿";
+ }
+ header[9 + feeRow + 9 + ((endYear - startYear) * 3) + 4] = "鎵撴姌閲戦姹囨��";
+ }
}
--
Gitblit v1.8.0