From 453df054ec7e6297f52a58a07b5cab8572b5c33a Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 21 Aug 2020 10:26:41 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9C=88=E4=BB=BD=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E8=BD=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/screen/constant/ScreenConstant.java | 4 +++ .../service/screen/impl/IndexServiceImpl.java | 5 ++-- .../impl/PartyMemberLeadServiceImpl.java | 25 +++++++++++++++---- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java index fcbbfd7b35..b03dbe6466 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/constant/ScreenConstant.java @@ -8,4 +8,8 @@ public interface ScreenConstant { String COMMUNITY = "community"; + String MONTH = "月"; + + String RATIO = "%"; + } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java index 7ad1c645b4..79272dd3b4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java @@ -34,7 +34,7 @@ public class IndexServiceImpl implements IndexService { @Autowired private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao; @Autowired - private GrassrootsPartyDevServiceImpl grassrootsPartyDevServiceImpl; + private PartyMemberLeadServiceImpl partyMemberLeadServiceImpl; /** * @Description 1、年度平均指数 @@ -81,8 +81,7 @@ public class IndexServiceImpl implements IndexService { List governAbilityData = new ArrayList<>(); List totalIndexData = new ArrayList<>(); // 1. x轴 - Map x = grassrootsPartyDevServiceImpl.getX(); - result.setXAxis(x.values().stream().collect(Collectors.toList())); + result.setXAxis(partyMemberLeadServiceImpl.getX()); // 2. 查询近一年的指数值【不包括本月】 List monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(customerId, monthBarchartFormDTO.getAgencyId()); if (monthBarchartResults.size() == NumConstant.ZERO){ diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java index 0bcdbbc5d9..c3c5fcf0d1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java @@ -9,10 +9,12 @@ import com.epmet.screen.dto.form.ContactMassLineChartFormDTO; import com.epmet.screen.dto.form.FineExampleFormDTO; import com.epmet.screen.dto.form.VolunteerServiceFormDTO; import com.epmet.screen.dto.result.*; +import com.epmet.screen.constant.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.math.BigDecimal; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Comparator; import java.util.List; @@ -31,8 +33,6 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { @Autowired private ScreenPartyLinkMassesDataDao screenPartyLinkMassesDataDao; @Autowired - private GrassrootsPartyDevServiceImpl grassrootsPartyDevServiceImpl; - @Autowired private ScreenPartyBranchDataDao screenPartyBranchDataDao; @Autowired private ScreenPioneerDataDao screenPioneerDataDao; @@ -65,7 +65,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { */ public String getRatio(Double d){ BigDecimal bigDecimal = new BigDecimal(d * NumConstant.ONE_HUNDRED); - return bigDecimal.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).toPlainString().concat("%"); + return bigDecimal.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).toPlainString().concat(ScreenConstant.RATIO); } /** @@ -110,8 +110,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { List organizeData = new ArrayList<>(); List joinData = new ArrayList<>(); List averageJoinUserData = new ArrayList<>(); - Map x = grassrootsPartyDevServiceImpl.getX(); - result.setXAxis(x.values().stream().collect(Collectors.toList())); + result.setXAxis(this.getX()); List volunteerServiceResults = screenPartyBranchDataDao.selectVolunteerServiceResult(volunteerServiceFormDTO.getAgencyId()); if (volunteerServiceResults.size() == NumConstant.ZERO){ for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) { @@ -135,4 +134,20 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { result.setAverageJoinUserData(averageJoinUserData); return result; } + + /** + * @Description 获取之前的12个月份【不包括当前月】 + * @author zxc + * @date 2020/8/21 10:19 上午 + */ + public List getX(){ + List xAxis = new ArrayList<>(); + LocalDate today = LocalDate.now(); + for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){ + LocalDate localDate = today.minusMonths(i); + String s = localDate.getMonth().getValue() + ScreenConstant.MONTH; + xAxis.add(s); + } + return xAxis; + } }