Merge branch 'dev_personal_center' into dev_temp

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java

@@ -117,6 +117,10 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             ScreenUserJoinEntity entity = insertMap.get(gridId);
             entity.setJoinTotal(issue.getIssueIncr());
             GridUserCountResultDTO user = userCountMap.get(gridId);
+            if (user == null) {
+                log.warn("gridId:{} is not exist in issue,customerId:{},monthId:{},gridId:{}", JSON.toJSONString(issue), formDTO.getCustomerId(), formDTO.getMonthId(), gridId);
+                return;
+            }
             //百人人均议题：统计周期内总的议题数/（注册用户数/100）
             log.debug("issue:{}", JSON.toJSONString(issue));
             log.debug("user:{}", JSON.toJSONString(user));

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/user/impl/UserServiceImpl.java

@@ -518,7 +518,6 @@ public class UserServiceImpl implements UserService {
 
                 regGridD.setCustomerId(customerId);
                 regGridD.setGridId(gridId);
-                regGridD.setCustomerId(customerId);
                 regGridD.setAgencyId(agencyId);//网格直属得机关
                 regGridD.setDateId(timeDimension.getDateId());
                 regGridD.setWeekId(timeDimension.getWeekId());

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/IssueProjectResultDTO.java

@@ -27,7 +27,7 @@ public class IssueProjectResultDTO implements Serializable {
     /**
      * 议题转项目时间(项目表创建时间)
      */
-    @JsonFormat
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date shiftedTime;
 
 }