Merge branch 'dev_third_data' into dev_temp

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

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

@@ -45,6 +45,7 @@
         SELECT
             fact.index_code,
             IF(fact.origin_value='',0,IFNULL(fact.origin_value,0)) AS origin_value,
+            IF(fact.SAMPLE_COUNT='',0,IFNULL(fact.SAMPLE_COUNT,0)) AS quantity,
             round(fact.score,2) AS score,
             round(fact.WEIGHT,2) AS weight
         FROM

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcal/AgencyAndParentResultDTO.java

@@ -0,0 +1,26 @@
+package com.epmet.dto.indexcal;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/5/26 1:47 下午
+ * @DESC
+ */
+@Data
+public class AgencyAndParentResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7300464262794241276L;
+
+    /**
+     * 组织ID
+     */
+    private String agencyId;
+
+    /**
+     * parentId
+     */
+    private String pid;
+}

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

@@ -24,6 +24,7 @@ import com.epmet.dto.extract.form.ScreenPartyLinkMassesDataFormDTO;
 import com.epmet.dto.extract.result.AgencyMonthCountResultDTO;
 import com.epmet.dto.extract.result.CustomerAgencyInfoResultDTO;
 import com.epmet.dto.extract.result.OrgNameResultDTO;
+import com.epmet.dto.indexcal.AgencyAndParentResultDTO;
 import com.epmet.dto.indexcollect.form.CustomerBizOrgFormDTO;
 import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screen.result.TreeResultDTO;
@@ -33,6 +34,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 组织机构信息
@@ -99,6 +101,14 @@ public interface ScreenCustomerAgencyDao extends BaseDao<ScreenCustomerAgencyEnt
     String selectParentId(@Param("agencyId") String agencyId);
     String selectAgencyId(@Param("areaCode") String areaCode);
 
