Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

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

@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -15,19 +14,24 @@ import java.io.Serializable;
 public class AblityIndexFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
     /**
-     * 查询月份的前12个月对应的monthId
+     * 组织或网格Id
      */
-    private String startMonthId;
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgId;
     /**
      * 组织Id
      */
     @NotBlank(message = "客户ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
     private String customerId;
     /**
-     * 组织Id
+     * 组织或网格类型
      */
-    @NotBlank(message = "组织ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
-    private String agencyId;
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    /**
+     * 查询月份的前12个月对应的monthId
+     */
+    private String startMonthId;
     /**
      * 月份Id（格式：202009）
      */

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

@@ -14,15 +14,21 @@ import java.io.Serializable;
 public class AblityListFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
     /**
-     * 组织Id
+     * 客户Id
      */
     @NotBlank(message = "客户ID不能为空",groups = {AblityListFormDTO.AddUserInternalGroup.class})
     private String customerId;
     /**
-     * 组织Id
+     * 组织或网格Id
      */
-    @NotBlank(message = "组织ID不能为空",groups = {AblityListFormDTO.AddUserInternalGroup.class})
-    private String agencyId;
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgId;
+    /**
+     * 组织或网格类型
+     */
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    public interface AddUserInternalGroup {}
     /**
      * 月份Id（格式：202009）
      */
@@ -37,6 +43,5 @@ public class AblityListFormDTO implements Serializable {
      * 所有有权重的指标code拼接的字符串 冒号隔开
      */
     private String allParentIndexCode;
-    public interface AddUserInternalGroup {}
 
 }

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

@@ -14,15 +14,21 @@ import java.io.Serializable;
 public class MonthAblityListFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
     /**
-     * 组织Id
+     * 客户Id
      */
     @NotBlank(message = "客户ID不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
     private String customerId;
     /**
-     * 组织Id
+     * 组织或网格Id
      */
-    @NotBlank(message = "组织ID不能为空",groups = {MonthAblityListFormDTO.AddUserInternalGroup.class})
-    private String agencyId;
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgId;
+    /**
+     * 组织或网格类型
+     */
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    public interface AddUserInternalGroup {}
     /**
      * 月份Id（格式：202009）
      */
@@ -37,7 +43,5 @@ public class MonthAblityListFormDTO implements Serializable {
      * 查询月份的前12个月对应的monthId
      */
     private String startMonthId;
-    public interface AddUserInternalGroup {}
-
 
 }

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

@@ -13,21 +13,34 @@ import java.io.Serializable;
 @Data
 public class MonthScoreListFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 组织或网格Id
+     */
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgId;
     /**
      * 组织Id
      */
     @NotBlank(message = "客户ID不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
     private String customerId;
     /**
-     * 组织Id
+     * 组织或网格类型
      */
-    @NotBlank(message = "组织ID不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
-    private String agencyId;
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    /**
+     * 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
+     */
+    private String indexCode;
     /**
      * 月份Id（格式：202009）
      */
     @NotBlank(message = "月份ID不能为空",groups = {MonthScoreListFormDTO.AddUserInternalGroup.class})
     private String monthId;
+    /**
+     * 查询月份的前12个月对应的monthId
+     */
+    private String startMonthId;
     public interface AddUserInternalGroup {}
 
 }

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

@@ -15,15 +15,21 @@ import java.io.Serializable;
 public class PeerComparisonFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
     /**
-     * 组织Id
+     * 客户Id
      */
     @NotBlank(message = "客户ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
     private String customerId;
     /**
-     * 组织Id
+     * 组织或网格Id
      */
-    @NotBlank(message = "组织ID不能为空",groups = {PeerComparisonFormDTO.AddUserInternalGroup.class})
-    private String agencyId;
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgId;
+    /**
+     * 组织或网格类型
+     */
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    public interface AddUserInternalGroup {}
     /**
      * 类型（党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；）
      */
@@ -34,6 +40,5 @@ public class PeerComparisonFormDTO implements Serializable {
      */
     @Min(value = 1, message = "查询条数必须大于0", groups = {PeerComparisonFormDTO.AddUserInternalGroup.class })
     private Integer pageSize;
-    public interface AddUserInternalGroup {}
 
 }

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

@@ -3,7 +3,6 @@ package com.epmet.evaluationindex.screen.dto.form;
 
 import lombok.Data;
 
-import javax.validation.constraints.Min;
 import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 
@@ -14,12 +13,12 @@ import java.io.Serializable;
 @Data
 public class RootAgencyFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
+    public interface AddUserInternalGroup {}
+
     /**
      * 组织Id
      */
     @NotBlank(message = "组织ID不能为空",groups = {RootAgencyFormDTO.AddUserInternalGroup.class})
     private String agencyId;
 
-    public interface AddUserInternalGroup {}
-
 }

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

@@ -13,16 +13,22 @@ import java.io.Serializable;
 @Data
 public class ScoreListFormDTO implements Serializable {
     private static final long serialVersionUID = -2880432640584616651L;
+    /**
+     * 组织或网格Id
+     */
+    @NotBlank(message = "组织或网格ID不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgId;
     /**
      * 组织Id
      */
     @NotBlank(message = "客户ID不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
     private String customerId;
     /**
-     * 组织Id
+     * 组织或网格类型
      */
-    @NotBlank(message = "组织ID不能为空",groups = {ScoreListFormDTO.AddUserInternalGroup.class})
-    private String agencyId;
+    @NotBlank(message = "组织或网格类型不能为空",groups = {AblityIndexFormDTO.AddUserInternalGroup.class})
+    private String orgType;
+    public interface AddUserInternalGroup {}
     /**
      * 月份Id（格式：202009）
      */
@@ -33,6 +39,4 @@ public class ScoreListFormDTO implements Serializable {
      */
     private String indexCode;
 
-    public interface AddUserInternalGroup {}
-
 }

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

@@ -29,14 +29,6 @@ public class AblityIndexResultDTO implements Serializable {
          * 能力总分
          */
         private Double indexTotal;
-        /**
-         * 本级能力分
-         */
-        private Double agencyScore;
-        /**
-         * 下级能力分
-         */
-        private Double subAgencyScore;
         /**
          * 横坐标（202009）
          */

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

@@ -14,13 +14,13 @@ public class PeerComparisonResultDTO implements Serializable {
     private static final long serialVersionUID = 3860268744336541373L;
 
     /**
-     * 组织Id
+     * 组织或网格Id
      */
-    private String agencyId;
+    private String orgId;
     /**
-     * 组织名称
+     * 组织或网格名称
      */
-    private String agencyName;
+    private String orgName;
     /**
      * 能力分值(保留一位小数)
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/FactConstant.java

@@ -5,6 +5,14 @@ package com.epmet.datareport.constant;
  * @dscription 数据
  */
 public interface FactConstant {
+	/**
+	 * 组织类型
+	 */
+	String AGENCY = "agency";
+	/**
+	 * 网格类型
+	 */
+	String GRID = "grid";
 	/**
 	 * 能力指标
 	 */
@@ -33,4 +41,8 @@ public interface FactConstant {
 	 * 社区相关
 	 */
 	String SHE_QU_XIANG_GUAN = "shequxiangguan";
+	/**
+	 * 网格相关
+	 */
+	String WANG_GE_XIANG_GUAN = "wanggexiangguan";
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/fact/FactIndexController.java

@@ -1,5 +1,6 @@
 package com.epmet.datareport.controller.fact;
 
+import com.epmet.commons.extappauth.annotation.InternalAppRequestAuth;
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
@@ -17,6 +18,7 @@ import java.util.List;
 
 /**
  * 数据改版api
+ *
  * @author sun
  */
 @RestController
@@ -28,77 +30,84 @@ public class FactIndexController {
 
     /**
      * @param tokenDTO
-     * @Description  能力指数
+     * @Description 能力指数
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/ablityindex")
-    public Result<List<AblityIndexResultDTO>> ablityIndex(@LoginUser TokenDto tokenDTO, @RequestBody AblityIndexFormDTO formDTO){
+    public Result<List<AblityIndexResultDTO>> ablityIndex(@LoginUser TokenDto tokenDTO, @RequestBody AblityIndexFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityIndexFormDTO.AddUserInternalGroup.class);
         return new Result<List<AblityIndexResultDTO>>().ok(factIndexService.ablityIndex(formDTO));
     }
 
     /**
      * @param tokenDTO
-     * @Description  按月份查询各项能力分数
+     * @Description 按月份查询各项能力分数
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/scorelist")
-    public Result<List<ScoreListResultDTO>> scoreList(@LoginUser TokenDto tokenDTO, @RequestBody ScoreListFormDTO formDTO){
+    public Result<List<ScoreListResultDTO>> scoreList(@LoginUser TokenDto tokenDTO, @RequestBody ScoreListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, ScoreListFormDTO.AddUserInternalGroup.class);
         return new Result<List<ScoreListResultDTO>>().ok(factIndexService.scoreList(formDTO));
     }
 
     /**
      * @param tokenDTO
-     * @Description  按月份查询各项能力最近12个月得分
+     * @Description 按月份查询各项能力最近12个月得分
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/monthscorelist")
-    public Result<List<MonthScoreListResultDTO>> monthScoreList(@LoginUser TokenDto tokenDTO, @RequestBody MonthScoreListFormDTO formDTO){
+    public Result<List<MonthScoreListResultDTO>> monthScoreList(@LoginUser TokenDto tokenDTO, @RequestBody MonthScoreListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MonthScoreListFormDTO.AddUserInternalGroup.class);
         return new Result<List<MonthScoreListResultDTO>>().ok(factIndexService.monthScoreList(formDTO));
     }
 
     /**
      * @param tokenDTO
-     * @Description  按月查询各项指标数据
+     * @Description 按月查询各项指标数据
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/ablitylist")
-    public Result<List<AblityListResultDTO>> ablityList(@LoginUser TokenDto tokenDTO, @RequestBody AblityListFormDTO formDTO){
+    public Result<List<AblityListResultDTO>> ablityList(@LoginUser TokenDto tokenDTO, @RequestBody AblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AblityListFormDTO.AddUserInternalGroup.class);
         return new Result<List<AblityListResultDTO>>().ok(factIndexService.ablityList(formDTO));
     }
 
     /**
      * @param tokenDTO
-     * @Description  按月查询各项指标最近12个月数据
+     * @Description 按月查询各项指标最近12个月数据
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/monthablitylist")
-    public Result<List<MonthAblityListResultDTO>> monthAblityList(@LoginUser TokenDto tokenDTO, @RequestBody MonthAblityListFormDTO formDTO){
+    public Result<List<MonthAblityListResultDTO>> monthAblityList(@LoginUser TokenDto tokenDTO, @RequestBody MonthAblityListFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, MonthAblityListFormDTO.AddUserInternalGroup.class);
         return new Result<List<MonthAblityListResultDTO>>().ok(factIndexService.monthAblityList(formDTO));
     }
 
     /**
      * @param tokenDTO
-     * @Description  同级对比各项数据查询
+     * @Description 同级对比各项数据查询
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/peercomparison")
-    public Result<List<PeerComparisonResultDTO>> peerComparison(@LoginUser TokenDto tokenDTO, @RequestBody PeerComparisonFormDTO formDTO){
+    public Result<List<PeerComparisonResultDTO>> peerComparison(@LoginUser TokenDto tokenDTO, @RequestBody PeerComparisonFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, PeerComparisonFormDTO.AddUserInternalGroup.class);
         return new Result<List<PeerComparisonResultDTO>>().ok(factIndexService.peerComparison(formDTO));
     }
 
     /**
      * @param tokenDTO
-     * @Description  是否根组织
+     * @Description 是否根组织
      * @author sun
      */
+    @InternalAppRequestAuth
     @PostMapping("index/rootagency")
-    public Result<RootAgencyResultDTO> rootAgency(@LoginUser TokenDto tokenDTO, @RequestBody RootAgencyFormDTO formDTO){
+    public Result<RootAgencyResultDTO> rootAgency(@LoginUser TokenDto tokenDTO, @RequestBody RootAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, RootAgencyFormDTO.AddUserInternalGroup.class);
         return new Result<RootAgencyResultDTO>().ok(factIndexService.rootAgency(formDTO));
     }

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

@@ -80,7 +80,7 @@ public interface ScreenIndexDataMonthlyDao{
 
     /**
      * @param  formDTO
-     * @Description 同级对比--根据组织Id的上级组织Id查询同级组织对应类型的得分排名（查询最近一个月数据）
+     * @Description 同级对比--根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（查询最近一个月数据）
      * @author sun
      */
     List<PeerComparisonResultDTO> selectScoreList(PeerComparisonFormDTO formDTO);

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

@@ -18,8 +18,10 @@
 package com.epmet.datareport.dao.fact;
 
 import com.epmet.evaluationindex.screen.dto.form.AblityIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthScoreListFormDTO;
 import com.epmet.evaluationindex.screen.dto.form.ScoreListFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -34,17 +36,24 @@ import java.util.LinkedList;
 @Mapper
 public interface FactIndexAgencyScoreDao {
 
+    /**
+     * @param formDTO
+     * @Description 分别查询区县、乡镇街道过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
+     * @author sun
+     */
+    LinkedList<AblityIndexResultDTO.ScoreListResultDTO> selectAblityIndex(AblityIndexFormDTO formDTO);
+
     /**
      * @param formDTO
      * @Description 分别查询当前组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
      * @author sun
      */
-    ScoreListResultDTO selectScore(ScoreListFormDTO formDTO);
+    ScoreListResultDTO selectScoreList(ScoreListFormDTO formDTO);
 
     /**
      * @param formDTO
      * @Description 分别查询区县、乡镇街道过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
      * @author sun
      */
-    LinkedList<AblityIndexResultDTO.ScoreListResultDTO> selectAblityIndex(AblityIndexFormDTO formDTO);
+    LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> selectMonthScoreList(MonthScoreListFormDTO formDTO);
 }

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

@@ -18,7 +18,11 @@
 package com.epmet.datareport.dao.fact;
 
 import com.epmet.evaluationindex.screen.dto.form.AblityIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthScoreListFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ScoreListFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.LinkedList;
@@ -38,4 +42,18 @@ public interface FactIndexCommunityScoreDao {
      * @author sun
      */
     LinkedList<AblityIndexResultDTO.ScoreListResultDTO> selectCommunityAblityIndex(AblityIndexFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 分别查询社区级组织某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
+     * @author sun
+     */
+    ScoreListResultDTO selectCommunityScoreList(ScoreListFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 分别查询社区过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
+     * @author sun
+     */
+    LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> selectCommunityMonthScoreList(MonthScoreListFormDTO formDTO);
 }

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

@@ -17,8 +17,16 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.screen.dto.form.AblityIndexFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthScoreListFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.ScoreListFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.LinkedList;
+
 /**
  * 网格相关分值记录表
  *
@@ -28,4 +36,24 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface FactIndexGridScoreDao {
 
+    /**
+     * @param formDTO
+     * @Description 分别查网格过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
+     * @author sun
+     */
+    LinkedList<AblityIndexResultDTO.ScoreListResultDTO> selectGridAblityIndex(AblityIndexFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 分别查网格某一月份党建能力、治理能力、服务能力对应的总分、本级分、下级分
+     * @author sun
+     */
+    ScoreListResultDTO selectGridScoreList(ScoreListFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 分别查网格过去12个月党建能力、治理能力、服务能力每月总分、本级得分、下级得分数据
+     * @author sun
+     */
+    LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> selectGridMonthScoreList(MonthScoreListFormDTO formDTO);
 }

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

@@ -17,8 +17,15 @@
 
 package com.epmet.datareport.dao.fact;
 
+import com.epmet.evaluationindex.screen.dto.form.AblityListFormDTO;
+import com.epmet.evaluationindex.screen.dto.form.MonthAblityListFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO;
+import com.epmet.evaluationindex.screen.dto.result.MonthAblityListResultDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.LinkedList;
+import java.util.List;
+
 /**
  * 网格相关分值记录表
  *
@@ -28,4 +35,17 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface FactIndexGridSubScoreDao {
 
+    /**
+     * @param formDTO
+     * @Description 查询网格某月份某项能力对应的各项指标
+     * @author sun
+     */
+    List<AblityListResultDTO> selectGridAblityList(AblityListFormDTO formDTO);
+
+    /**
+     * @param formDTO
+     * @Description 查询网格层级某项能力对应的一项指标过去12个月份数据
+     * @author sun
+     */
+    LinkedList<MonthAblityListResultDTO> selectGridMonthAblityList(MonthAblityListFormDTO formDTO);
 }

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

@@ -7,16 +7,14 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.constant.FactConstant;
 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.dao.fact.*;
 import com.epmet.datareport.service.fact.FactIndexService;
 import com.epmet.evaluationindex.screen.dto.form.*;
 import com.epmet.evaluationindex.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -45,6 +43,10 @@ public class FactIndexServiceImpl implements FactIndexService {
     private FactIndexCommunityScoreDao factIndexCommunityScoreDao;
     @Autowired
     private FactIndexCommunitySubScoreDao factIndexCommunitySubScoreDao;
+    @Autowired
+    private FactIndexGridScoreDao factIndexGridScoreDao;
+    @Autowired
+    private FactIndexGridSubScoreDao factIndexGridSubScoreDao;
 
     /**
      * @param formDTO
@@ -53,76 +55,91 @@ public class FactIndexServiceImpl implements FactIndexService {
      */
     @Override
     public List<AblityIndexResultDTO> ablityIndex(AblityIndexFormDTO formDTO) {
-        LinkedList<AblityIndexResultDTO> resultDTO = new LinkedList<>();
+        LinkedList<AblityIndexResultDTO> resultList = new LinkedList<>();
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> djList = null;
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> zlList = null;
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> fwList = null;
-        //分别查询过去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);
+        //2.根据类型判断是查询组织数据还是网格数据
+        //组织层级数据
+        if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
+            //3.根据组织Id查询组织信息
+            CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
+            if (null == agency) {
+                throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
+            }
+            //4.根据组织级别判断查询哪类数据表
+            //区县级、乡镇街道级
+            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+                //4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据(不想写union)
+                formDTO.setIndexCode(FactConstant.DJNL);
+                djList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
+                //4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.ZLNL);
+                zlList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
+                //4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.FWNL);
+                fwList = factIndexAgencyScoreDao.selectAblityIndex(formDTO);
 
-        //社区级
-        } else if ("community".equals(agency.getLevel())) {
-            //2-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
+                //社区级
+            } else if ("community".equals(agency.getLevel())) {
+                //4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.DJNL);
+                djList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
+                //4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.ZLNL);
+                zlList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
+                //4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.FWNL);
+                fwList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
+            } else {
+                throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+            }
+            //网格层级数据
+        } else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
+            //5.查询过去12个月网格层级各项能力对应的各项得分数据
+            //5-1.查询网格过去12个月党建能力每月总分、本级得分、下级得分数据(不想写union)
             formDTO.setIndexCode(FactConstant.DJNL);
-            djList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
-            //2-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+            djList = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
+            //5-2.查询网格过去12个月治理能力每月总分、本级得分、下级得分数据
             formDTO.setIndexCode(FactConstant.ZLNL);
-            zlList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
-            //2-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+            zlList = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
+            //5-3.查询网格过去12个月服务能力每月总分、本级得分、下级得分数据
             formDTO.setIndexCode(FactConstant.FWNL);
-            fwList = factIndexCommunityScoreDao.selectCommunityAblityIndex(formDTO);
-
+            fwList = factIndexGridScoreDao.selectGridAblityIndex(formDTO);
         } else {
-            throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getAgencyId()));
+            throw new RenException(String.format("能力指数查询,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
         }
 
-        //3.遍历计算每个月能力指数
+        //6.遍历计算每个月能力指数
         LinkedList<AblityIndexResultDTO.ScoreListResultDTO> nlList = new LinkedList<>();
         for (int i = 0; i < djList.size(); i++) {
             AblityIndexResultDTO.ScoreListResultDTO nldto = new AblityIndexResultDTO.ScoreListResultDTO();
-            nldto.setIndexTotal(djList.get(i).getIndexTotal() + zlList.get(i).getIndexTotal() + fwList.get(i).getIndexTotal());
-            nldto.setAgencyScore(djList.get(i).getAgencyScore() + zlList.get(i).getAgencyScore() + fwList.get(i).getAgencyScore());
-            nldto.setSubAgencyScore(djList.get(i).getSubAgencyScore() + zlList.get(i).getSubAgencyScore() + fwList.get(i).getSubAgencyScore());
+            double num1 = new BigDecimal((djList.get(i).getIndexTotal() + zlList.get(i).getIndexTotal() + fwList.get(i).getIndexTotal())).setScale(1, BigDecimal.ROUND_HALF_UP).doubleValue();
+            nldto.setIndexTotal(num1);
             nldto.setMonthId(djList.get(i).getMonthId());
             nlList.add(nldto);
         }
         //5.封装数据并返回
         AblityIndexResultDTO nl = new AblityIndexResultDTO();
         nl.setIndexCode(FactConstant.NLZB);
-        nl.setScoreList(djList);
-        resultDTO.add(nl);
+        nl.setScoreList(nlList);
+        if(null != nlList){resultList.add(nl);}
         AblityIndexResultDTO dj = new AblityIndexResultDTO();
         dj.setIndexCode(FactConstant.DJNL);
         dj.setScoreList(djList);
-        resultDTO.add(dj);
+        if(null != djList){resultList.add(dj);}
         AblityIndexResultDTO zl = new AblityIndexResultDTO();
         zl.setIndexCode(FactConstant.ZLNL);
-        zl.setScoreList(djList);
-        resultDTO.add(zl);
+        zl.setScoreList(zlList);
+        if(null != zlList){resultList.add(zl);}
         AblityIndexResultDTO fw = new AblityIndexResultDTO();
         fw.setIndexCode(FactConstant.FWNL);
-        fw.setScoreList(djList);
-        resultDTO.add(fw);
+        fw.setScoreList(fwList);
+        if(null != fwList){resultList.add(fw);}
 
-        return resultDTO;
+        return resultList;
     }
 
     /**
@@ -132,13 +149,65 @@ public class FactIndexServiceImpl implements FactIndexService {
      */
     @Override
     public List<ScoreListResultDTO> scoreList(ScoreListFormDTO formDTO) {
-        //1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
-        formDTO.setIndexCode(FactConstant.DJNL);
-        ScoreListResultDTO dj = factIndexAgencyScoreDao.selectScore(formDTO);
-        //2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
-        //3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
+        LinkedList<ScoreListResultDTO> resultList = new LinkedList<>();
+        ScoreListResultDTO dj = new ScoreListResultDTO();
+        ScoreListResultDTO zl = new ScoreListResultDTO();
+        ScoreListResultDTO fw = new ScoreListResultDTO();
+        //1.根据类型判断是查询组织数据还是网格数据
+        //组织层级数据
+        if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
+            //2.根据组织Id查询组织信息
+            CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
+            if (null == agency) {
+                throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
+            }
+            //3.根据组织级别判断查询哪类数据表
+            //区县级、乡镇街道级
+            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+                //3-1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
+                formDTO.setIndexCode(FactConstant.DJNL);
+                dj = factIndexAgencyScoreDao.selectScoreList(formDTO);
+                //3-2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
+                formDTO.setIndexCode(FactConstant.ZLNL);
+                zl = factIndexAgencyScoreDao.selectScoreList(formDTO);
+                //3-3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
+                formDTO.setIndexCode(FactConstant.FWNL);
+                fw = factIndexAgencyScoreDao.selectScoreList(formDTO);
+                //社区级
+            } else if ("community".equals(agency.getLevel())) {
+                //3-1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
+                formDTO.setIndexCode(FactConstant.DJNL);
+                dj = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
+                //3-2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
+                formDTO.setIndexCode(FactConstant.ZLNL);
+                zl = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
+                //3-3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
+                formDTO.setIndexCode(FactConstant.FWNL);
+                fw = factIndexCommunityScoreDao.selectCommunityScoreList(formDTO);
+            } else {
+                throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+            }
 
-        return null;
+            //4.网格层级数据
+        } else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
+            //4-1.查询当前组织某一月份党建能力对应的总分、本级分、下级分
+            formDTO.setIndexCode(FactConstant.DJNL);
+            dj = factIndexGridScoreDao.selectGridScoreList(formDTO);
+            //4-2.查询当前组织某一月份治理能力对应的总分、本级分、下级分
+            formDTO.setIndexCode(FactConstant.ZLNL);
+            zl = factIndexGridScoreDao.selectGridScoreList(formDTO);
+            //4-3.查询当前组织某一月份服务能力对应的总分、本级分、下级分
+            formDTO.setIndexCode(FactConstant.FWNL);
+            fw = factIndexGridScoreDao.selectGridScoreList(formDTO);
+        } else {
+            throw new RenException(String.format("按月份查询各项能力分数,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
+        }
+        //5.封装数据并返回
+        if(null != dj){resultList.add(dj);}
+        if(null != zl){resultList.add(zl);}
+        if(null != fw){resultList.add(fw);}
+
+        return resultList;
     }
 
     /**
@@ -148,7 +217,78 @@ public class FactIndexServiceImpl implements FactIndexService {
      */
     @Override
     public List<MonthScoreListResultDTO> monthScoreList(MonthScoreListFormDTO formDTO) {
-        return null;
+        LinkedList<MonthScoreListResultDTO> resultList = new LinkedList<>();
+        LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> djList = new LinkedList<>();
+        LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> zlList = new LinkedList<>();
+        LinkedList<MonthScoreListResultDTO.ScoreListResultDTO> fwList = new LinkedList<>();
+        //1.计算所查月份前12个月的monthId
+        formDTO.setStartMonthId(getDate(formDTO.getMonthId()));
+        //2.根据类型判断是查询组织数据还是网格数据
+        //组织层级数据
+        if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
+            //3.根据组织Id查询组织信息
+            CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
+            if (null == agency) {
+                throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
+            }
+            //4.根据组织级别判断查询哪类数据表
+            //区县级、乡镇街道级
+            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+                //4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.DJNL);
+                djList = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
+                //4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.ZLNL);
+                zlList = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
+                //4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.FWNL);
+                fwList = factIndexAgencyScoreDao.selectMonthScoreList(formDTO);
+
+                //社区级
+            } else if ("community".equals(agency.getLevel())) {
+                //4-1.查询过去12个月党建能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.DJNL);
+                djList = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
+                //4-2.查询过去12个月治理能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.ZLNL);
+                zlList = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
+                //4-3.查询过去12个月服务能力每月总分、本级得分、下级得分数据
+                formDTO.setIndexCode(FactConstant.FWNL);
+                fwList = factIndexCommunityScoreDao.selectCommunityMonthScoreList(formDTO);
+            } else {
+                throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+            }
+            //网格层级数据
+        } else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
+            //5.查询过去12个月网格层级各项能力对应的各项得分数据
+            //5-1.查询网格过去12个月党建能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.DJNL);
+            djList = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
+            //5-2.查询网格过去12个月治理能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.ZLNL);
+            zlList = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
+            //5-3.查询网格过去12个月服务能力每月总分、本级得分、下级得分数据
+            formDTO.setIndexCode(FactConstant.FWNL);
+            fwList = factIndexGridScoreDao.selectGridMonthScoreList(formDTO);
+        } else {
+            throw new RenException(String.format("能力指数查询,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
+        }
+
+        //5.封装数据并返回
+        MonthScoreListResultDTO dj = new MonthScoreListResultDTO();
+        dj.setIndexCode(FactConstant.DJNL);
+        dj.setScoreList(djList);
+        if(null != djList){resultList.add(dj);}
+        MonthScoreListResultDTO zl = new MonthScoreListResultDTO();
+        zl.setIndexCode(FactConstant.ZLNL);
+        zl.setScoreList(zlList);
+        if(null != zlList){resultList.add(zl);}
+        MonthScoreListResultDTO fw = new MonthScoreListResultDTO();
+        fw.setIndexCode(FactConstant.FWNL);
+        fw.setScoreList(fwList);
+        if(null != fwList){resultList.add(fw);}
+
+        return resultList;
     }
 
     /**
@@ -159,30 +299,41 @@ public class FactIndexServiceImpl implements FactIndexService {
     @Override
     public List<AblityListResultDTO> ablityList(AblityListFormDTO formDTO) {
         List<AblityListResultDTO> resultList = new ArrayList<>();
-        //按月份查询当前组织各项指标数据 fact_index_agency_sub_score
-        //1.根据组织Id查询组织信息
-        CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getAgencyId());
-        if (null == agency) {
-            throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getAgencyId()));
-        }
-        //2.根据组织级别拼接查询条件，判断查询不同数据表
-        //区县级、乡镇街道级
-        if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
-            if ("district".equals(agency.getLevel())) {
-                formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
-            } else {
-                formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode());
+        //1.根据类型判断是查询组织数据还是网格数据
+        //组织层级数据
+        if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
+            //2.根据组织Id查询组织信息
+            CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
+            if (null == agency) {
+                throw new RenException(String.format("根据组织Id未查询到组织信息,组织Id:%s", formDTO.getOrgId()));
             }
-            resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO);
+            //3.根据组织级别拼接查询条件，判断查询不同数据表
+            //区县级、乡镇街道级
+            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+                if ("district".equals(agency.getLevel())) {
+                    formDTO.setAllParentIndexCode(FactConstant.QUAN_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
+                } else {
+                    formDTO.setAllParentIndexCode(FactConstant.JIE_DAO_XIANG_GUAN + ":" + formDTO.getIndexCode());
+                }
+                resultList = factIndexAgencySubScoreDao.selectAblityList(formDTO);
 
-            //社区级
-        } else if ("community".equals(agency.getLevel())) {
-            formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
-            resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO);
+                //社区级
+            } else if ("community".equals(agency.getLevel())) {
+                formDTO.setAllParentIndexCode(FactConstant.SHE_QU_XIANG_GUAN + ":" + formDTO.getIndexCode());
+                resultList = factIndexCommunitySubScoreDao.selectCommunityAblityList(formDTO);
+            } else {
+                throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+            }
+            //网格层级数据
+        } else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
+            //4.查询网格层级各项能力对应指标数据
+            formDTO.setAllParentIndexCode(FactConstant.WANG_GE_XIANG_GUAN + ":" + formDTO.getIndexCode());
+            resultList = factIndexGridSubScoreDao.selectGridAblityList(formDTO);
         } else {
-            throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getAgencyId()));
+            throw new RenException(String.format("按月查询各项指标数据,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
         }
-        //3.调用方法判断各项指标是数字指标还是百分比指标 //TODO
+
+        //4.调用方法判断各项指标是数字指标还是百分比指标 //TODO  记得value值保留一位小数 是数的保留零位小数 是百分比的保留一位小数
         return resultList;
     }
 
@@ -196,24 +347,33 @@ public class FactIndexServiceImpl implements FactIndexService {
         LinkedList<MonthAblityListResultDTO> resultList = new LinkedList<>();
         //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:%s", formDTO.getAgencyId()));
-        }
-
-        //3.根据组织级别拼接查询条件，判断查询不同数据表
-        //区县级、乡镇街道级
-        if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
-            resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO);
-
-            //社区级
-        } else if ("community".equals(agency.getLevel())) {
-            resultList =  factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO);
+        //2.根据类型判断是查询组织数据还是网格数据
+        //组织层级数据
+        if (FactConstant.AGENCY.equals(formDTO.getOrgType())) {
+            //3.根据组织Id查询组织信息
+            CompartmentResultDTO agency = screenCustomerAgencyDao.getAgencyAreaInfo(formDTO.getOrgId());
+            if (null == agency) {
+                throw new RenException(String.format("查询到组织信息失败,组织Id:%s", formDTO.getOrgId()));
+            }
+            //4.根据组织级别拼接查询条件，判断查询不同数据表
+            //区县级、乡镇街道级
+            if ("district".equals(agency.getLevel()) || "street".equals(agency.getLevel())) {
+                resultList = factIndexAgencySubScoreDao.selectMonthAblityList(formDTO);
+                //社区级
+            } else if ("community".equals(agency.getLevel())) {
+                resultList = factIndexCommunitySubScoreDao.selectCommunityMonthAblityList(formDTO);
+            } else {
+                throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getOrgId()));
+            }
+            //网格层级数据
+        } else if (FactConstant.GRID.equals(formDTO.getOrgType())) {
+            //5.查询网格层级某项能力对应的一项指标过去12个月份数据
+            resultList = factIndexGridSubScoreDao.selectGridMonthAblityList(formDTO);
         } else {
-            throw new RenException(String.format("根据组织Id查询到的组织级别信息错误,组织Id:%s", formDTO.getAgencyId()));
+            throw new RenException(String.format("按月查询各项指标最近12个月数据,orgType类型错误，组织Id:%s，类型Type:%s", formDTO.getOrgId(), formDTO.getOrgType()));
         }
-        //3.调用方法判断各项指标是数字指标还是百分比指标//TODO
+
+        //6.调用方法判断各项指标是数字指标还是百分比指标//TODO  记得value值保留一位小数 是数的保留零位小数 是百分比的保留一位小数
         return resultList;
     }
 
@@ -243,7 +403,7 @@ public class FactIndexServiceImpl implements FactIndexService {
      */
     @Override
     public List<PeerComparisonResultDTO> peerComparison(PeerComparisonFormDTO formDTO) {
-        //1.根据组织Id的上级组织Id查询同级组织对应类型的得分排名（查询最近一个月数据）
+        //1.根据组织或网格Id的上级组织Id查询同级组织或网格对应类型的得分排名（查询最近一个月数据）
         List<PeerComparisonResultDTO> resultList = screenIndexDataMonthlyDao.selectScoreList(formDTO);
         return resultList;
     }

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

@@ -3,16 +3,49 @@
 
 <mapper namespace="com.epmet.datareport.dao.fact.FactIndexAgencyScoreDao">
 
-    <select id="selectScore" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+    <select id="selectAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            ROUND(fact.score, 1) AS "indexTotal"
+        FROM
+            fact_index_agency_score fact
+        WHERE
+            fact.del_flag = '0'
+        AND fact.customer_id = #{customerId}
+        AND fact.agency_id = #{orgId}
+        AND fact.month_id &gt; #{startMonthId}
+        AND fact.month_id &lt;= #{monthId}
+        AND fact.index_code = #{indexCode}
+        ORDER BY
+            fact.month_id ASC
+    </select>
 
+    <select id="selectScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+        SELECT
+            #{indexCode} AS "indexCode",
+            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.sub_score, 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 = #{orgId}
+        AND fact.month_id = #{monthId}
+        AND fact.index_code = #{indexCode}
     </select>
 
-    <select id="selectAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
+    <select id="selectMonthScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$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"
+            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.sub_score, 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
@@ -22,7 +55,7 @@
             fact.del_flag = '0'
         AND self.del_flag = '0'
         AND fact.customer_id = #{customerId}
-        AND fact.agency_id = #{agencyId}
+        AND fact.agency_id = #{orgId}
         AND fact.month_id &gt; #{startMonthId}
         AND fact.month_id &lt;= #{monthId}
         AND fact.index_code = #{indexCode}

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

@@ -6,7 +6,7 @@
     <select id="selectAblityList" resultType="com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO">
         SELECT
             fact.index_code AS "key",
-            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
+            IF(fact.origin_value='',0,IFNULL(ROUND(fact.origin_value,1),0)) AS "value",
             dict.index_name AS "name"
         FROM
             fact_index_agency_sub_score fact
@@ -16,14 +16,14 @@
         AND dict.del_flag = '0'
         AND fact.all_parent_index_code = #{allParentIndexCode}
         AND customer_id = #{customerId}
-        AND agency_id = #{agencyId}
+        AND agency_id = #{orgId}
         AND month_id = #{monthId}
     </select>
 
     <select id="selectMonthAblityList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthAblityListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "ablity"
+            IF(fact.origin_value='',0,IFNULL(ROUND(fact.origin_value,1),0)) AS "ablity"
         FROM
             fact_index_agency_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
@@ -31,7 +31,7 @@
             fact.del_flag = '0'
         AND dict.del_flag = '0'
         AND customer_id = #{customerId}
-        AND agency_id = #{agencyId}
+        AND agency_id = #{orgId}
         AND month_id &lt;= #{monthId}
         AND month_id &gt; #{startMonthId}
         AND fact.index_code = #{key}

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

@@ -6,9 +6,46 @@
     <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"
+            ROUND(fact.score, 1) AS "indexTotal"
+        FROM
+            fact_index_community_score fact
+        WHERE
+            fact.del_flag = '0'
+        AND fact.customer_id = #{customerId}
+        AND fact.agency_id = #{orgId}
+        AND fact.month_id &gt; #{startMonthId}
+        AND fact.month_id &lt;= #{monthId}
+        AND fact.index_code = #{indexCode}
+        ORDER BY
+            fact.month_id ASC
+    </select>
+
+    <select id="selectCommunityScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+        SELECT
+            #{indexCode} AS "indexCode",
+            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.sub_score, 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 = #{orgId}
+        AND fact.month_id = #{monthId}
+        AND fact.index_code = #{indexCode}
+    </select>
+
+    <select id="selectCommunityMonthScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.sub_score, 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
@@ -18,7 +55,7 @@
             fact.del_flag = '0'
         AND self.del_flag = '0'
         AND fact.customer_id = #{customerId}
-        AND fact.agency_id = #{agencyId}
+        AND fact.agency_id = #{orgId}
         AND fact.month_id &gt; #{startMonthId}
         AND fact.month_id &lt;= #{monthId}
         AND fact.index_code = #{indexCode}

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

@@ -6,7 +6,7 @@
     <select id="selectCommunityAblityList" resultType="com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO">
         SELECT
             fact.index_code AS "key",
-            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "value",
+            IF(fact.origin_value='',0,IFNULL(ROUND(fact.origin_value,1),0)) AS "value",
             dict.index_name AS "name"
         FROM
             fact_index_community_sub_score fact
@@ -16,14 +16,14 @@
         AND dict.del_flag = '0'
         AND fact.all_parent_index_code = #{allParentIndexCode}
         AND customer_id = #{customerId}
-        AND agency_id = #{agencyId}
+        AND agency_id = #{orgId}
         AND month_id = #{monthId}
     </select>
 
     <select id="selectCommunityMonthAblityList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthAblityListResultDTO">
         SELECT
             fact.month_id AS "monthId",
-            IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS "ablity"
+            IF(fact.origin_value='',0,IFNULL(ROUND(fact.origin_value,1),0)) AS "ablity"
         FROM
             fact_index_community_sub_score fact
         LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
@@ -31,7 +31,7 @@
             fact.del_flag = '0'
         AND dict.del_flag = '0'
         AND customer_id = #{customerId}
-        AND agency_id = #{agencyId}
+        AND agency_id = #{orgId}
         AND month_id &lt;= #{monthId}
         AND month_id &gt; #{startMonthId}
         AND fact.index_code = #{key}

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

@@ -3,5 +3,66 @@
 
 <mapper namespace="com.epmet.datareport.dao.fact.FactIndexGridScoreDao">
 
+    <select id="selectGridAblityIndex" resultType="com.epmet.evaluationindex.screen.dto.result.AblityIndexResultDTO$ScoreListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            ROUND(fact.score, 1) AS "indexTotal"
+        FROM
+            fact_index_grid_score fact
+        WHERE
+            fact.del_flag = '0'
+        AND fact.customer_id = #{customerId}
+        AND fact.grid_id = #{orgId}
+        AND fact.month_id &gt; #{startMonthId}
+        AND fact.month_id &lt;= #{monthId}
+        AND fact.index_code = #{indexCode}
+        ORDER BY
+            fact.month_id ASC
+    </select>
+
+    <select id="selectGridScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.ScoreListResultDTO">
+        SELECT
+            #{indexCode} AS "indexCode",
+            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.sub_score, 1) AS "subAgencyScore"
+        FROM
+            fact_index_grid_score fact
+        INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
+        AND 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.grid_id = #{orgId}
+        AND fact.month_id = #{monthId}
+        AND fact.index_code = #{indexCode}
+    </select>
+
+    <select id="selectGridMonthScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthScoreListResultDTO$ScoreListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            ROUND(fact.score, 1) AS "indexTotal",
+            ROUND(self.self_score, 1) AS "agencyScore",
+            ROUND(self.sub_score, 1) AS "subAgencyScore"
+        FROM
+            fact_index_grid_score fact
+        INNER JOIN fact_index_grid_self_sub_score self ON fact.grid_id = self.grid_id
+        AND 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.grid_id = #{orgId}
+        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/FactIndexGridSubScoreDao.xml

@@ -3,5 +3,40 @@
 
 <mapper namespace="com.epmet.datareport.dao.fact.FactIndexGridSubScoreDao">
 
+    <select id="selectGridAblityList" resultType="com.epmet.evaluationindex.screen.dto.result.AblityListResultDTO">
+        SELECT
+            fact.index_code AS "key",
+            IF(fact.origin_value='',0,IFNULL(ROUND(fact.origin_value,1),0)) AS "value",
+            dict.index_name AS "name"
+        FROM
+            fact_index_grid_sub_score fact
+        LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
+        WHERE
+            fact.del_flag = '0'
+        AND dict.del_flag = '0'
+        AND fact.all_parent_index_code = #{allParentIndexCode}
+        AND customer_id = #{customerId}
+        AND grid_id = #{orgId}
+        AND month_id = #{monthId}
+    </select>
+
+    <select id="selectGridMonthAblityList" resultType="com.epmet.evaluationindex.screen.dto.result.MonthAblityListResultDTO">
+        SELECT
+            fact.month_id AS "monthId",
+            IF(fact.origin_value='',0,IFNULL(ROUND(fact.origin_value,1),0)) AS "ablity"
+        FROM
+            fact_index_grid_sub_score fact
+        LEFT JOIN index_dict dict ON fact.index_code = dict.index_code
+        WHERE
+            fact.del_flag = '0'
+        AND dict.del_flag = '0'
+        AND customer_id = #{customerId}
+        AND grid_id = #{orgId}
+        AND month_id &lt;= #{monthId}
+        AND month_id &gt; #{startMonthId}
+        AND fact.index_code = #{key}
+        ORDER BY
+            fact.month_id ASC
+    </select>
 
 </mapper>

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

@@ -110,8 +110,8 @@
 
     <select id="selectScoreList" resultType="com.epmet.evaluationindex.screen.dto.result.PeerComparisonResultDTO">
         SELECT
-            org_id AS "agencyId",
-            org_name AS "agencyName",
+            org_id AS "orgId",
+            org_name AS "orgName",
             <if test="indexCode != null and indexCode != '' and indexCode == 'dangjiannengli'">
                 round((party_dev_ablity * party_dev_weight),1) AS "score"
             </if>
@@ -125,7 +125,7 @@
             screen_index_data_monthly
         WHERE
             del_flag = '0'
-        AND org_type = 'agency'
+        AND org_type = #{orgType}
         AND customer_id = #{customerId}
         AND parent_id = (
             select
@@ -134,9 +134,9 @@
                 screen_index_data_monthly
             where
                 del_flag = '0'
-            and org_type = 'agency'
+            and org_type = #{orgType}
             and customer_id = #{customerId}
-            and org_id = #{agencyId}
+            and org_id = #{orgId}
             order by
                 created_time desc
             limit 1

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/form/IssueMainDailyFormDTO.java

@@ -91,6 +91,11 @@ public class IssueMainDailyFormDTO implements Serializable {
      */
     private String issueStatus;
 
+    /**
+     * 关闭状态
+     */
+    private String resolveType;
+
     /**
      * 创建话题用户身份标识
      */

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridInfoResultDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.extract.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 2:59 下午
+ */
+@Data
+public class GridInfoResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -8146474744340303247L;
+
+    private String agencyId;
+
+    private String gridId;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/GridPartyDTO.java

@@ -0,0 +1,23 @@
+package com.epmet.dto.extract.result;
+
+import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 2:45 下午
+ */
+@Data
+@AllArgsConstructor
+public class GridPartyDTO implements Serializable {
+
+    private static final long serialVersionUID = -6699064424253966688L;
+
+    private List<String> orgIds;
+
+    private List<PartyBaseInfoFormDTO> result;
+}

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueInfoResultDTO.java

@@ -47,4 +47,9 @@ public class IssueInfoResultDTO implements Serializable {
      * 用户ID
      */
     private String userId;
+
+    /**
+     * 关闭状态
+     */
+    private String resolveType;
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/OrgNameResultDTO.java

@@ -0,0 +1,25 @@
+package com.epmet.dto.extract.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 1:23 下午
+ */
+@Data
+public class OrgNameResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -4815327768546033428L;
+
+    private String gridId;
+
+    private String agencyId;
+
+    private String gridName;
+
+    private String agencyName;
+
+    private String parentId;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.java

@@ -104,21 +104,6 @@ public interface FactIndexGovrnAblityGridMonthlyDao extends BaseDao<FactIndexGov
      **/
     String selectTheOneGrid(CalculateCommonFormDTO formDTO);
 
-    /**
-     * @Description  查询全部网格信息
-     * @param customerId
-     * @author zxc
-     * @date 2020/9/18 10:47 上午
-     */
-    List<GovernAbilityGridMonthlyFormDTO> selectAllGridInfo(String customerId);
-    /**
-     * @Description  查询全部网格信息
-     * @param customerId
-     * @author zxc
-     * @date 2020/9/19 10:50 上午
-     */
-    List<PartyAbilityGridMonthlyFormDTO> selectAllGridInfoToParty(String customerId);
-
     /**
      * @Description  批量插入治理能力
      * @param lists

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCpcBaseDataDao.java

@@ -85,4 +85,12 @@ public interface ScreenCpcBaseDataDao extends BaseDao<ScreenCpcBaseDataEntity> {
      * @date 2020/9/23 2:01 下午
      */
     List<PartyInfoResultDTO> selectPartyInfo(@Param("customerId") String customerId,@Param("dateId") String dateId, String agencyId);
+
+    /**
+     * @Description  查询党员信息【直属网格的】
+     * @param gridIds
+     * @author zxc
+     * @date 2020/9/24 3:23 下午
+     */
+    List<PartyInfoResultDTO> selectDirectGridPartyInfo(@Param("gridIds") List<String> gridIds,@Param("customerId") String customerId,@Param("dateId") String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java

@@ -20,6 +20,7 @@ package com.epmet.dao.evaluationindex.screen;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
+import com.epmet.dto.extract.result.OrgNameResultDTO;
 import com.epmet.dto.screen.result.TreeResultDTO;
 import com.epmet.dto.screencoll.form.CustomerAgencyFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
@@ -152,4 +153,12 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
      * @date 2020/9/23 3:10 下午
      */
     List<PartyBaseInfoFormDTO> selectAllAgencyIdToParty(@Param("customerId")String customerId,@Param("dateId")String dateId);
+
+    /**
+     * @Description  查询org名称【机关】
+     * @param agencyIds
+     * @author zxc
+     * @date 2020/9/24 1:27 下午
+     */
+    List<OrgNameResultDTO> selectOrgNameAgency(@Param("agencyIds") List<String> agencyIds);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/screen/ScreenCustomerGridDao.java

@@ -19,7 +19,11 @@ package com.epmet.dao.evaluationindex.screen;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.ScreenCustomerGridDTO;
+import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
+import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
+import com.epmet.dto.extract.result.GridInfoResultDTO;
+import com.epmet.dto.extract.result.OrgNameResultDTO;
 import com.epmet.dto.indexcal.PageQueryGridFormDTO;
 import com.epmet.dto.screencoll.form.CustomerGridFormDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
@@ -138,4 +142,36 @@ public interface ScreenCustomerGridDao extends BaseDao<ScreenCustomerGridEntity>
      * @date 2020/9/23 3:10 下午
      */
     List<PartyBaseInfoFormDTO> selectAllGridIdToParty(String customerId, String dateId);
+
+    /**
+     * @Description  查询org名称
+     * @param gridIds
+     * @author zxc
+     * @date 2020/9/24 1:27 下午
+     */
+    List<OrgNameResultDTO> selectOrgName(@Param("gridIds") List<String> gridIds);
+
+    /**
+     * @Description  查询机关的直属网格
+     * @param agencyIds
+     * @author zxc
+     * @date 2020/9/24 2:33 下午
+     */
+    List<GridInfoResultDTO> selectDirectGrid(@Param("agencyIds") List<String> agencyIds);
+
+    /**
+     * @Description  查询全部网格信息
+     * @param customerId
+     * @author zxc
+     * @date 2020/9/19 10:50 上午
+     */
+    List<PartyAbilityGridMonthlyFormDTO> selectAllGridInfoToParty(String customerId);
+
+    /**
+     * @Description  查询全部网格信息
+     * @param customerId
+     * @author zxc
+     * @date 2020/9/18 10:47 上午
+     */
+    List<GovernAbilityGridMonthlyFormDTO> selectAllGridInfo(@Param("customerId") String customerId);
 }

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

@@ -15,6 +15,7 @@ import com.epmet.service.evaluationindex.extract.todata.*;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexGovrnAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyService;
 import com.epmet.service.evaluationindex.indexcoll.FactIndexServiceAblityGridMonthlyService;
+import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
 import com.epmet.service.heart.ActInfoService;
 import com.epmet.service.partymember.PartyMemberService;
 import com.epmet.service.stats.FactArticlePublishedGridDailyService;
@@ -74,6 +75,8 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     private UserService userService;
     @Autowired
     private PartyMemberService partyMemberService;
+    @Autowired
+    private ScreenCustomerGridService gridService;
 
     /**
      * @Description  计算网格指标党建能力
@@ -84,7 +87,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
      */
     @Override
     public Boolean calGridIndexPartyAbility(String customerId, String monthId) {
-        List<PartyAbilityGridMonthlyFormDTO> result = governAbilityDao.selectAllGridInfoToParty(customerId);
+        List<PartyAbilityGridMonthlyFormDTO> result = gridService.selectAllGridInfoToParty(customerId);
         if (CollectionUtils.isEmpty(result)){
             log.warn(String.format(ExtractConstant.CUSTOMER_INFO_NULL,customerId));
             return true;
@@ -239,7 +242,7 @@ public class CalGridIndexServiceImpl implements CalGridIndexService {
     @Override
     public Boolean calGridIndexGovernAbility(String customerId, String monthId) {
 
-        List<GovernAbilityGridMonthlyFormDTO> result = governAbilityDao.selectAllGridInfo(customerId);
+        List<GovernAbilityGridMonthlyFormDTO> result = gridService.selectAllGridInfo(customerId);
         if (CollectionUtils.isEmpty(result)){
             log.warn(String.format(ExtractConstant.CUSTOMER_INFO_NULL,customerId));
             return true;

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

@@ -128,7 +128,7 @@ public class IssueExtractServiceImpl implements IssueExtractService {
             agencyInfoList.forEach(pid -> {
                 if (r.getAgencyId().equals(pid.getAgencyId())){
                     r.setPid(pid.getPid());
-                    r.setPids(pid.getPids());
+                    r.setPids(pid.getPids().concat(":").concat(pid.getPid()));
                 }
             });
         });

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/PartyGuideService.java

@@ -0,0 +1,18 @@
+package com.epmet.service.evaluationindex.extract.toscreen;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 5:05 下午
+ */
+public interface PartyGuideService {
+
+    /**
+     * @Description  党建引领抽取
+     * @param customerId
+     * @param dateId
+     * @author zxc
+     * @date 2020/9/24 5:10 下午
+     */
+    Boolean partyGuideExtract(String customerId,String dateId);
+
+}

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

@@ -2,10 +2,7 @@ package com.epmet.service.evaluationindex.extract.toscreen.impl;
 
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
-import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
-import com.epmet.dto.extract.result.PartyInfoResultDTO;
-import com.epmet.dto.extract.result.PartyMemberInfoResultDTO;
-import com.epmet.dto.extract.result.UserCountResultDTO;
+import com.epmet.dto.extract.result.*;
 import com.epmet.service.evaluationindex.extract.toscreen.PartyBaseInfoService;
 import com.epmet.service.evaluationindex.screen.ScreenCpcBaseDataService;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerAgencyService;
@@ -109,56 +106,27 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                 // 是 community 级别，子级为gridId
                 List<UserCountResultDTO> userCountList = userGridDailyService.selectUserCount(customerId, dateId);
                 agencyIdList.forEach(agency -> {
-                    // 1. 处理社区下的所有网格中的党员信息
-                    String agencyId = agency.getAgencyId();
-                    // 获取下级所有agencyId【根据agencyMap中的level判断下级orgId是否是gridId】(此处直接作为gridId)
-                    Map<String, Object> agencyMap = agencyService.selectAllSubAgencyId(agencyId, customerId);
-                    List<String> gridIds = (List<String>) agencyMap.get(agencyId);
-                    orgIds.addAll(gridIds);
-                    List<PartyMemberInfoResultDTO> partyMemberInfoList = partyMemberService.selectPartyMemberInfo(customerId, gridIds);
-                    if (!CollectionUtils.isEmpty(partyMemberInfoList)){
-                        // 为每个人赋值年龄
-                        partyMemberInfoList.forEach(party -> {
-                            party.setAge(getAge(party.getBirthday()));
-                        });
-                        Map<String, List<PartyMemberInfoResultDTO>> groupByGridId = partyMemberInfoList.stream().collect(Collectors.groupingBy(PartyMemberInfoResultDTO::getGridId));
-                        groupByGridId.forEach((gridId,partyInfos) -> {
-                            PartyBaseInfoFormDTO form = new PartyBaseInfoFormDTO();
-                            form.setOrgType(ScreenConstant.GRID);
-                            form.setOrgId(gridId);
-                            form.setOrgName(partyInfos.get(NumConstant.ZERO).getGridName());
-                            form.setAgeLevel1(disposeAge(partyInfos,NumConstant.TWENTY,false));
-                            form.setAgeLevel2(disposeAgeArea(partyInfos,NumConstant.TWENTY,NumConstant.THIRTY));
-                            form.setAgeLevel3(disposeAgeArea(partyInfos,NumConstant.THIRTY_ONE,NumConstant.FORTY));
-                            form.setAgeLevel4(disposeAgeArea(partyInfos,NumConstant.FORTY_ONE,NumConstant.FIFTY));
-                            form.setAgeLevel5(disposeAgeArea(partyInfos,NumConstant.FIFTY_ONE,NumConstant.SIXTY));
-                            form.setAgeLevel6(disposeAge(partyInfos,NumConstant.SIXTY,true));
-                            form.setCustomerId(customerId);
-                            form.setDataEndTime(dateId);
-                            form.setParentId(partyInfos.get(NumConstant.ZERO).getAgencyId());
-                            if (!CollectionUtils.isEmpty(userCountList)){
-                                userCountList.forEach(user -> {
-                                    if (gridId.equals(user.getOrgId())){
-                                        form.setResiTotal(user.getResiTotal());
-                                        form.setRegisterUserCount(user.getRegisterUserCount());
-                                        form.setPartyMemberCount(user.getPartyMemberCount());
-                                    }
-                                });
-                            }
-                            result.add(form);
-                        });
-                    }
+                    GridPartyDTO gridPartyDTO = gridParty(customerId, dateId, agency);
+                    result.addAll(gridPartyDTO.getResult());
+                    orgIds.addAll(gridPartyDTO.getOrgIds());
                 });
                 // 2. 处理社区级别的党员信息(因为网格级别的已算出，社区级别直接累加)
                 Map<String, List<PartyBaseInfoFormDTO>> groupByAgency = result.stream().collect(Collectors.groupingBy(PartyBaseInfoFormDTO::getParentId));
+                List<OrgNameResultDTO> orgNameAgencyList = agencyService.selectOrgNameAgency(result.stream().map(m -> m.getParentId()).distinct().collect(Collectors.toList()));
                 groupByAgency.forEach((commAgencyId,party) -> {
                     PartyBaseInfoFormDTO form = new PartyBaseInfoFormDTO();
-                    form.setOrgName(party.get(NumConstant.ZERO).getOrgName());
+                    if (!CollectionUtils.isEmpty(orgNameAgencyList)){
+                        orgNameAgencyList.forEach(name -> {
+                            if (commAgencyId.equals(name.getAgencyId())){
+                                form.setOrgName(name.getAgencyName());
+                                form.setParentId(name.getParentId());
+                            }
+                        });
+                    }
                     form.setOrgId(commAgencyId);
                     form.setCustomerId(customerId);
                     form.setDataEndTime(dateId);
                     form.setOrgType(ScreenConstant.AGENCY);
-                    form.setParentId(party.get(NumConstant.ZERO).getParentId());
                     form.setAgeLevel1(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getAgeLevel1)));
                     form.setAgeLevel2(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getAgeLevel2)));
                     form.setAgeLevel3(party.stream().collect(Collectors.summingInt(PartyBaseInfoFormDTO::getAgeLevel3)));
@@ -173,10 +141,66 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
                 delAndInsert(result,customerId,dateId,orgIds);
             }else {
                 // 级别为 street，district，city，province
+                List<String> agencyIds = agencyIdList.stream().map(m -> m.getAgencyId()).collect(Collectors.toList());
+                List<GridInfoResultDTO> directGridIds = gridService.selectDirectGrid(agencyIds);
+                List<UserCountResultDTO> userCountList = userGridDailyService.selectUserCount(customerId, dateId);
                 agencyIdList.forEach(agency -> {
                     String agencyId = agency.getAgencyId();
-                    // 查询下级机关的党员信息，直接累加
+                    List<String> dGridId = new ArrayList<>();
+                    directGridIds.forEach(grid -> {
+                        if (agencyId.equals(grid.getAgencyId())){
+                            dGridId.add(grid.getGridId());
+                        }
+                    });
+                    // 不为空 存在直属网格
+                    if (!CollectionUtils.isEmpty(dGridId)){
+                        List<PartyBaseInfoFormDTO> disGrid = new ArrayList<>();
+                        List<PartyMemberInfoResultDTO> partyMemberInfoList = partyMemberService.selectPartyMemberInfo(customerId, dGridId);
+                        List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(partyMemberInfoList.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
+                        if (!CollectionUtils.isEmpty(partyMemberInfoList)){
+                            // 为每个人赋值年龄
+                            partyMemberInfoList.forEach(party -> {
+                                party.setAge(getAge(party.getBirthday()));
+                                orgNameList.forEach(orgName -> {
+                                    if (party.getGridId().equals(orgName.getGridId())){
+                                        party.setGridName(orgName.getGridName());
+                                        party.setAgencyName(orgName.getAgencyName());
+                                    }
+                                });
+                            });
+                            Map<String, List<PartyMemberInfoResultDTO>> groupByGridId = partyMemberInfoList.stream().collect(Collectors.groupingBy(PartyMemberInfoResultDTO::getGridId));
+                            groupByGridId.forEach((gridId,partyInfos) -> {
+                                PartyBaseInfoFormDTO form = new PartyBaseInfoFormDTO();
+                                form.setOrgType(ScreenConstant.GRID);
+                                form.setOrgId(gridId);
+                                form.setOrgName(partyInfos.get(NumConstant.ZERO).getGridName());
+                                form.setAgeLevel1(disposeAge(partyInfos,NumConstant.TWENTY,false));
+                                form.setAgeLevel2(disposeAgeArea(partyInfos,NumConstant.TWENTY,NumConstant.THIRTY));
+                                form.setAgeLevel3(disposeAgeArea(partyInfos,NumConstant.THIRTY_ONE,NumConstant.FORTY));
+                                form.setAgeLevel4(disposeAgeArea(partyInfos,NumConstant.FORTY_ONE,NumConstant.FIFTY));
+                                form.setAgeLevel5(disposeAgeArea(partyInfos,NumConstant.FIFTY_ONE,NumConstant.SIXTY));
+                                form.setAgeLevel6(disposeAge(partyInfos,NumConstant.SIXTY,true));
+                                form.setCustomerId(customerId);
+                                form.setDataEndTime(dateId);
+                                form.setParentId(partyInfos.get(NumConstant.ZERO).getAgencyId());
+                                if (!CollectionUtils.isEmpty(userCountList)){
+                                    userCountList.forEach(user -> {
+                                        if (gridId.equals(user.getOrgId())){
+                                            form.setResiTotal(user.getResiTotal());
+                                            form.setRegisterUserCount(user.getRegisterUserCount());
+                                            form.setPartyMemberCount(user.getPartyMemberCount());
+                                        }
+                                    });
+                                }
+                                disGrid.add(form);
+                            });
+                        }
+                        delAndInsert(disGrid,customerId,dateId,dGridId);
+                    }
+                    // 查询下级机关的党员信息，直接累加 【包括直属网格】
+                    List<PartyInfoResultDTO> directGridList = cpcBaseDataService.selectDirectGridPartyInfo(dGridId, customerId, dateId);
                     List<PartyInfoResultDTO> partyInfoList = cpcBaseDataService.selectPartyInfo(customerId, dateId, agencyId);
+                    partyInfoList.addAll(directGridList);
                     if (!CollectionUtils.isEmpty(partyInfoList)){
                         PartyBaseInfoFormDTO form = new PartyBaseInfoFormDTO();
                         form.setOrgName(partyInfoList.get(NumConstant.ZERO).getOrgName());
@@ -307,4 +331,57 @@ public class PartyBaseInfoServiceImpl implements PartyBaseInfoService {
             cpcBaseDataService.insertPartyBaseInfo(p);
         });
     }
+
+    public GridPartyDTO gridParty(String customerId,String dateId,CustomerAgencyInfoResultDTO agency){
+        List<PartyBaseInfoFormDTO> result = new ArrayList<>();
+        List<String> orgIds = new ArrayList<>();
+        List<UserCountResultDTO> userCountList = userGridDailyService.selectUserCount(customerId, dateId);
+        // 1. 处理社区下的所有网格中的党员信息
+        String agencyId = agency.getAgencyId();
+        // 获取下级所有agencyId【根据agencyMap中的level判断下级orgId是否是gridId】(此处直接作为gridId)
+        Map<String, Object> agencyMap = agencyService.selectAllSubAgencyId(agencyId, customerId);
+        List<String> gridIds = (List<String>) agencyMap.get(agencyId);
+        orgIds.addAll(gridIds);
+        List<PartyMemberInfoResultDTO> partyMemberInfoList = partyMemberService.selectPartyMemberInfo(customerId, gridIds);
+        List<OrgNameResultDTO> orgNameList = agencyService.selectOrgNameGrid(partyMemberInfoList.stream().map(m -> m.getGridId()).collect(Collectors.toList()));
+        if (!CollectionUtils.isEmpty(partyMemberInfoList)){
+            // 为每个人赋值年龄
+            partyMemberInfoList.forEach(party -> {
+                party.setAge(getAge(party.getBirthday()));
+                orgNameList.forEach(orgName -> {
+                    if (party.getGridId().equals(orgName.getGridId())){
+                        party.setGridName(orgName.getGridName());
+                        party.setAgencyName(orgName.getAgencyName());
+                    }
+                });
+            });
+            Map<String, List<PartyMemberInfoResultDTO>> groupByGridId = partyMemberInfoList.stream().collect(Collectors.groupingBy(PartyMemberInfoResultDTO::getGridId));
+            groupByGridId.forEach((gridId,partyInfos) -> {
+                PartyBaseInfoFormDTO form = new PartyBaseInfoFormDTO();
+                form.setOrgType(ScreenConstant.GRID);
+                form.setOrgId(gridId);
+                form.setOrgName(partyInfos.get(NumConstant.ZERO).getGridName());
+                form.setAgeLevel1(disposeAge(partyInfos,NumConstant.TWENTY,false));
+                form.setAgeLevel2(disposeAgeArea(partyInfos,NumConstant.TWENTY,NumConstant.THIRTY));
+                form.setAgeLevel3(disposeAgeArea(partyInfos,NumConstant.THIRTY_ONE,NumConstant.FORTY));
+                form.setAgeLevel4(disposeAgeArea(partyInfos,NumConstant.FORTY_ONE,NumConstant.FIFTY));
+                form.setAgeLevel5(disposeAgeArea(partyInfos,NumConstant.FIFTY_ONE,NumConstant.SIXTY));
+                form.setAgeLevel6(disposeAge(partyInfos,NumConstant.SIXTY,true));
+                form.setCustomerId(customerId);
+                form.setDataEndTime(dateId);
+                form.setParentId(partyInfos.get(NumConstant.ZERO).getAgencyId());
+                if (!CollectionUtils.isEmpty(userCountList)){
+                    userCountList.forEach(user -> {
+                        if (gridId.equals(user.getOrgId())){
+                            form.setResiTotal(user.getResiTotal());
+                            form.setRegisterUserCount(user.getRegisterUserCount());
+                            form.setPartyMemberCount(user.getPartyMemberCount());
+                        }
+                    });
+                }
+                result.add(form);
+            });
+        }
+        return new GridPartyDTO(orgIds, result);
+    }
 }

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

@@ -0,0 +1,26 @@
+package com.epmet.service.evaluationindex.extract.toscreen.impl;
+
+import com.epmet.service.evaluationindex.extract.toscreen.PartyGuideService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author zxc
+ * @DateTime 2020/9/24 5:06 下午
+ */
+@Service
+@Slf4j
+public class PartyGuideServiceImpl implements PartyGuideService {
+
+    /**
+     * @Description  党建引领抽取
+     * @param customerId
+     * @param dateId
+     * @author zxc
+     * @date 2020/9/24 5:10 下午
+     */
+    @Override
+    public Boolean partyGuideExtract(String customerId, String dateId) {
+        return null;
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCpcBaseDataService.java

@@ -60,4 +60,12 @@ public interface ScreenCpcBaseDataService extends BaseService<ScreenCpcBaseDataE
      */
     List<PartyInfoResultDTO> selectPartyInfo(String customerId, String dateId,String agencyId);
 
+    /**
+     * @Description  查询党员信息【直属网格的】
+     * @param gridIds
+     * @author zxc
+     * @date 2020/9/24 3:23 下午
+     */
+    List<PartyInfoResultDTO> selectDirectGridPartyInfo(List<String> gridIds,String customerId,String dateId);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerAgencyService.java

@@ -21,6 +21,8 @@ import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
 
 import java.util.List;
+
+import com.epmet.dto.extract.result.OrgNameResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
 import com.epmet.entity.org.CustomerAgencyEntity;
 
@@ -75,4 +77,20 @@ public interface ScreenCustomerAgencyService{
      * @date 2020/9/23 3:10 下午
      */
     List<PartyBaseInfoFormDTO> selectAllAgencyIdToParty(String customerId,String dateId);
+
+    /**
+     * @Description  查询org名称【网格】
+     * @param gridIds
+     * @author zxc
+     * @date 2020/9/24 1:27 下午
+     */
+    List<OrgNameResultDTO> selectOrgNameGrid(List<String> gridIds);
+
+    /**
+     * @Description  查询org名称【机关】
+     * @param agencyIds
+     * @author zxc
+     * @date 2020/9/24 1:27 下午
+     */
+    List<OrgNameResultDTO> selectOrgNameAgency(List<String> agencyIds);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/ScreenCustomerGridService.java

@@ -19,7 +19,10 @@ package com.epmet.service.evaluationindex.screen;
 
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
+import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
+import com.epmet.dto.extract.result.GridInfoResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
 import com.epmet.entity.org.CustomerGridEntity;
 
@@ -46,4 +49,28 @@ public interface ScreenCustomerGridService extends BaseService<ScreenCustomerGri
      * @date 2020/9/23 3:10 下午
      */
     List<PartyBaseInfoFormDTO> selectAllGridIdToParty(String customerId, String dateId);
+
+    /**
+     * @Description  查询机关的直属网格
+     * @param agencyIds
+     * @author zxc
+     * @date 2020/9/24 2:33 下午
+     */
+    List<GridInfoResultDTO> selectDirectGrid(List<String> agencyIds);
+
+    /**
+     * @Description  查询全部网格信息
+     * @param customerId
+     * @author zxc
+     * @date 2020/9/19 10:50 上午
+     */
+    List<PartyAbilityGridMonthlyFormDTO> selectAllGridInfoToParty(String customerId);
+
+    /**
+     * @Description  查询全部网格信息
+     * @param customerId
+     * @author zxc
+     * @date 2020/9/18 10:47 上午
+     */
+    List<GovernAbilityGridMonthlyFormDTO> selectAllGridInfo(String customerId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCpcBaseDataServiceImpl.java

@@ -26,7 +26,9 @@ import com.epmet.dto.extract.result.PartyInfoResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCpcBaseDataEntity;
 import com.epmet.service.evaluationindex.screen.ScreenCpcBaseDataService;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.List;
 
 
@@ -71,4 +73,18 @@ public class ScreenCpcBaseDataServiceImpl extends BaseServiceImpl<ScreenCpcBaseD
     public List<PartyInfoResultDTO> selectPartyInfo(String customerId, String dateId, String agencyId) {
         return baseDao.selectPartyInfo(customerId, dateId, agencyId);
     }
+
+    /**
+     * @Description  查询党员信息【直属网格的】
+     * @param gridIds
+     * @author zxc
+     * @date 2020/9/24 3:23 下午
+     */
+    @Override
+    public List<PartyInfoResultDTO> selectDirectGridPartyInfo(List<String> gridIds,String customerId,String dateId) {
+        if (!CollectionUtils.isEmpty(gridIds)){
+            return baseDao.selectDirectGridPartyInfo(gridIds, customerId, dateId);
+        }
+        return new ArrayList<>();
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerAgencyServiceImpl.java

@@ -17,13 +17,16 @@
 
 package com.epmet.service.evaluationindex.screen.impl;
 
+import com.epmet.commons.dynamic.datasource.annotation.DataSource;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgSourceTypeConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
+import com.epmet.dto.extract.result.OrgNameResultDTO;
 import com.epmet.dto.screen.result.TreeResultDTO;
 import com.epmet.constant.ScreenConstant;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity;
@@ -50,6 +53,7 @@ import java.util.stream.Collectors;
  */
 @Service
 @Slf4j
+@DataSource(DataSourceConstant.EVALUATION_INDEX)
 public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyService {
 
     @Autowired
@@ -159,6 +163,34 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
         return screenCustomerAgencyDao.selectAllAgencyIdToParty(customerId,dateId);
     }
 
+    /**
+     * @Description  查询org名称
+     * @param gridIds
+     * @author zxc
+     * @date 2020/9/24 1:27 下午
+     */
+    @Override
+    public List<OrgNameResultDTO> selectOrgNameGrid(List<String> gridIds) {
+        if (!CollectionUtils.isEmpty(gridIds)){
+            return screenCustomerGridDao.selectOrgName(gridIds);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  查询org名称【机关】
+     * @param agencyIds
+     * @author zxc
+     * @date 2020/9/24 1:27 下午
+     */
+    @Override
+    public List<OrgNameResultDTO> selectOrgNameAgency(List<String> agencyIds) {
+        if (!CollectionUtils.isEmpty(agencyIds)){
+            return screenCustomerAgencyDao.selectOrgNameAgency(agencyIds);
+        }
+        return new ArrayList<>();
+    }
+
     private void updateAgency(ScreenCustomerAgencyEntity exists) {
         screenCustomerAgencyDao.updateById(exists);
     }
@@ -193,4 +225,6 @@ public class ScreenCustomerAgencyServiceImpl implements ScreenCustomerAgencyServ
     public List<CustomerAgencyInfoResultDTO> selectAllAgencyId(String customerId) {
         return screenCustomerAgencyDao.selectAllAgencyId(customerId);
     }
+
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenCustomerGridServiceImpl.java

@@ -24,14 +24,20 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.constant.OrgSourceTypeConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao;
+import com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO;
+import com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO;
 import com.epmet.dto.extract.form.PartyBaseInfoFormDTO;
+import com.epmet.dto.extract.result.GridInfoResultDTO;
 import com.epmet.entity.evaluationindex.screen.ScreenCustomerGridEntity;
 import com.epmet.entity.org.CustomerGridEntity;
 import com.epmet.service.evaluationindex.screen.ScreenCustomerGridService;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
 
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
@@ -102,4 +108,40 @@ public class ScreenCustomerGridServiceImpl extends BaseServiceImpl<ScreenCustome
     public List<PartyBaseInfoFormDTO> selectAllGridIdToParty(String customerId, String dateId) {
         return screenCustomerGridDao.selectAllGridIdToParty(customerId, dateId);
     }
+
+    /**
+     * @Description  查询机关的直属网格
+     * @param agencyIds
+     * @author zxc
+     * @date 2020/9/24 2:33 下午
+     */
+    @Override
+    public List<GridInfoResultDTO> selectDirectGrid(List<String> agencyIds) {
+        if (!CollectionUtils.isEmpty(agencyIds)){
+            return screenCustomerGridDao.selectDirectGrid(agencyIds);
+        }
+        return new ArrayList<>();
+    }
+
+    /**
+     * @Description  查询全部网格信息
+     * @param customerId
+     * @author zxc
+     * @date 2020/9/19 10:50 上午
+     */
+    @Override
+    public List<PartyAbilityGridMonthlyFormDTO> selectAllGridInfoToParty(String customerId) {
+        return screenCustomerGridDao.selectAllGridInfoToParty(customerId);
+    }
+
+    /**
+     * @Description  查询全部网格信息
+     * @param customerId
+     * @author zxc
+     * @date 2020/9/18 10:47 上午
+     */
+    @Override
+    public List<GovernAbilityGridMonthlyFormDTO> selectAllGridInfo(String customerId) {
+        return screenCustomerGridDao.selectAllGridInfo(customerId);
+    }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -22,6 +22,7 @@
         PIDS,
         AGENCY_ID,
         ISSUE_STATUS,
+        RESOLVE_TYPE,
         TOPIC_USER_IS_PARTY,
         DEL_FLAG,
         REVISION,
@@ -48,6 +49,7 @@
                 #{item.pids},
                 #{item.agencyId},
                 #{item.issueStatus},
+                #{item.resolveType},
                 #{item.topicUserIsParty},
                 #{item.delFlag},
                 #{item.revision},

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcoll/FactIndexGovrnAblityGridMonthlyDao.xml

@@ -162,32 +162,6 @@
             AND m.MONTH_ID =#{monthId}
     </select>
 
-    <!-- 查询全部网格信息 -->
-    <select id="selectAllGridInfo" resultType="com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO">
-        SELECT
-            scg.CUSTOMER_ID,
-            scg.GRID_ID,
-            scg.PARENT_AGENCY_ID AS agencyId
-        FROM
-            screen_customer_grid scg
-        WHERE
-            DEL_FLAG = 0
-            AND CUSTOMER_ID = #{customerId}
-    </select>
-
-    <!-- 查询全部网格信息 -->
-    <select id="selectAllGridInfoToParty" resultType="com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO">
-        SELECT
-            scg.CUSTOMER_ID,
-            scg.GRID_ID,
-            scg.PARENT_AGENCY_ID AS agencyId
-        FROM
-            screen_customer_grid scg
-        WHERE
-            DEL_FLAG = 0
-            AND CUSTOMER_ID = #{customerId}
-    </select>
-
     <!-- 批量插入治理能力 -->
     <insert id="insertGovernAbilityRecord">
         INSERT INTO fact_index_govrn_ablity_grid_monthly (

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCpcBaseDataDao.xml

@@ -38,6 +38,40 @@
             AND PARENT_ID = #{agencyId}
     </select>
 
+    <!-- 查询党员信息【直属网格的】 -->
+    <select id="selectDirectGridPartyInfo" resultType="com.epmet.dto.extract.result.PartyInfoResultDTO">
+        SELECT
+            scbd.CUSTOMER_ID,
+            scbd.ORG_TYPE,
+            scbd.PARENT_ID AS orgId,
+            scbd.REGISTER_USER_COUNT,
+            scbd.RESI_TOTAL,
+            scbd.PARTY_MEMBER_COUNT,
+            scbd.AGE_LEVEL_1,
+            scbd.AGE_LEVEL_2,
+            scbd.AGE_LEVEL_3,
+            scbd.AGE_LEVEL_4,
+            scbd.AGE_LEVEL_5,
+            scbd.AGE_LEVEL_6,
+            scg.PARENT_AGENCY_ID AS parentId,
+            scg.GRID_NAME AS orgName
+        FROM
+            screen_cpc_base_data scbd
+            LEFT JOIN screen_customer_grid scg ON scg.GRID_ID = scbd.ORG_ID
+        WHERE
+            scbd.del_flag = '0'
+            AND scg.DEL_FLAG = 0
+            AND scbd.ORG_TYPE = 'grid'
+            AND scbd.DATA_END_TIME = #{dateId}
+            AND scbd.CUSTOMER_ID = #{customerId}
+            AND
+            (
+              <foreach collection="gridIds" item="gridId" separator=" OR ">
+                  scbd.ORG_ID = #{gridId}
+              </foreach>
+            )
+    </select>
+
     <insert id="batchInsertCpcBaseData" parameterType="map">
         insert into screen_cpc_base_data
         (

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerAgencyDao.xml

@@ -286,4 +286,22 @@
             del_flag = '0'
             AND CUSTOMER_ID = #{customerId}
     </select>
+
+    <!-- 查询org名称【机关】 -->
+    <select id="selectOrgNameAgency" resultType="com.epmet.dto.extract.result.OrgNameResultDTO">
+        SELECT
+            AGENCY_ID,
+            AGENCY_NAME,
+            PID AS parentId
+        FROM
+            screen_customer_agency
+        WHERE
+            DEL_FLAG = 0
+            AND
+            (
+                <foreach collection="agencyIds" item="agencyId" separator=" or ">
+                    agency_id = #{agencyId}
+                </foreach>
+            )
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenCustomerGridDao.xml

@@ -233,4 +233,67 @@
             del_flag = '0'
           AND CUSTOMER_ID = #{customerId}
     </select>
+
+    <!-- 查询org名称 -->
+    <select id="selectOrgName" resultType="com.epmet.dto.extract.result.OrgNameResultDTO">
+        SELECT
+            scg.GRID_NAME,
+            scg.GRID_ID,
+            sca.AGENCY_NAME
+        FROM
+            screen_customer_grid scg
+                LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = scg.PARENT_AGENCY_ID
+        WHERE
+            scg.DEL_FLAG = 0
+            AND sca.DEL_FLAG = 0
+            AND
+               (
+               <foreach collection="gridIds" item="gridId" separator=" OR ">
+                   scg.grid_id = #{gridId}
+               </foreach>
+               )
+    </select>
+
+    <!-- 查询机关的直属网格 -->
+    <select id="selectDirectGrid" resultType="com.epmet.dto.extract.result.GridInfoResultDTO">
+        SELECT
+            PARENT_AGENCY_ID AS agencyId,
+            GRID_ID
+        FROM
+            screen_customer_grid
+        WHERE
+            DEL_FLAG = 0
+            AND
+            (
+                <foreach collection="agencyIds" item="agencyId" separator=" OR ">
+                    PARENT_AGENCY_ID = #{agencyId}
+                </foreach>
+            )
+    </select>
+
+    <!-- 查询全部网格信息 -->
+    <select id="selectAllGridInfoToParty" resultType="com.epmet.dto.extract.form.PartyAbilityGridMonthlyFormDTO">
+        SELECT
+            scg.CUSTOMER_ID,
+            scg.GRID_ID,
+            scg.PARENT_AGENCY_ID AS agencyId
+        FROM
+            screen_customer_grid scg
+        WHERE
+            DEL_FLAG = 0
+            AND CUSTOMER_ID = #{customerId}
+    </select>
+
+    <!-- 查询全部网格信息 -->
+    <select id="selectAllGridInfo" resultType="com.epmet.dto.extract.form.GovernAbilityGridMonthlyFormDTO">
+        SELECT
+            scg.CUSTOMER_ID,
+            scg.GRID_ID,
+            scg.PARENT_AGENCY_ID AS agencyId
+        FROM
+            screen_customer_grid scg
+        WHERE
+            DEL_FLAG = 0
+            AND CUSTOMER_ID = #{customerId}
+    </select>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -209,9 +209,8 @@
     <select id="selectIssueInfo" resultType="com.epmet.dto.extract.result.IssueInfoResultDTO">
         SELECT
             ID AS issueId,
-            (case when RESOLVE_TYPE = 'resolved' then 'closed_resolved'
-                  when RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
-                  else ISSUE_STATUS end ) AS ISSUE_STATUS,
+            ISSUE_STATUS,
+            RESOLVE_TYPE as resolveType,
             SOURCE_ID AS topicId,
             CUSTOMER_ID,
             GRID_ID,

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/stats/DimCustomerPartymemberDao.xml

@@ -96,16 +96,10 @@
             dcp.GRID_ID,
             dcp.AGENCY_ID,
             dcp.PARENT_ID,
-            dcp.BIRTHDAY,
-            scg.GRID_NAME,
-            sca.AGENCY_NAME
+            dcp.BIRTHDAY
         FROM dim_customer_partymember dcp
-        LEFT JOIN screen_customer_grid scg ON scg.GRID_ID = dcp.GRID_ID
-        LEFT JOIN screen_customer_agency sca ON sca.AGENCY_ID = dcp.AGENCY_ID
         WHERE
             dcp.DEL_FLAG = '0'
-            AND scg.DEL_FLAG = 0
-            AND sca.DEL_FLAG = 0
             AND dcp.CUSTOMER_ID = #{customerId}
             AND
                 (