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/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java | 37 ++++++++++++++++++-------------------
1 files changed, 18 insertions(+), 19 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
index ccd29d8..4907050 100644
--- a/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/reportFeeMonthStatistics/QueryReportFeeSummaryCmd.java
@@ -3,32 +3,16 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.java110.core.annotation.Java110Cmd;
-import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
-import com.java110.dto.data.DataPrivilegeStaffDto;
-import com.java110.dto.fee.FeeConfigDto;
import com.java110.dto.report.QueryStatisticsDto;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
-import com.java110.intf.community.IDataPrivilegeUnitV1InnerServiceSMO;
-import com.java110.intf.report.IReportFeeMonthStatisticsInnerServiceSMO;
-import com.java110.report.bmo.reportFeeMonthStatistics.IGetReportFeeMonthStatisticsBMO;
import com.java110.report.statistics.IBaseDataStatistics;
import com.java110.report.statistics.IFeeStatistics;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
-import com.java110.utils.util.BeanConvertUtil;
-import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
-
-import java.math.BigDecimal;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.List;
/**
* 鏌ヨ 璐圭敤姹囨�昏〃
@@ -75,15 +59,28 @@
queryStatisticsDto.setCommunityId(reqJson.getString("communityId"));
queryStatisticsDto.setStartDate(reqJson.getString("startDate"));
queryStatisticsDto.setEndDate(reqJson.getString("endDate"));
+ if(reqJson.containsKey("endDate") && !reqJson.getString("endDate").contains(":")) {
+ queryStatisticsDto.setEndDate(reqJson.getString("endDate") + " 23:59:59");
+ }
queryStatisticsDto.setConfigId(reqJson.getString("configId"));
queryStatisticsDto.setFloorId(reqJson.getString("floorId"));
queryStatisticsDto.setObjName(reqJson.getString("objName"));
+ queryStatisticsDto.setFeeTypeCd(reqJson.getString("feeTypeCd"));
+ queryStatisticsDto.setOwnerName(reqJson.getString("ownerName"));
+ queryStatisticsDto.setLink(reqJson.getString("link"));
+
+ if(reqJson.containsKey("configIds")){
+ queryStatisticsDto.setConfigIds(reqJson.getString("configIds").split(","));
+ }
//todo 鏌ヨ鍘嗗彶娆犺垂
double hisOweFee = feeStatisticsImpl.getHisMonthOweFee(queryStatisticsDto);
//todo 鏌ヨ 鍗曟湀娆犺垂
double curOweFee = feeStatisticsImpl.getCurMonthOweFee(queryStatisticsDto);
+
+ //todo 鏌ヨ褰撴湀搴旀敹
+ double curReceivableFee = feeStatisticsImpl.getCurReceivableFee(queryStatisticsDto);
//todo 鏌ヨ 娆犺垂杩藉洖
double hisReceivedFee = feeStatisticsImpl.getHisReceivedFee(queryStatisticsDto);
@@ -97,8 +94,8 @@
//todo 鎴垮眿鏁�
long roomCount = baseDataStatisticsImpl.getRoomCount(queryStatisticsDto);
- //todo 绌洪棽鎴垮眿鏁�
- long freeRoomCount = baseDataStatisticsImpl.getFreeRoomCount(queryStatisticsDto);
+ //todo 鏀惰垂鎴垮眿鏁�
+ long feeRoomCount = feeStatisticsImpl.getFeeRoomCount(queryStatisticsDto);
//todo 娆犺垂鎴锋暟
int oweRoomCount = feeStatisticsImpl.getOweRoomCount(queryStatisticsDto);
@@ -110,8 +107,10 @@
data.put("preReceivedFee", preReceivedFee);
data.put("receivedFee", receivedFee);
data.put("roomCount", roomCount);
- data.put("freeRoomCount", freeRoomCount);
+ data.put("feeRoomCount", feeRoomCount);
data.put("oweRoomCount", oweRoomCount);
+ data.put("curReceivableFee", curReceivableFee);
+
JSONArray datas = new JSONArray();
datas.add(data);
context.setResponseEntity(ResultVo.createResponseEntity(datas));
--
Gitblit v1.8.0