修改新网格开通情况

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/utils/DateUtils.java

@@ -14,9 +14,11 @@ import org.joda.time.LocalDate;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 
+import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Locale;
 
 /**
  * 日期处理工具类
@@ -185,4 +187,28 @@ public class DateUtils {
         DateTime dateTime = new DateTime(date);
         return dateTime.plusYears(years).toDate();
     }
+
+    /***
+     * 前端上传信息解析
+     * @param oldDate
+     * @return java.lang.String
+     * @author qushutong
+     * @date 2020/3/26 10:09
+     */
+    public static String dealDateFormat(String oldDate) {
+        Date date1 = null;
+        DateFormat df2 = null;
+        try {
+            oldDate= oldDate.replace("Z", " UTC");
+            DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS Z");
+            Date date = df.parse(oldDate);
+            SimpleDateFormat df1 = new SimpleDateFormat ("EEE MMM dd HH:mm:ss Z yyyy", Locale.UK);
+            date1 = df1.parse(date.toString());
+            df2 = new SimpleDateFormat("yyyy-MM-dd");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return df2.format(date1);
+    }
+
 }

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/user/MetaUserGridOpiningDTO.java

@@ -41,67 +41,67 @@ public class MetaUserGridOpiningDTO implements Serializable {
     /**
      * 网格id
      */
-	private Long gridId;
+	private String gridId;
 
     /**
      * 用户总数
      */
-	private String registerCount;
+	private int registerCount;
 
     /**
      * 党员数
      */
-	private String partyCount;
+	private int partyCount;
 
     /**
      * 已注册居民
      */
-	private String residentCount;
+	private int residentCount;
 
     /**
      * 未注册居民
      */
-	private String unAuthorizedCount;
+	private int unAuthorizedCount;
 
     /**
      * 新闻发布数
      */
-	private String newsCount;
+	private int newsCount;
 
     /**
      * 社群数
      */
-	private String communityCount;
+	private int communityCount;
 
     /**
      * 群成员数
      */
-	private String communityMemberCount;
+	private int communityMemberCount;
 
     /**
      * 群话题数
      */
-	private String communityTopicCount;
+	private int communityTopicCount;
 
     /**
      * 议题总数
      */
-	private String eventCount;
+	private int eventCount;
 
     /**
      * 项目数
      */
-	private String itemCount;
+	private int itemCount;
 
     /**
      * 项目已解决数
      */
-	private String itemCloseCount;
+	private int itemCloseCount;
 
     /**
      * 好评数
      */
-	private String itemPraiseCount;
+	private int itemPraiseCount;
 
     /**
      * 网格名称

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/entity/MetaUserGridOpiningEntity.java

@@ -41,7 +41,7 @@ public class MetaUserGridOpiningEntity extends BaseEpdcEntity {
     /**
      * 网格id
      */
-	private Long gridId;
+	private String gridId;
 
     /**
      * 用户总数

esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/user/service/impl/MetaUserGridOpiningServiceImpl.java

@@ -24,6 +24,7 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
+import com.elink.esua.epdc.commons.tools.utils.DateUtils;
 import com.elink.esua.epdc.commons.tools.utils.LocalDateUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.datasources.DataSourceNames;
@@ -39,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -66,14 +68,14 @@ public class MetaUserGridOpiningServiceImpl extends BaseServiceImpl<MetaUserGrid
         for(GridOpeningResultDTO item:gridOpeningResultDTOS){
             deptIdList.add(item.getGridId());
         }
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
         params.put("deptIdList",deptIdList);
-        String createdTime = (String) params.get("createdTime");
+        String time = (String) params.get("createdTime");
-        if(StringUtils.isBlank(createdTime)){
+        if(StringUtils.isBlank(time)){
-            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+            String createdTime = format.format(new Date());
-            Calendar c = Calendar.getInstance();
+            params.put("createdTime",createdTime);
-            c.add(Calendar.DATE, -1);
+        }else {
-            Date time = c.getTime();
+            String createdTime = DateUtils.dealDateFormat(time);
-            createdTime = format.format(time);
             params.put("createdTime",createdTime);
         }
         List<MetaUserGridOpiningEntity> metaUserGridOpiningEntityList = baseDao.pageselectListPage(params);