Merge remote-tracking branch 'origin/dev_bugfix_ljj'

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);
     }
 }