公共方法添加【根据monthId获取上月monthId】

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java

@@ -19,6 +19,7 @@ import org.joda.time.format.DateTimeFormatter;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.ZoneId;
 import java.util.*;
 
 /**
@@ -595,6 +596,12 @@ public class DateUtils {
         return StrConstant.EPMETY_STR;
     }
 
+    /**
+     * @Description  根据dateId获取时间集合
+     * @param dateId
+     * @author zxc
+     * @date 2020/9/22 9:06 上午
+     */
     public static TimeListResultDTO getTimeList(String dateId){
         TimeListResultDTO result = new TimeListResultDTO();
         result.setDateId(dateId);
@@ -613,4 +620,24 @@ public class DateUtils {
         }
         return result;
     }
+
+    /**
+     * @Description  根据monthId【yyyyMM】获取上一个月份ID
+     * @param monthId
+     * @author zxc
+     * @date 2020/9/21 2:43 下午
+     */
+    public static String minusMonthId(String monthId){
+        String minusMonthId = null;
+        SimpleDateFormat sft = new SimpleDateFormat("yyyyMM");
+        try {
+            Date parse = sft.parse(monthId);
+            java.time.LocalDate birth = parse.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+            java.time.LocalDate localDate = birth.minusMonths(NumConstant.ONE);
+            minusMonthId = localDate.toString().substring(NumConstant.ZERO, NumConstant.FOUR).concat(localDate.toString().substring(NumConstant.FIVE, NumConstant.SEVEN));
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return minusMonthId;
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/impl/CalGridIndexServiceImpl.java

@@ -9,7 +9,6 @@ import com.epmet.constant.ExtractConstant;
 import com.epmet.constant.IndexCalConstant;
 import com.epmet.constant.ProjectEvaluateConstant;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexGovrnAblityGridMonthlyDao;
-import com.epmet.dao.partymember.PartyMemberDao;
 import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.GridIssueCountResultDTO;
 import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
@@ -34,11 +33,6 @@ import org.springframework.util.CollectionUtils;
 import java.math.BigDecimal;
 import java.text.NumberFormat;
 import java.util.ArrayList;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.ZoneId;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -112,7 +106,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         // 网格的发文数量
         List<PublishCountResultDTO> publishCountList = articlePublishedGridDailyService.selectArticlePublishCount(customerId, monthId);
         // 网格议题转项目率
-        List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, minusMonthId(monthId));
+        List<GridIssueCountResultDTO> gridIssueTotalList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId));
         List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT);
         List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueTotalList, gridProjectTotalList);
         // 建群党员数
@@ -258,7 +252,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         //网格总项目数
         List<GridProjectCountResultDTO> gridProjectTotalList = issueExtractService.selectGridProjectCount(customerId, monthId, ExtractConstant.SHIFT_PROJECT);
         //网格议题转项目率
-        List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, minusMonthId(monthId));
+        List<GridIssueCountResultDTO> gridIssueCountList = issueExtractService.selectIssueTotalTwoMonth(customerId, monthId, DateUtils.minusMonthId(monthId));
         List<GridProjectCountResultDTO> gridIssueShiftProjectRatio = getGridIssueShiftProjectRatio(gridIssueCountList, gridProjectTotalList);
         //网格自治项目数 从议题创建到项目关闭，包括处理人，自始至终没有出过议题所属网格
         List<AutoNoMyResultDTO> projectAutoNoMyList = projectLogService.selectProjectAutoNoMy(customerId, monthId);
@@ -582,23 +576,4 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
         }while (delNum > NumConstant.ZERO);
     }
 
-    /**
-     * @Description  根据monthId【yyyyMM】获取上一个月份ID
-     * @param monthId
-     * @author zxc
-     * @date 2020/9/21 2:43 下午
-     */
-    public String minusMonthId(String monthId){
-        String minusMonthId = null;
-        SimpleDateFormat sft = new SimpleDateFormat("yyyyMM");
-        try {
-            Date parse = sft.parse(monthId);
-            LocalDate birth = parse.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
-            LocalDate localDate = birth.minusMonths(NumConstant.ONE);
-            minusMonthId = localDate.toString().substring(NumConstant.ZERO, NumConstant.FOUR).concat(localDate.toString().substring(NumConstant.FIVE, NumConstant.SEVEN));
-        } catch (ParseException e) {
-            e.printStackTrace();
-        }
-        return minusMonthId;
-    }
 }