From f948da1746ba26ea8b86398327bc9a00d96f3a59 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sun, 28 Jun 2020 18:13:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=B1=87=E6=80=BB=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E7=99=BE=E5=88=86=E6=AF=94=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/service/user/impl/UserAnalysisServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
index 5265749de5..a001f3847d 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/service/user/impl/UserAnalysisServiceImpl.java
@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.text.DecimalFormat;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -47,7 +47,6 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private UserAnalysisDao userAnalysisDao;
-    DecimalFormat decimalFormat = new DecimalFormat("0.00");
     /**
      * @return java.lang.String
      * @param
@@ -69,6 +68,7 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
                 throw new RenException(UserAnalysisConstant.QUERY_USER_AGENCY_FAILED);
             }
         }
+        logger.info(String.format("用户%s的所属机关id为%s",loginUserDetailsFormDTO.getUserId(),result.getData().getAgencyId()));
         return result.getData().getAgencyId();
     }
     /**
@@ -92,9 +92,9 @@ public class UserAnalysisServiceImpl implements UserAnalysisService {
         if(null!=userSummaryInfoResultDTO){
             userSummaryInfoResultDTO.setCurrentDate(DateUtils.getxAxisDatePattern(userSummaryInfoResultDTO.getCurrentDate(),"."));
             //提取出工具类
-            String partyMemberProStr=decimalFormat.format(userSummaryInfoResultDTO.getPartymemberProportionValue());
+            String partyMemberProStr=userSummaryInfoResultDTO.getPartymemberProportionValue().setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
             userSummaryInfoResultDTO.setPartymemberProportion(partyMemberProStr.concat("%"));
-            String warmProStr=decimalFormat.format(userSummaryInfoResultDTO.getWarmHeartedProportionValue());
+            String warmProStr=userSummaryInfoResultDTO.getWarmHeartedProportionValue().setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).stripTrailingZeros().toPlainString();
             userSummaryInfoResultDTO.setWarmHeartedProportion(warmProStr.concat("%"));
         }
         logger.info(String.format("查询用户汇总信息返参%s",JSON.toJSONString(userSummaryInfoResultDTO)));