From f0ed21f83872b514d3ab6be1fa9c8937cf9dfb72 Mon Sep 17 00:00:00 2001
From: jiangyuying <jiang478938504@126.com>
Date: Wed, 1 Jul 2020 10:15:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A3=E4=BC=A0=E8=83=BD=E5=8A=9B--=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/publicity/impl/PublicityServiceImpl.java   | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java
index 902bfdee3f..234e4afeee 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/publicity/impl/PublicityServiceImpl.java
@@ -45,7 +45,7 @@ public class PublicityServiceImpl implements PublicityService {
     private PublicityDao publicityDao;//机关每日发文
     @Autowired
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
-    private Date dateFact = DateUtils.addDateDays( new Date(),-1);
+
 
 
     /**
@@ -68,6 +68,7 @@ public class PublicityServiceImpl implements PublicityService {
     @Override
     public List<FactTagViewedAgencyDTO> tagviewed(TokenDto tokenDto, Integer pageSize, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
+        Date dateFact = DateUtils.addDateDays( new Date(),-1);
         String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
         String monthId = strDate.substring(0, 6);
@@ -95,6 +96,7 @@ public class PublicityServiceImpl implements PublicityService {
     @Override
     public List<FactTagUsedAgencyDTO> tagused(TokenDto tokenDto, Integer pageSize, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
+        Date dateFact = DateUtils.addDateDays( new Date(),-1);
         String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
         String monthId = strDate.substring(0, 6);
@@ -122,7 +124,7 @@ public class PublicityServiceImpl implements PublicityService {
     @Override
     public List<FactPublishedAgencyDTO> subagencyPublishedarticle(TokenDto tokenDto, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
-//        Date date = new Date();
+        Date dateFact = DateUtils.addDateDays( new Date(),-1);
         String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
         String monthId = strDate.substring(0, 6);
@@ -150,7 +152,7 @@ public class PublicityServiceImpl implements PublicityService {
     @Override
     public List<FactPublishedDepartmentDTO> departmentPublishedarticle(TokenDto tokenDto, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
-//        Date date = new Date();
+        Date dateFact = DateUtils.addDateDays( new Date(),-1);
         String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
         String monthId = strDate.substring(0, 6);
@@ -178,7 +180,7 @@ public class PublicityServiceImpl implements PublicityService {
     @Override
     public List<FactPublishedGridDTO> subgridPublishedarticle(TokenDto tokenDto, String type) {
         String agencyId = this.getLoginUserDetails(tokenDto);
-//        Date date = new Date();
+        Date dateFact = DateUtils.addDateDays( new Date(),-1);
         String strDate = DateUtils.format(dateFact, DateUtils.DATE_PATTERN_YYYYMMDD);
         String yearId = strDate.substring(0, 4);
         String monthId = strDate.substring(0, 6);