getXPro

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/IndexServiceImpl.java

@@ -81,7 +81,7 @@ public class IndexServiceImpl implements IndexService {
         List<Double> governAbilityData = new ArrayList<>();
         List<Double> totalIndexData = new ArrayList<>();
         // 1. x轴
-        result.setXAxis(partyMemberLeadServiceImpl.getX());
+        result.setXAxis(partyMemberLeadServiceImpl.getXPro());
         // 2. 查询近一年的指数值【不包括本月】
         List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(customerId, monthBarchartFormDTO.getAgencyId());
         if (monthBarchartResults.size() == NumConstant.ZERO){

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java

@@ -110,7 +110,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         List<Integer> organizeData = new ArrayList<>();
         List<Integer> joinData = new ArrayList<>();
         List<Integer> averageJoinUserData = new ArrayList<>();
-        result.setXAxis(this.getX());
+        result.setXAxis(this.getXPro());
         List<VolunteerServiceResult> volunteerServiceResults = screenPartyBranchDataDao.selectVolunteerServiceResult(volunteerServiceFormDTO.getAgencyId());
         if (volunteerServiceResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
@@ -140,7 +140,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      * @author zxc
      * @date 2020/8/21 10:19 上午
      */
-    public List<String> getX(){
+    public List<String> getXPro(){
         List<String> xAxis = new ArrayList<>();
         LocalDate today = LocalDate.now();
         for(int i = NumConstant.TWELVE;i >= NumConstant.ONE; i--){