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

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -14,10 +14,12 @@ 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.*;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
 
 /**
  * 日期处理工具类
@@ -362,4 +364,18 @@ public class DateUtils {
         calendar.add(Calendar.DATE, -1);
         return calendar.getTime();
     }
+
+    /**
+     * @return java.lang.String
+     * @param dateStr yyyyMMdd
+     * @author yinzuomei
+     * @description 返回yyyy.MM.dd
+     * @Date 2020/6/22 18:38
+     **/
+    public static String getDatePointPattern(String dateStr){
+        if(StringUtils.isNotBlank(dateStr)&&dateStr.length()==8){
+            return String.valueOf(new StringBuffer(dateStr).insert(4,".").insert(7,"."));
+        }
+        return dateStr;
+    }
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java

@@ -3,6 +3,7 @@ package com.epmet.service.user.impl;
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.security.user.LoginUserUtil;
+import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.UserAnalysisConstant;
 import com.epmet.dao.user.UserAnalysisDao;
@@ -79,10 +80,9 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
         }else{
             userSummaryInfoResultDTO=userAnalysisDao.selectParticipationUserSummaryInfo(myAgencyId);
         }
-        if(StringUtils.isNotBlank(userSummaryInfoResultDTO.getCurrentDate())&&userSummaryInfoResultDTO.getCurrentDate().length()==8){
-            userSummaryInfoResultDTO.setCurrentDate(String.valueOf(new StringBuffer(userSummaryInfoResultDTO.getCurrentDate()).insert(4,".").insert(7,".")));
-        }
         if(null!=userSummaryInfoResultDTO){
+            userSummaryInfoResultDTO.setCurrentDate(DateUtils.getDatePointPattern(userSummaryInfoResultDTO.getCurrentDate()));
+            //提取出工具类
             userSummaryInfoResultDTO.setPartymemberProportion(userSummaryInfoResultDTO.getPartymemberProportionValue().stripTrailingZeros().toPlainString());
             userSummaryInfoResultDTO.setWarmHeartedProportion(userSummaryInfoResultDTO.getWarmHeartedProportionValue().stripTrailingZeros().toPlainString());
         }

epmet-module/data-report/data-report-server/src/main/resources/mapper/user/UserAnalysisDao.xml

@@ -10,9 +10,9 @@
             m.REG_TOTAL AS regTotal,
             0 AS partiTotal,
             m.PARTYMEMBER_TOTAL AS partymemberTotal,
-            m.PARTYMEMBER_PROPORTION AS partymemberProportion,
+            m.PARTYMEMBER_PROPORTION*100 AS partymemberProportion,
             m.WARM_HEARTED_TOTAL AS warmHeartedTotal,
-            m.WARM_HEARTED_PROPORTION AS warmHeartedProportion
+            m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportion
         FROM
             fact_reg_user_agency_daily m
         WHERE
@@ -32,9 +32,9 @@
             m.REG_TOTAL AS regTotal,
             0 AS partiTotal,
             m.PARTYMEMBER_TOTAL AS partymemberTotal,
-            m.PARTYMEMBER_PROPORTION AS partymemberProportion,
+            m.PARTYMEMBER_PROPORTION*100 AS partymemberProportion,
             m.WARM_HEARTED_TOTAL AS warmHeartedTotal,
-            m.WARM_HEARTED_PROPORTION AS warmHeartedProportion
+            m.WARM_HEARTED_PROPORTION*100 AS warmHeartedProportion
         FROM
             fact_participation_user_agency_daily m
         WHERE