From 15122bad11d7e868bf97dacc56d6c0f514e9f930 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Wed, 22 Dec 2021 15:45:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E9=A1=B9=E7=9B=AE=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=88=B0screen=5Fproject=5F*?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ScreenCentralZoneDataFormDTO.java    |  7 +++---
 .../com/epmet/controller/DemoController.java  | 23 +++++++++++++------
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java
index 3482e2cab9..d655b8608a 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java
@@ -1,9 +1,6 @@
 package com.epmet.dto.screen.form;
 
-import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.RequiredArgsConstructor;
 
 import java.io.Serializable;
 
@@ -26,4 +23,8 @@ public class ScreenCentralZoneDataFormDTO implements Serializable {
      * 时间维度 不一定是dateId 需要根据其格式进行判断维度的类型
      * */
     private String dateId;
+
+    private String startDate;
+
+    private String endDate;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
index ef567e92f1..a1e61b2461 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/DemoController.java
@@ -881,10 +881,17 @@ public class DemoController {
      */
     @PostMapping("project-test")
     public Result project(@RequestBody ScreenCentralZoneDataFormDTO param) {
-        if(StringUtils.isBlank(param.getDateId())){
-            //默认截止到昨天。
-            param.setDateId(DateUtils.getBeforeNDay(1));
+        List<String> dateIds = new ArrayList<>();
+        if ((StringUtils.isBlank(param.getStartDate()) && StringUtils.isBlank(param.getEndDate()))){
+            if (StringUtils.isNotBlank(param.getDateId())){
+                dateIds.add(param.getDateId());
+            }else {
+                dateIds.add(DimIdGenerator.getDateDimId(DateUtils.addDateDays(new Date(), -1)));
+            }
+        }else {
+            dateIds = DateUtils.getDaysBetween(param.getStartDate(), param.getEndDate());
         }
+
         List<String> customerIds = new ArrayList();
         if (StringUtils.isNotBlank(param.getCustomerId())) {
             customerIds.add(param.getCustomerId());
@@ -892,10 +899,12 @@ public class DemoController {
             customerIds = dimCustomerService.selectCustomerIdPage(1, 100);
         }
         for (String customerId : customerIds) {
-            ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO();
-            formDTO.setCustomerId(customerId);
-            formDTO.setDateId(param.getDateId());
-            screenProjectSettleService.extractScreenData(param);
+            dateIds.forEach(dateId -> {
+                ScreenCentralZoneDataFormDTO formDTO = new ScreenCentralZoneDataFormDTO();
+                formDTO.setCustomerId(customerId);
+                formDTO.setDateId(dateId);
+                screenProjectSettleService.extractScreenData(param);
+            });
         }
         return new Result();
     }