+    /**
+     * @Description  查询客户下所有的组织的上级组织
+     * @Param
+     * @author zxc
+     * @date 2021/5/26 10:38 上午
+     */
+    List<AgencyAndParentResultDTO> selectAgencyIdAndParentId(@Param("customerId") String customerId);
+
     /**
      * 返回当前客户下，未匹配到的 【乡（镇、街道）级、区县级】 组织信息
      *

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java

@@ -327,6 +327,10 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             result.setAvgValue(new BigDecimal(0));
             result.setSampleCount(0);
         }
+
+        if (result.getAvgValue() == null) {
+            result.setAvgValue(new BigDecimal(NumConstant.ZERO));
+        }
         //FOR TEST
         /*BigDecimal result=null;
         if(IndexCalConstant.S1_C1_G1.equals(gridId)){
@@ -354,6 +358,9 @@ public class GridCorreLationServiceImpl implements GridCorreLationService {
             result.setSampleCount(0);
             result.setAvgValue(new BigDecimal(0));
         }
+        if (result.getAvgValue() == null) {
+            result.setAvgValue(new BigDecimal(NumConstant.ZERO));
+        }
         //FOR TEST
         /*BigDecimal result=null;
         if(IndexCalConstant.S1_C1_G1.equals(gridId)){

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java

@@ -19,10 +19,7 @@ import com.epmet.dao.evaluationindex.indexcal.DeptScoreDao;
 import com.epmet.dao.evaluationindex.indexcoll.FactIndexPartyAblityOrgMonthlyDao;
 import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao;
 import com.epmet.dao.evaluationindex.screen.ScreenCustomerAgencyDao;
-import com.epmet.dto.indexcal.AgencyCalResultDTO;
-import com.epmet.dto.indexcal.AgencyScoreDTO;
-import com.epmet.dto.indexcal.CalculateCommonFormDTO;
-import com.epmet.dto.indexcal.SubAgencyScoreAvgResultDTO;
+import com.epmet.dto.indexcal.*;
 import com.epmet.dto.screen.ScreenProjectOrgDailyDTO;
 import com.epmet.dto.screen.result.MaxAndMinBigDecimalResultDTO;
 import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity;
@@ -222,7 +219,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
-
+        Map<String, String> agencyMap = agencyMap(customerId);
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
         //党建能力平均值
@@ -242,7 +239,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }
@@ -314,6 +312,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> pid = new HashMap<>();
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvg(customerId, monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),IndexCalConstant.STREET_LEVEL);
@@ -335,7 +334,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }
@@ -405,6 +405,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         Map<String, String> pid = new HashMap<>();
         // key:agencyId,value:sampleCount样本量
         Map<String, Integer> gridPartyScoreSampleCountMap = new HashMap<>();
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
@@ -429,7 +430,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }
@@ -643,6 +645,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        Map<String, String> agencyMap = agencyMap(customerId);
         //党建能力平均值
         indexDetailList.forEach(detail -> {
             if (IndexCodeEnum.QU_XIA_JI_JIE_DDJNLHZPJZ.getCode().equals(detail.getIndexCode())) {
@@ -657,7 +660,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         party.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }else {
@@ -727,6 +731,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             if (IndexCodeEnum.SUO_YOU_JIE_DAO_ZLNLPJZ.getCode().equals(detail.getIndexCode())) {
                 List<SubAgencyScoreAvgResultDTO> districtGovernAvgList = agencyScoreDao.selectAgencyScoreAvgExistsSub(monthId, IndexCodeEnum.ZHI_LI_NENG_LI.getCode(),form.getCustomerAreaCode());
@@ -745,7 +750,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         avg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }else {
@@ -813,6 +819,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         }
         List<IndexInputVO> indexInputVOS = new ArrayList<>();
         Map<String, String> pid = new HashMap<>();
+        Map<String, String> agencyMap = agencyMap(customerId);
         detailListByParentCode.forEach(detail -> {
             String indexCode = detail.getIndexCode();
             if (IndexCodeEnum.QU_XIA_SHU_JIE_DFWNLHZPJZ.getCode().equals(indexCode)) {
@@ -833,7 +840,8 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
                         List<SampleValue> index1SampleValues = new ArrayList<>();
                         serviceAvg.forEach(c -> {
                             if (!c.getParentId().equals(NumConstant.ZERO_STR)) {
-                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+//                                pid.put(c.getParentId(), customerAgencyDao.selectPid(c.getParentId()));
+                                pid.put(c.getParentId(), agencyMap.get(c.getParentId()));
                                 SampleValue s = new SampleValue(c.getParentId(), c.getScore());
                                 index1SampleValues.add(s);
                             }else {
@@ -907,5 +915,19 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
         return true;
     }
 
+    /**
+     * @Description  查询客户下的所有组织parentId
+     * @Param customerId
+     * @author zxc
+     * @date 2021/5/26 1:44 下午
+     */
+    public Map<String,String> agencyMap(String customerId){
+        Map<String,String> result = new HashMap<>(16);
+        List<AgencyAndParentResultDTO> dtos = customerAgencyDao.selectAgencyIdAndParentId(customerId);
+        dtos.forEach(d -> {
+            result.put(d.getAgencyId(),d.getPid());
+        });
+        return result;
+    }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.17__inxdex_explain.sql

