Merge remote-tracking branch 'origin/dev_data_stats' into dev

epmet-module/data-report/data-report-client/src/main/java/com/epmet/group/constant/GroupConstant.java

@@ -11,6 +11,6 @@ public interface GroupConstant {
 
     String RAIL = "-";
 
-    String NULL_CHAR_STRING = "";
+    String DOT = ".";
 
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/topic/constant/TopicConstant.java

@@ -33,5 +33,5 @@ public interface TopicConstant {
 
     String RAIL = "-";
 
-    String NULL_CHAR_STRING = "";
+    String DOT = ".";
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/group/impl/GroupServiceImpl.java

@@ -43,7 +43,7 @@ public class GroupServiceImpl implements GroupService {
         GroupSummaryInfoResultDTO result = groupDao.summaryInfo(agencyId);
         if (null==result){
             GroupSummaryInfoResultDTO resultDTO = new GroupSummaryInfoResultDTO();
-            resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.NULL_CHAR_STRING));
+            resultDTO.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(GroupConstant.RAIL,GroupConstant.DOT));
             return resultDTO;
         }
         return result;

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -42,10 +42,9 @@ public class TopicServiceImpl implements TopicService {
     @Override
     public TopicSummaryResultDTO topicSummary(TokenDto tokenDto) {
         TopicSummaryResultDTO result = new TopicSummaryResultDTO();
-        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.NULL_CHAR_STRING));
+        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString().replace(TopicConstant.RAIL,TopicConstant.DOT));
         String agencyId = this.getLoginUserDetails(tokenDto);
         List<TopicStatusResultDTO> topicStatus = topicDao.getTopicStatus(agencyId);
-        result.setDeadline(LocalDate.now().minusDays(NumConstant.ONE).toString());
         if (topicStatus.size() != NumConstant.ZERO){
             topicStatus.forEach(topic -> {
                 if (topic.getTopicStatus().equals(TopicConstant.DISCUSSING)){

epmet-module/data-report/data-report-server/src/main/resources/mapper/group/GroupDao.xml

@@ -10,7 +10,7 @@
             group_total_count AS groupTotalCount,
             group_member_avg_count AS groupPeopleAvg,
             group_median AS groupPeopleMedian,
-            DATE_FORMAT( date_id, '%Y-%m-%d' ) AS deadline
+            DATE_FORMAT( date_id, '%Y.%m.%d' ) AS deadline
         FROM fact_group_agency_daily
         WHERE del_flag = '0'
         AND agency_id = #{agencyId}