From 4d2fa5cfdf2ea9932fdbc87b3f4b63bcdf9a74f9 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 01 十一月 2023 10:57:41 +0800
Subject: [PATCH] 优化代码
---
service-report/src/main/java/com/java110/report/cmd/admin/GetCommunityOperationalAnalysisCmd.java | 38 +++++++++++++++++++++++++++++++++++++-
1 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/admin/GetCommunityOperationalAnalysisCmd.java b/service-report/src/main/java/com/java110/report/cmd/admin/GetCommunityOperationalAnalysisCmd.java
index 2184d77..b5e1175 100644
--- a/service-report/src/main/java/com/java110/report/cmd/admin/GetCommunityOperationalAnalysisCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/admin/GetCommunityOperationalAnalysisCmd.java
@@ -52,6 +52,7 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext context, JSONObject reqJson) throws CmdException, ParseException {
String startTime = reqJson.getString("startTime");
String endTime = reqJson.getString("endTime");
+ String storeId = CmdContextUtils.getStoreId(context);
if (StringUtil.isEmpty(startTime)) {
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.DAY_OF_MONTH, -7);
@@ -77,13 +78,48 @@
repairData = fillDate(repairData, startTime, endTime);
data.put("repairData", repairData);
+ //todo 鏌ヨ宸℃鏁版嵁鏁�
+ List<Map> inspectionData = baseDataStatisticsInnerServiceSMOImpl.getCommunityInspectionAnalysis(reqJson);
+ inspectionData = fillDate(inspectionData, startTime, endTime);
+ data.put("inspectionData", inspectionData);
+
+ //todo 鏌ヨ淇濆吇鏁版嵁鏁�
+ List<Map> maintainanceData = baseDataStatisticsInnerServiceSMOImpl.getCommunityMaintainanceAnalysis(reqJson);
+ maintainanceData = fillDate(maintainanceData, startTime, endTime);
+ data.put("maintainanceData", maintainanceData);
+
+ //todo 鏌ヨ閲囪喘璁㈠崟鏁�
+ List<Map> itemInData = baseDataStatisticsInnerServiceSMOImpl.getCommunityItemInAnalysis(reqJson);
+ itemInData = fillDate(itemInData, startTime, endTime);
+ data.put("itemInData", itemInData);
+
+ //todo 鏌ヨ棰嗙敤璁㈠崟鏁�
+ List<Map> itemOutData = baseDataStatisticsInnerServiceSMOImpl.getCommunityItemOutAnalysis(reqJson);
+ itemOutData = fillDate(itemOutData, startTime, endTime);
+ data.put("itemOutData", itemOutData);
+
+ //todo 鏌ヨ杞﹁締杩涘満鏁�
+ List<Map> carInData = baseDataStatisticsInnerServiceSMOImpl.getCommunityCarInAnalysis(reqJson);
+ carInData = fillDate(carInData, startTime, endTime);
+ data.put("carInData", carInData);
+
+ //todo 鏌ヨ浜哄憳杩涘満鏁�
+ List<Map> personInData = baseDataStatisticsInnerServiceSMOImpl.getCommunityPersonInAnalysis(reqJson);
+ personInData = fillDate(personInData, startTime, endTime);
+ data.put("personInData", personInData);
+
+ //todo 鏌ヨ璧疯崏鍚堝悓鏁�
+ reqJson.put("storeId",storeId);
+ List<Map> contractData = baseDataStatisticsInnerServiceSMOImpl.getCommunityContractAnalysis(reqJson);
+ contractData = fillDate(contractData, startTime, endTime);
+ data.put("contractData", contractData);
context.setResponseEntity(ResultVo.createResponseEntity(data));
}
private List<Map> fillDate(List<Map> datas, String startTime, String endTime) {
Date sTime = DateUtil.getDateFromStringB(startTime);
- Date eTime = DateUtil.getDateFromStringB(startTime);
+ Date eTime = DateUtil.getDateFromStringB(endTime);
List<Map> tempDatas = new ArrayList<>();
while (sTime.getTime() <= eTime.getTime()) {
--
Gitblit v1.8.0