From b8e7bb1791ff41be5ee8150cc46af082d7444a65 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期三, 31 五月 2023 01:02:29 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerReserveGoodsCmd.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerReserveGoodsCmd.java b/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerReserveGoodsCmd.java
index fa9f610..c12484b 100644
--- a/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerReserveGoodsCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/owner/QueryOwnerReserveGoodsCmd.java
@@ -6,9 +6,7 @@
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.owner.OwnerDto;
-import com.java110.dto.report.QueryStatisticsDto;
import com.java110.intf.report.IReportOrderStatisticsInnerServiceSMO;
-import com.java110.report.statistics.IOrderStatistics;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
@@ -61,8 +59,21 @@
infos = new ArrayList<>();
}
+ freshStartDateAndEndDate(infos,ownerDto);
+
ResponseEntity<String> responseEntity = ResultVo.createResponseEntity((int) Math.ceil((double) total / (double) row), total, infos);
context.setResponseEntity(responseEntity);
}
+
+ private void freshStartDateAndEndDate(List<Map> infos,OwnerDto ownerDto) {
+ if(infos == null || infos.size() < 1){
+ return ;
+ }
+
+ for(Map info :infos){
+ info.put("startDate",ownerDto.getStartDate());
+ info.put("endDate",ownerDto.getEndDate());
+ }
+ }
}
--
Gitblit v1.8.0