能力指标数据接口

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

@@ -14,6 +14,10 @@ import java.io.Serializable;
 @Data
 public class AblityIndexFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 查询月份的前12个月对应的monthId
+     */
+    private String startMonthId;
     /**
      * 组织Id
      */
@@ -29,6 +33,10 @@ public class AblityIndexFormDTO implements Serializable {
      */
     @NotBlank(message = "月份ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
     private String monthId;
+    /**
+     * 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
+     */
+    private String indexCode;
     public interface AddUserInternalGroup {}
 
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexAgencyScoreDao.java

@@ -17,10 +17,14 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.screen.dto.form.AblityIndexFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScoreListFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.LinkedList;
+
 /**
  * 区/街道相关分数表
  *
@@ -36,4 +40,11 @@ public interface FactIndexAgencyScoreDao {
      * @author sun
      */
     ScoreListResultDTO selectScore(ScoreListFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 分别查询区县、乡镇街道过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
+     * @author sun
+     */
+    LinkedList<AblityIndexResultDTO.ScoreListResultDTO> selectAblityIndex(AblityIndexFormDTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexCommunityScoreDao.java

@@ -0,0 +1,41 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import com.epmet.evaluationindex.screen.dto.form.AblityIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.LinkedList;
+
+/**
+ * 社区相关分数表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-02
+ */
+@Mapper
+public interface FactIndexCommunityScoreDao {
+
+    /**
+     * @param formDTO
+     * @Description 分别查询社区过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
+     * @author sun
+     */
+    LinkedList<AblityIndexResultDTO.ScoreListResultDTO> selectCommunityAblityIndex(AblityIndexFormDTO formDTO);
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridScoreDao.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 网格相关分值记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-02
+ */
+@Mapper
+public interface FactIndexGridScoreDao {
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/fact/FactIndexGridSubScoreDao.java

@@ -0,0 +1,31 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * <p>
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.fact;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 网格相关分值记录表
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-09-02
+ */
+@Mapper
+public interface FactIndexGridSubScoreDao {
+
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/fact/impl/FactIndexServiceImpl.java

@@ -2,7 +2,6 @@ package com.epmet.datareport.service.fact.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
-import com.epmet.commons.tools.exception.ErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.FactConstant;
@@ -10,6 +9,7 @@ import com.epmet.datareport.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao;
 import com.epmet.datareport.dao.fact.FactIndexAgencyScoreDao;
 import com.epmet.datareport.dao.fact.FactIndexAgencySubScoreDao;
+import com.epmet.datareport.dao.fact.FactIndexCommunityScoreDao;
 import com.epmet.datareport.dao.fact.FactIndexCommunitySubScoreDao;
 import com.epmet.datareport.service.fact.FactIndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
@@ -19,7 +19,10 @@ import org.springframework.stereotype.Service;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * 数据改版api
@@ -39,6 +42,8 @@ public class FactIndexServiceImpl implements FactIndexService {
     @Autowired
     private FactIndexAgencySubScoreDao factIndexAgencySubScoreDao;
     @Autowired
+    private FactIndexCommunityScoreDao factIndexCommunityScoreDao;
+    @Autowired
     private FactIndexCommunitySubScoreDao factIndexCommunitySubScoreDao;
 
     /**
@@ -49,15 +54,47 @@ public class FactIndexServiceImpl implements FactIndexService {
     @Override
     public List<AblityIndexResultDTO> ablityIndex(AblityIndexFormDTO formDTO) {
         LinkedList<AblityIndexResultDTO> resultDTO = new LinkedList<>();
-        //分别查询过去12个月党建能力、治理能力、服务能力各自总分乘权重后的分值，每个月份三个分值的加和就是当月的能力指数的分值  fact_index_agency_score  按月份升序
-        //1.查询组织过去12个月党建能力指标
-        //LinkedList<AblityIndexResultDTO.MonthScoreResultDTO.ScoreListResultDTO> djList = factIndexAgencyScoreDao.;
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> djList = null;
-        //2.查询组织过去12个月治理能力指标
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> zlList = null;
-        //3.查询组织过去12个月服务能力指标
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> fwList = null;
-        //4.遍历计算每个月能力指数
+        //分别查询过去12个月党建能力、治理能力、服务能力各自总分乘权重后的分值，每个月份三个分值的加和就是当月的能力指数的分值  fact_index_agency_score  按月份升序
+        //1.计算所查月份前12个月的monthId
+        formDTO.setStartMonthId(getDate(formDTO.getMonthId()));
+        //2.根据组织Id查询组织信息
+        CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getAgencyId());
+        if (null == agency) {
+            throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getAgencyId()));
+        }
+        //1.根据组织级别判断查询哪类数据表
+        //区县级、乡镇街道级
+        if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+            //2-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据(不想写union)
+            formDTO.setIndexCode(FactConstant.DJNL);
+            djList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
+            //2-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.ZLNL);
+            zlList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
+            //2-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.FWNL);
+            fwList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
+
+        //社区级
+        } else if ("community".equals(agency.getLevel())) {
+            //2-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.DJNL);
+            djList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
+            //2-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.ZLNL);
+            zlList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
+            //2-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.FWNL);
+            fwList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
+
+        } else {
+            throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getAgencyId()));
+        }
+
+        //3.遍历计算每个月能力指数
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> nlList = new LinkedList<>();
         for (int i = 0; i < djList.size(); i++) {
             AblityIndexResultDTO.ScoreListResultDTO nldto = new AblityIndexResultDTO.ScoreListResultDTO();
@@ -180,6 +217,11 @@ public class FactIndexServiceImpl implements FactIndexService {
         return resultList;
     }
 
+    /**
+     * @param newDate
+     * @Description 计算monthId对应一年前的monthId
+     * @author sun
+     */
     public String getDate(String newDate) {
         String date = "";
         SimpleDateFormat sdf = new SimpleDateFormat("yyyymm");

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexAgencyScoreDao.xml

@@ -7,4 +7,27 @@
 
     </select>
 
+    <select id="selectAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            ROUND(fact.score * fact.weight, 1) AS "indexTotal",
+            ROUND(self.self_score * self.self_weight,1) AS "agencyScore",
+            ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore"
+        FROM
+            fact_index_agency_score fact
+        INNER JOIN fact_index_agency_self_sub_score self ON fact.agency_id = self.agency_id
+        AND fact.month_id = self.month_id
+        AND fact.index_code = self.parent_index_code
+        WHERE
+            fact.del_flag = '0'
+        AND self.del_flag = '0'
+        AND fact.customer_id = #{customerId}
+        AND fact.agency_id = #{agencyId}
+        AND fact.month_id &gt; #{startMonthId}
+        AND fact.month_id &lt;= #{monthId}
+        AND fact.index_code = #{indexCode}
+        ORDER BY
+            fact.month_id ASC
+    </select>
+
 </mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexCommunityScoreDao.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactIndexCommunityScoreDao">
+
+    <select id="selectCommunityAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            ROUND(fact.score * fact.weight, 1) AS "indexTotal",
+            ROUND(self.self_score * self.self_weight,1) AS "agencyScore",
+            ROUND(self.sub_score * self.sub_weight,1) AS "subAgencyScore"
+        FROM
+            fact_index_community_score fact
+        INNER JOIN fact_index_community_self_sub_score self ON fact.agency_id = self.agency_id
+        AND fact.month_id = self.month_id
+        AND fact.index_code = self.parent_index_code
+        WHERE
+            fact.del_flag = '0'
+        AND self.del_flag = '0'
+        AND fact.customer_id = #{customerId}
+        AND fact.agency_id = #{agencyId}
+        AND fact.month_id &gt; #{startMonthId}
+        AND fact.month_id &lt;= #{monthId}
+        AND fact.index_code = #{indexCode}
+        ORDER BY
+            fact.month_id ASC
+    </select>
+
+</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridScoreDao.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactIndexGridScoreDao">
+
+
+</mapper>

epmet-module/data-report/data-report-server/src/main/resources/mapper/fact/FactIndexGridSubScoreDao.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao">
+
+
+</mapper>