From 88cde1891586b5f5d6a8b91ffd711d6ff0bcb151 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 28 Sep 2020 11:02:56 +0800
Subject: [PATCH 1/2] =?UTF-8?q?monthId=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataToIndex/impl/IndexOriginExtractServiceImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
index 23a4de5128..60d592a1b6 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/IndexOriginExtractServiceImpl.java
@@ -14,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -52,7 +53,7 @@ public class IndexOriginExtractServiceImpl implements IndexOriginExtractService
         String monthId = formDTO.getMonthId();
         String customerId = formDTO.getCustomerId();
         if (StringUtils.isBlank(monthId)) {
-            monthId = DimIdGenerator.getDateDimId(DateUtils.addDateMonths(new Date(), -1));
+            monthId = LocalDate.now().minusMonths(NumConstant.ONE).toString().replace("-","").substring(NumConstant.ZERO,NumConstant.SIX);
         }
         List<String> customerIds = new ArrayList<>();
         if (StringUtils.isNotBlank(customerId)) {

From b5e0b814ded38edd87879dd7abf63f08797c144b Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Mon, 28 Sep 2020 11:04:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?stats=E6=9C=8D=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-statistical-server/deploy/docker-compose-dev.yml       | 2 +-
 epmet-module/data-statistical/data-statistical-server/pom.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
index 96e6003bb6..7e70bc6ec3 100644
--- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   data-statistical-server:
     container_name: data-statistical-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.112
+    image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.113
     ports:
       - "8108:8108"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index dbb67e3442..3cf07da71c 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <version>0.3.112</version>
+    <version>0.3.113</version>
     <parent>
         <artifactId>data-statistical</artifactId>
         <groupId>com.epmet</groupId>