@@ -0,0 +1,77 @@
+CREATE TABLE `index_explain` (
+                                 `ID` varchar(64) NOT NULL COMMENT '主键',
+                                 `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id',
+                                 `TITLE` varchar(32) NOT NULL COMMENT '名称',
+                                 `INDEX_CODE` varchar(256) NOT NULL COMMENT '指标code',
+                                 `MEANING` varchar(256) NOT NULL COMMENT '含义',
+                                 `ORG_LEVEL` varchar(16) NOT NULL COMMENT '组织级别（网格级：grid;社区级：community;乡（镇、街道）级:street;区县级: district;市级: city;省级:province）',
+                                 `PID` varchar(16) NOT NULL COMMENT '父ID',
+                                 `SORT` int(11) NOT NULL COMMENT '排序',
+                                 `IS_SEARCH` tinyint(1) NOT NULL DEFAULT '0' COMMENT '是否需要查询；1有；0:无；',
+                                 `TYPE` varchar(16) NOT NULL DEFAULT 'none' COMMENT '数据类型：none；本级：self；下级：sub',
+                                 `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标记 0：未删除，1：已删除',
+                                 `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁',
+                                 `CREATED_BY` varchar(32) NOT NULL DEFAULT 'app_user' COMMENT '创建人',
+                                 `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                 `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+                                 `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                 PRIMARY KEY (`ID`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='指标说明文案';
+
+#更新含义
+update index_dict SET INDEX_DESC='自然月周期内，网格内注册群众用户数。' WHERE INDEX_CODE = 'wanggequnzhongyhs';
+update index_dict SET INDEX_DESC='自然月周期内，网格内注册党员用户数。' WHERE INDEX_CODE = 'wanggedangyuanyhs';
+update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的群众用户。' WHERE INDEX_CODE = 'wanggehuoyueqzyhs';
+update index_dict SET INDEX_DESC='自然月周期内，参与话题、事件评论、点赞、点踩总次数大于给定阈值的党员用户。' WHERE INDEX_CODE = 'wanggehuoyuedyyhs';
+update index_dict SET INDEX_DESC='自然月周期内，网格内党员提出的总话题数与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtchts';
+update index_dict SET INDEX_DESC='自然月周期内，网格内群众提出的总话题数与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtchts';
+update index_dict SET INDEX_DESC='自然月周期内，网格内所有党员提出的议题转为项目的数目与党员人数之比。' WHERE INDEX_CODE = 'wanggedangyuanrjtcdytzxms';
+update index_dict SET INDEX_DESC='自然月周期内，网格内所有群众提出的议题转为项目的数目与群众人数之比。' WHERE INDEX_CODE = 'wanggequnzhongrjtcdytzxms';
+update index_dict SET INDEX_DESC='自然月周期内，党员自建群（群主）数量。' WHERE INDEX_CODE = 'jianqundangyuans';
+update index_dict SET INDEX_DESC='自然月周期内，党员自建群群众人数乘相关权重、党员自建群活跃群众人数乘相关权重、党员自建群活跃度-话题数乘相关权重与自建群活跃度-议题转项目率乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydlxqznlkpfpjz';
+update index_dict SET INDEX_DESC='自然月周期内，网格内所有发文数量' WHERE INDEX_CODE = 'wanggedifawsl';
+update index_dict SET INDEX_DESC='自然月周期内，已转项目议题数与近两个自然月内议题总数之比' WHERE INDEX_CODE = 'wanggeyitizxml';
+update index_dict SET INDEX_DESC='自然月周期内，本网格内注册党员活动签到次数。' WHERE INDEX_CODE = 'dangyuancanjiashykrc';
+update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'xiashusuoyouwgddjnlpjz';
+update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区党建指数得分之和与网格总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqdjnlhzpjz';
+update index_dict SET INDEX_DESC='自然月周期内，街道内所有发文数量' WHERE INDEX_CODE = 'jiedaomingyifwsl';
+update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道党建指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiajijieddjnlhzpjz';
+update index_dict SET INDEX_DESC='自然月周期内，区内所有发文数量' WHERE INDEX_CODE = 'qumingyifawsl';
+update index_dict SET INDEX_DESC='自然月周期内，党员提出话题数乘相关权重、党员参与话题数乘相关权重、党员提出的话题转议题数乘相关权重与党员提出的议题转项目数乘相关权重之和' WHERE INDEX_CODE = 'zuzhineidangydcyysnlkpfpjz';
+update index_dict SET INDEX_DESC='自然月周期内，网格内成员提出议题的总数量' WHERE INDEX_CODE = 'wanggezongyitsm';
+update index_dict SET INDEX_DESC='自然月周期内，新增议题数与发布议题人数去重之比' WHERE INDEX_CODE = 'wanggerenjunytsm';
+update index_dict SET INDEX_DESC='自然月周期内，议题转化的项目数' WHERE INDEX_CODE = 'wanggezongxiangms';
+update index_dict SET INDEX_DESC='自然月周期内，从议题创建到项目关闭，包括处理人，没有出过议题所属网格的项目数。' WHERE INDEX_CODE = 'wanggezizhixms';
+update index_dict SET INDEX_DESC='自然月周期内，办结的项目数' WHERE INDEX_CODE = 'wanggebanjiexms';
+update index_dict SET INDEX_DESC='自然月周期内，未被退回的项目数与项目总数之比' WHERE INDEX_CODE = 'wanggechuishaobmzql';
+update index_dict SET INDEX_DESC='自然月周期内，网格内自治办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'wanggeneijiejdxmdmyd';
+update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格治理指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiashusywgzlnlhzpjz';
+update index_dict SET INDEX_DESC='自然月周期内，社区被吹哨的次数' WHERE INDEX_CODE = 'shequbeichuiscs';
+update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexms';
+update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'shequxiangmuxyd';
+update index_dict SET INDEX_DESC='自然月周期内，超期项目数与结案项目数之比' WHERE INDEX_CODE = 'shequchaoqixml';
+update index_dict SET INDEX_DESC='自然月周期内，社区办结项目数目' WHERE INDEX_CODE = 'shequbanjiexml';
+update index_dict SET INDEX_DESC='自然月周期内，社区级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'shequbanjiexmmyd';
+update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区治理指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusysqzlnlhz';
+update index_dict SET INDEX_DESC='自然月周期内，街道被吹哨的次数' WHERE INDEX_CODE = 'jiedaobeichuiscs';
+update index_dict SET INDEX_DESC='自然月周期内，街道办结项目数目' WHERE INDEX_CODE = 'jiedaobanjiexms';
+update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'jiedaoxiangmuxyd';
+update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'jiedaobanjiexmdclxl';
+update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目数目与街道级尚未办结的项目数的比例' WHERE INDEX_CODE = 'jiedaoxiangmubjl';
+update index_dict SET INDEX_DESC='自然月周期内，街道级办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'jiedaojixiangmmyd';
+update index_dict SET INDEX_DESC='自然月周期内，区直部门被吹哨的次数' WHERE INDEX_CODE = 'quzhibumenbcscs';
+update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目' WHERE INDEX_CODE = 'quzhibumenbjxms';
+update index_dict SET INDEX_DESC='自然月周期内，项目受理时长（分钟）与项目数之比' WHERE INDEX_CODE = 'quzhibumenxmxyd';
+update index_dict SET INDEX_DESC='自然月周期内，办结项目的平均处理时长的倒数' WHERE INDEX_CODE = 'quzhibumenbjxmdclxl';
+update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目数目与区直部门尚未办结的项目数的比例' WHERE INDEX_CODE = 'quzhibumenxmbjl';
+update index_dict SET INDEX_DESC='自然月周期内，区直部门办结项目的满意度评价的平均分（非常满意100，满意80，一般60）' WHERE INDEX_CODE = 'quzhibumenxmmyd';
+update index_dict SET INDEX_DESC='所有指数部门治理指数（平均值）得分=区直部门各项治理指数指标数据平均分*相关权重之和' WHERE INDEX_CODE = 'suoyouzhishubmzlnlpjz';
+update index_dict SET INDEX_DESC='自然月周期内，网格内爱心活动组织次数。' WHERE INDEX_CODE = 'wanggehuodongzzcs';
+update index_dict SET INDEX_DESC='自然月周期内，志愿者内党员数与志愿者总数之比' WHERE INDEX_CODE = 'wanggezhiyuanzzb';
+update index_dict SET INDEX_DESC='自然月周期内，网格内党员志愿者总数与网格党员总人数之比。' WHERE INDEX_CODE = 'wanggedangyuanzyzl';
+update index_dict SET INDEX_DESC='自然月周期内，社区下所有网格服务指数得分之和与网格总数之比' WHERE INDEX_CODE = 'shequxiajisywgfwnldfpjz';
+update index_dict SET INDEX_DESC='自然月周期内，社区内爱心活动组织次数。' WHERE INDEX_CODE = 'shequhuodongzzcs';
+update index_dict SET INDEX_DESC='自然月周期内，街道下所有社区服务指数得分之和与社区总数之比' WHERE INDEX_CODE = 'jiedaoxiashusqfwnldfpjz';
+update index_dict SET INDEX_DESC='自然月周期内，街道内爱心活动组织次数。' WHERE INDEX_CODE = 'jiedaohuodongzzcs';
+update index_dict SET INDEX_DESC='自然月周期内，区下级所有街道服务指数得分之和与街道总数之比' WHERE INDEX_CODE = 'quxiashujiedfwnlhzpjz';
+

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

@@ -427,6 +427,18 @@
         (SELECT DEPT_ID AS orgId FROM screen_customer_dept WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId})
     </select>
 
+    <!-- 查询客户下所有的组织的上级组织 -->
+    <select id="selectAgencyIdAndParentId" resultType="com.epmet.dto.indexcal.AgencyAndParentResultDTO">
+        SELECT
+            AGENCY_ID,
+            PID
+        FROM
+            screen_customer_agency
+        WHERE
+            DEL_FLAG = 0
+          AND CUSTOMER_ID = #{customerId}
+    </select>
+
     <!-- 查询顶级组织ID -->
     <select id="selectTopAgency" resultType="com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity">
         SELECT

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java

@@ -96,4 +96,9 @@ public class AgencysResultDTO implements Serializable {
      * 组织区划的名称
      */
     private String areaName;
+
+    /**
+     * 当前组织对应客户根组织级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province）
+     */
+    private String rootlevel;
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -151,8 +151,9 @@ public class AgencyController {
      * @Description 组织首页-获取组织机构信息
      */
     @PostMapping("agencydetail")
-    @RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_TRACE)
-    public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
+    //@RequirePermission(requirePermission = RequirePermissionEnum.ORG_AGENCY_TRACE)
+    //public Result<AgencysResultDTO> agencyDetail(@LoginUser TokenDto tokenDTO, @RequestBody AgencydetailFormDTO formDTO) {
+    public Result<AgencysResultDTO> agencyDetail(@RequestBody AgencydetailFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO, AgencydetailFormDTO.AddUserInternalGroup.class);
         return agencyService.agencyDetail(formDTO);
     }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -237,6 +237,19 @@ public class AgencyServiceImpl implements AgencyService {
         agencysResultDTO = ConvertUtils.sourceToTarget(entity, AgencysResultDTO.class);
         agencysResultDTO.setAgencyId(entity.getId());
         agencysResultDTO.setAgencyName(entity.getOrganizationName());
+        //2021.5.26 sun 添加当前组织对应客户的根组织级别返参  start
+        if (null != entity) {
+            if (null == entity.getPids() || "".equals(entity.getPids())) {
+                agencysResultDTO.setRootlevel(entity.getLevel());
+            } else {
+                String id = Arrays.asList(entity.getPids().split(":")).get(0);
+                CustomerAgencyEntity rootEntity = customerAgencyDao.selectById(id);
+                if (null != rootEntity) {
+                    agencysResultDTO.setRootlevel(rootEntity.getLevel());
+                }
+            }
+        }
+        //2021.5.26 sun 添加当前组织对应客户的根组织级别返参  end
         //2:查询本机关的所有上级机关，按自上而下层级顺序
         if (null == entity.getPids()) {
             agencysResultDTO.setParentList(parentList);