Merge remote-tracking branch 'origin/dev'

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AnScreenTrendFormDTO.java

@@ -22,4 +22,9 @@ public class AnScreenTrendFormDTO implements Serializable {
 	 */
 	@NotBlank(message = "机关Id不能为空", groups = AnScreenTrendFormDTO.AnScreenTrendGroup.class)
 	private String agencyId;
+
+	/**
+	 * 月份ID
+	 */
+	private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/MonthBarchartFormDTO.java

@@ -21,4 +21,9 @@ public class MonthBarchartFormDTO implements Serializable {
      */
     @NotBlank(message = "机关ID不能为空",groups = {MonthBarchart.class})
     private String agencyId;
+
+    /**
+     * 月份ID,如果此列有值，查询截止到当前monthId的近12个月数据
+     */
+    private String monthId;
 }

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/YearAverageIndexResultDTO.java

@@ -32,4 +32,6 @@ public class YearAverageIndexResultDTO implements Serializable {
      * 治理能力
      */
     private Double governAbility = 0.0;
+
+    private String yearId;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenIndexDataMonthlyDao.java

@@ -47,7 +47,7 @@ public interface ScreenIndexDataMonthlyDao{
      * @author zxc
      * @date 2020/8/20 9:02 上午
      */
-    List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId);
+    List<MonthBarchartResult> selectMonthBarchart(@Param("agencyId")String agencyId,@Param("monthId") String monthId);
 
     /**
      * @param subAgencyIndexRankFormDTO

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.java

@@ -17,7 +17,6 @@
 
 package com.epmet.datareport.dao.evaluationindex.screenan;
 
-import com.epmet.evaluationindex.screen.dto.form.AnScreenFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.PmTotalResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.PmTotalTrendDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -48,12 +47,12 @@ public interface ScreenAnGrassRootsPmTotalMonthlyDao {
 	 * 基层党员-指标月度趋势
 	 *
 	 * @param agencyId
-	 * @param yearId
+	 * @param monthId
 	 * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.PmTotalTrendDTO>
 	 * @author zhaoqifeng
 	 * @date 2020/10/9 15:12
 	 */
-	List<PmTotalTrendDTO> selectPmTotalTrend(@Param("agencyId") String agencyId, @Param("yearId") String yearId);
+	List<PmTotalTrendDTO> selectPmTotalTrend(@Param("agencyId") String agencyId, @Param("monthId") String monthId);
 
 
 }

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

@@ -65,8 +65,7 @@ public class AnScreenServiceImpl implements AnScreenService {
 	@DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
 	public PmTotalTrendResultDTO pmTotalTrend(AnScreenTrendFormDTO formDTO) {
 		PmTotalTrendResultDTO resultDTO = new PmTotalTrendResultDTO();
-		String yearId = DateUtils.format(new Date(), DateUtils.DATE_PATTERN_YYYY);
-		List<PmTotalTrendDTO> list = screenAnGrassRootsPmTotalMonthlyDao.selectPmTotalTrend(formDTO.getAgencyId(), yearId);
+		List<PmTotalTrendDTO> list = screenAnGrassRootsPmTotalMonthlyDao.selectPmTotalTrend(formDTO.getAgencyId(), formDTO.getMonthId());
 		List<String> xAxis = list.stream().map(item -> getMonth(item.getMonthId())).collect(Collectors.toList());
 		List<Integer> groupMemberTotalList = list.stream().map(PmTotalTrendDTO::getGroupMemberTotal).collect(Collectors.toList());
 		List<Integer> topicTotalList = list.stream().map(PmTotalTrendDTO::getTopicTotal).collect(Collectors.toList());

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

@@ -114,7 +114,7 @@ public class IndexServiceImpl implements IndexService {
         // 1. x轴
         result.setXAxis(partyMemberLeadServiceImpl.getXPro());
         // 2. 查询近一年的指数值【包括本月】
-        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId());
+        List<MonthBarchartResult> monthBarchartResults = screenIndexDataMonthlyDao.selectMonthBarchart(monthBarchartFormDTO.getAgencyId(),monthBarchartFormDTO.getMonthId());
         if (monthBarchartResults.size() == NumConstant.ZERO){
             for (int i = NumConstant.ZERO; i <= NumConstant.TWELVE; i++) {
                 serviceAbilityData.add(NumConstant.ZERO_DOT_ZERO);

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataMonthlyDao.xml

@@ -42,6 +42,9 @@
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
+            <if test="monthId != null and monthId.trim() != ''">
+                AND MONTH_ID &lt;= #{monthId}
+            </if>
             ORDER BY MONTH_ID DESC
             LIMIT 12
     </select>

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenIndexDataYearlyDao.xml

@@ -8,13 +8,15 @@
         SELECT
             service_ablity AS serviceAbility,
             party_dev_ablity AS partyDevAbility,
-            govern_ablity AS governAbility
+            govern_ablity AS governAbility,
+            year_id as yearId
         FROM
             screen_index_data_yearly
         WHERE
             del_flag = '0'
             AND org_id = #{agencyId}
-            AND year_id = DATE_FORMAT(NOW(),'%Y')
+            order by year_id desc
+		    limit 1
     </select>
 
     <!-- 下级部门指数排行 安宁 - 年 -->

epmet-module/data-report/data-report-server/src/main/resources/mapper/screenan/ScreenAnGrassRootsPmTotalMonthlyDao.xml

@@ -14,15 +14,21 @@
           AND MONTH_ID = #{monthId}
     </select>
     <select id="selectPmTotalTrend" resultType="com.epmet.evaluationindex.screen.dto.result.PmTotalTrendDTO">
-        SELECT MONTH_ID,
+        SELECT
+            MONTH_ID,
             GROUP_MEMBER_TOTAL,
             TOPIC_TOTAL,
             TOPIC_PARTI_USER_TOTAL,
             ISSUE_TOTAL
-        FROM screen_an_grass_roots_pm_total_monthly
-        WHERE DEL_FLAG = '0'
+        FROM
+        screen_an_grass_roots_pm_total_monthly
+        WHERE
+        DEL_FLAG = '0'
         AND ORG_ID = #{agencyId}
-          AND YEAR_ID = #{yearId}
-        ORDER BY MONTH_ID
+        <if test="monthId != null and monthId.trim() != ''">
+            AND MONTH_ID &lt;= #{monthId}
+        </if>
+        ORDER BY MONTH_ID ASC
+        LIMIT 12
     </select>
 </mapper>