|
|
@ -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))); |
|
|
|