monthindexanalysis/barchart，横坐标修改

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

@@ -112,7 +112,11 @@ public class IndexServiceImpl implements IndexService {
         List<BigDecimal> partyDevWeightData = new ArrayList<>();
         List<BigDecimal> governAblityWeightData = new ArrayList<>();
         // 1. x轴
-        result.setXAxis(partyMemberLeadServiceImpl.getXPro());
+        if(StringUtils.isNotBlank(monthBarchartFormDTO.getMonthId())){
+            result.setXAxis(partyMemberLeadServiceImpl.getXproEndMonth(monthBarchartFormDTO.getMonthId()));
+        }else{
+            result.setXAxis(partyMemberLeadServiceImpl.getXPro());
+        }
         // 2. 查询近一年的指数值【包括本月】
         List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(),monthBarchartFormDTO.getMonthId());
         if (monthBarchartResults.size() == NumConstant.ZERO){

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

@@ -15,6 +15,7 @@ import com.epmet.evaluationindex.screen.dto.form.FineExampleFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.VolunteerServiceFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import com.github.pagehelper.PageHelper;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,6 +31,7 @@ import java.util.*;
  * @author yinzuomei@elink-cn.com
  * @date 2020/8/18 10:22
  */
+@Slf4j
 @Service
 @DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
@@ -194,6 +196,18 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         return xAxis;
     }
 
+    public List<String> getXproEndMonth(String monthId) {
+        List<String> xAxis = new ArrayList<>();
+        for (int i = NumConstant.ELEVEN; i >= NumConstant.ZERO; i--) {
+            Calendar c = Calendar.getInstance();
+            c.setTime(com.epmet.commons.tools.utils.DateUtils.stringToDate(monthId.concat("01"), com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMMDD));
+            c.add(Calendar.MONTH, -i);
+            Date date = c.getTime();
+            String month = com.epmet.commons.tools.utils.DateUtils.format(date, com.epmet.commons.tools.utils.DateUtils.DATE_PATTERN_YYYYMM);
+            xAxis.add(month.substring(4, 6).concat(ScreenConstant.MONTH));
+        }
+        return xAxis;
+    }
 
     /**
      * @Description 4、先进排行榜单-先进支部排行