From 9f02395806795908c1b17dc07272be16436e5f20 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 7 Jul 2022 09:52:24 +0800
Subject: [PATCH] =?UTF-8?q?/data/stats/statsproject/gridprojectstats?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/impl/StatsProjectServiceImpl.java    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
index 563c5cac04..78e67f817c 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
+++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java
@@ -1,9 +1,11 @@
 package com.epmet.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.StatsFormDTO;
 import com.epmet.feign.DataStatisticalOpenFeignClient;
 import com.epmet.service.StatsProjectService;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -24,7 +26,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
     @Override
     public Result agencyProjectStats(String params) {
         StatsFormDTO formDTO = new StatsFormDTO();
-        formDTO.setDate(params);
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, StatsFormDTO.class);
+        }
         return dataStatisticalOpenFeignClient.agencyProjectStats(formDTO);
     }
 
@@ -35,7 +39,9 @@ public class StatsProjectServiceImpl implements StatsProjectService {
     @Override
     public Result gridProjectStats(String params) {
         StatsFormDTO formDTO = new StatsFormDTO();
-        formDTO.setDate(params);
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, StatsFormDTO.class);
+        }
         return dataStatisticalOpenFeignClient.gridProjectStats(formDTO);
     }
 }