+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dataaggre.dao.datastats;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.entity.datastats.FactGridMemberStatisticsDailyEntity;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 网格员数据统计_日统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-07-05
+ */
+@Mapper
+public interface FactGridMemberStatisticsDailyDao extends BaseDao {
+
+ /**
+ * @Description 查询网格员统计数据
+ * @return
+ * @author wxz
+ * @date 2021.07.05 13:19
+ */
+ List listGridMemberDataStats(@Param("gridIds") List gridIds,
+ @Param("searchedStaffName") String searchedStaffName,
+ @Param("month") String month,
+ @Param("sort") String sort);
+
+ /**
+ * @Description 查询网格员议题项目统计数据
+ * @return
+ * @author wxz
+ * @date 2021.07.05 16:17
+ */
+ GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(@Param("staffId") String staffId);
+}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java
index 9d3004c815..b3ca304972 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java
@@ -18,8 +18,10 @@
package com.epmet.dataaggre.dao.epmetuser;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
/**
* 政府工作人员表
@@ -29,5 +31,10 @@ import org.apache.ibatis.annotations.Mapper;
*/
@Mapper
public interface CustomerStaffDao extends BaseDao {
-
+
+ /**
+ * @Description 按staffId查询基础信息
+ * @author sun
+ */
+ CustomerStaffDTO selectByMobile(@Param("customerId") String customerId, @Param("mobile") String mobile);
}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java
index 5c6cb03bdb..36385a7cbd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffPatrolRecordDao.java
@@ -23,6 +23,7 @@ import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
import com.epmet.dataaggre.entity.epmetuser.StaffPatrolRecordEntity;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -41,4 +42,15 @@ public interface StaffPatrolRecordDao extends BaseDao {
*/
List selectPatrolList(StaffListFormDTO formDTO);
+ /**
+ * @Description 按条件查询巡查业务数据V2
+ * @author sun
+ */
+ List selectStaffPatrolList(StaffListFormDTO formDTO);
+
+ /**
+ * @Description 汇总查询当前工作人员所有巡查记录数据
+ * @author sun
+ */
+ StaffListResultDTO selectPersonalPatrolList(@Param("staffId") String staffId);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
index c9084a0b4b..197b4e05e6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/evaluationindex/EvaluationIndexDao.java
@@ -18,9 +18,14 @@
package com.epmet.dataaggre.dao.evaluationindex;
import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
+
/**
* @Author sun
* @Description 指标统计服务
@@ -34,4 +39,60 @@ public interface EvaluationIndexDao {
* @author sun
*/
GovrnRatioResultDTO getAgnecyOrGridGoverRatio(@Param("orgId") String orgId, @Param("orgType") String orgType, @Param("dateId") String dateId);
+
+ /**
+ * @Description 查询areaCode对应的直属下级且不是agencyId对应的客户id的客户组织列表
+ * @author sun
+ */
+ List getAgencyByAreaCodeAgencyId(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode);
+
+ /**
+ * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查
+ * @author sun
+ */
+ List getSubAgencyList(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode);
+
+ /**
+ * @Description 查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ * @author sun
+ */
+ List getSubGridList(@Param("agencyId") String agencyId);
+
+ /**
+ * 根据组织Id查询治理指数
+ * @author zhaoqifeng
+ * @date 2021/6/25 16:36
+ * @param agencyIds
+ * @param dateId
+ * @return java.util.List
+ */
+ ScreenGovernRankDataDailyDTO getGovernRankList(@Param("agencyIds") List agencyIds, @Param("dateId") String dateId);
+
+ /**
+ * 获取组织信息
+ * @author zhaoqifeng
+ * @date 2021/6/29 13:58
+ * @param agencyId
+ * @return com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO
+ */
+ ScreenCustomerAgencyDTO getAgencyInfo(@Param("agencyId") String agencyId);
+
+ /**
+ * @Description 查询agencyId对应组织信息
+ * @author sun
+ */
+ ScreenCustomerAgencyDTO getByAgencyId(@Param("agencyId") String agencyId);
+
+ /**
+ * @Description 存在子客户的，查询当前组织的areaCode对应的直属下级且不是agencyId对应的客户id的但是存在父子客户关系的客户组织列表
+ * @author sun
+ */
+ List getAgencyIdsByAgencyId(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List list);
+
+ /**
+ * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查且是在当前客户和子客户范围内查询
+ * @author sun
+ */
+ List getSubAgencyListByAgency(@Param("agencyId") String agencyId, @Param("areaCode") String areaCode, @Param("list") List list);
+
}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
index cc73cc2c1f..3fcc8655ed 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java
@@ -62,4 +62,10 @@ public interface CustomerGridDao extends BaseDao {
* @Description 查询工作人员所属组织下网格列表
**/
List gridListByStaffId(@Param("staffId") String staffId);
+
+ /**
+ * @Description 有网格列表的查询网格基本信息，没有的查询工作人员所属组织级下级所有的网格信息
+ * @author sun
+ */
+ List getGridInfoList(@Param("gridIds") List gridIds, @Param("staffId") String staffId);
}
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java
index f8b58c698b..445e796c61 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java
@@ -18,6 +18,7 @@
package com.epmet.dataaggre.dao.govorg;
import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
import com.epmet.dataaggre.entity.govorg.CustomerStaffAgencyEntity;
import org.apache.ibatis.annotations.Mapper;
@@ -38,4 +39,9 @@ public interface CustomerStaffAgencyDao extends BaseDao selectUsedAreaCodeList(String areaCode);
+
+ /**
+ * 根据customerId查询其所有下级子客户id
+ * @author zhaoqifeng
+ * @date 2021/6/29 11:04
+ * @param customerId
+ * @return java.util.List
+ */
+ List selectAllSubCustomerIds(String customerId);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java
new file mode 100644
index 0000000000..d709731f77
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/datastats/FactAgencyGovernDailyEntity.java
@@ -0,0 +1,174 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+
+package com.epmet.dataaggre.entity.datastats;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 网格员数据统计_日统计
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2021-07-05
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_grid_member_statistics_daily")
+public class FactGridMemberStatisticsDailyEntity extends BaseEpmetEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * yyyyMMdd
+ */
+ private String dateId;
+
+ /**
+ * 月份ID
+ */
+ private String monthId;
+
+ /**
+ * 年度ID
+ */
+ private String yearId;
+
+ /**
+ * 来源类型 external:外部，internal:内部
+ */
+ private String sourceType;
+
+ /**
+ * 客户Id
+ */
+ private String customerId;
+
+ /**
+ * 数据来源客户Id
+ */
+ private String sourceCustomerId;
+
+ /**
+ * 组织ID
+ */
+ private String agencyId;
+
+ /**
+ * 网格I
+ */
+ private String gridId;
+
+ /**
+ * 上级ID（项目来源Agency的上级组织Id）
+ */
+ private String pid;
+
+ /**
+ * 所有agencyId的上级组织ID（包含agencyId）
+ */
+ private String pids;
+
+ /**
+ * 工作人员ID
+ */
+ private String staffId;
+
+ /**
+ * 工作人员姓名
+ */
+ private String staffName;
+
+ /**
+ * 项目立项数
+ */
+ private Integer projectCount;
+
+ /**
+ * 议题转项目数
+ */
+ private Integer issueToProjectCount;
+
+ /**
+ * 议题关闭数
+ */
+ private Integer closedIssueCount;
+
+ /**
+ * 项目响应数
+ */
+ private Integer projectResponseCount;
+
+ /**
+ * 项目吹哨数
+ */
+ private Integer projectTransferCount;
+
+ /**
+ * 项目结案数
+ */
+ private Integer projectClosedCount;
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java
index d10c281e10..be03ad7913 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleEntity.java
@@ -63,6 +63,11 @@ public class GovStaffRoleEntity extends BaseEpmetEntity {
*/
private Integer fullTimeOnly;
+ /**
+ * 角色对应的职责说明
+ */
+ private String description;
+
/**
* 排序
*/
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java
index 24e77d5ef3..aa6b1e6db9 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/GovStaffRoleTemplateEntity.java
@@ -58,4 +58,14 @@ public class GovStaffRoleTemplateEntity extends BaseEpmetEntity {
*/
private Integer fullTimeOnly;
+ /**
+ * 角色对应的职责说明
+ */
+ private String description;
+
+ /**
+ * 排序
+ */
+ private String sort;
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java
new file mode 100644
index 0000000000..3702bbb319
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/AggreGridService.java
@@ -0,0 +1,20 @@
+package com.epmet.dataaggre.service;
+
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+
+import java.util.List;
+
+/**
+ * @Description 聚合的网格相关service，不指定具体的数据源，它调用其他子service，子service中指定具体数据源
+ * @author wxz
+ * @date 2021.07.05 13:06:35
+*/
+public interface AggreGridService {
+ /**
+ * @Description 网格员数据统计列表查询
+ * @return
+ * @author wxz
+ * @date 2021.07.05 11:17
+ */
+ List getGridMemberDataAnalysis(List gridIds, String searchedStaffName, String currStaffId, String month, String sort, Integer pageNo, Integer pageSize);
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
index 8b08a765d2..36ec2943db 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java
@@ -3,9 +3,11 @@ package com.epmet.dataaggre.service.datastats;
import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
import com.epmet.dataaggre.dto.datastats.form.*;
import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
+import java.security.PrivateKey;
import java.util.List;
/**
@@ -159,4 +161,25 @@ public interface DataStatsService {
* @author sun
*/
GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
+
+ /**
+ * @Description 查询网格员统计数据列表
+ * @return
+ * @author wxz
+ * @date 2021.07.05 13:13
+ */
+ List listGridMemberDataStats(List gridIds,
+ String searchedStaffName,
+ String month,
+ String sort,
+ Integer pageNo,
+ Integer pageSize);
+
+ /**
+ * @Description 单个网格员议题项目统计数据
+ * @return
+ * @author wxz
+ * @date 2021.07.05 16:05
+ */
+ GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
index b61338b163..bfa9a29710 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
@@ -1,20 +1,30 @@
package com.epmet.dataaggre.service.datastats.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.constant.OrgConstant;
import com.epmet.dataaggre.dao.datastats.DataStatsDao;
+import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao;
import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO;
import com.epmet.dataaggre.dto.datastats.form.*;
import com.epmet.dataaggre.dto.datastats.result.*;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO;
import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO;
import com.epmet.dataaggre.entity.datastats.DimAgencyEntity;
import com.epmet.dataaggre.entity.datastats.DimGridEntity;
+import com.epmet.dataaggre.entity.datastats.FactGridMemberStatisticsDailyEntity;
+import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity;
import com.epmet.dataaggre.service.datastats.DataStatsService;
import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+import com.github.pagehelper.PageHelper;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -42,6 +52,11 @@ public class DataStatsServiceImpl implements DataStatsService {
private DataStatsDao dataStatsDao;
@Autowired
private EvaluationIndexService indexService;
+ @Autowired
+ private CustomerRelation customerRelation;
+
+ @Autowired
+ private FactGridMemberStatisticsDailyDao factGridMemberStatisticsDailyDao;
/**
@@ -52,6 +67,7 @@ public class DataStatsServiceImpl implements DataStatsService {
@Override
public AgencyBasicDataResultDTO agencyBasicData(AgenctBasicDataFormDTO formDTO) {
AgencyBasicDataResultDTO resultDTO = new AgencyBasicDataResultDTO();
+ List agencyList = new ArrayList<>();
resultDTO.setAgencyId(formDTO.getAgencyId());
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(NumConstant.THREE);
@@ -63,78 +79,100 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setDateId(format.format(yesterday));
}
+ //0.根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+ agencyList = indexService.getAgencyIdsByAgencyId(formDTO.getAgencyId());
+ agencyList.add(formDTO.getAgencyId());
+
//1.查询组织下注册用户最新日统计数据【只查询注册用户的统计数据，不涉及参与用户的】
- AgencyBasicDataResultDTO user = dataStatsDao.getAgnecyRegUser(formDTO.getAgencyId(), formDTO.getDateId());
- if (null != user) {
- resultDTO.setUserTotal(user.getUserTotal());
- resultDTO.setResiTotal(user.getResiTotal());
- resultDTO.setResiRatio(user.getResiTotal() == 0 || user.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) user.getResiTotal() / (float) user.getUserTotal())));
- resultDTO.setPartyMemberTotal(user.getPartyMemberTotal());
- resultDTO.setPartyMemberRatio(user.getPartyMemberTotal() == 0 || user.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) user.getPartyMemberTotal() / (float) user.getUserTotal())));
- }
+ List userList = dataStatsDao.getAgnecyRegUser(agencyList, formDTO.getDateId());
+ int userTotal = 0;
+ int resiTotal = 0;
+ int partyMemberTotal = 0;
+ for (AgencyBasicDataResultDTO u : userList){
+ userTotal+=u.getUserTotal();
+ resiTotal+=u.getResiTotal();
+ partyMemberTotal+=u.getPartyMemberTotal();
+ }
+ resultDTO.setUserTotal(userTotal);
+ resultDTO.setResiTotal(resiTotal);
+ resultDTO.setResiRatio(resultDTO.getResiTotal() == 0 || resultDTO.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getResiTotal() / (float) resultDTO.getUserTotal())));
+ resultDTO.setPartyMemberTotal(partyMemberTotal);
+ resultDTO.setPartyMemberRatio(resultDTO.getPartyMemberTotal() == 0 || resultDTO.getUserTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPartyMemberTotal() / (float) resultDTO.getUserTotal())));
//2.查询组织下最新群组日统计数据
- AgencyBasicDataResultDTO group = dataStatsDao.getAgnecyGroup(formDTO.getAgencyId(), formDTO.getDateId());
- if (null != group) {
- resultDTO.setGroupTotal(group.getGroupTotal());
- resultDTO.setOrdinaryTotal(group.getOrdinaryTotal());
- resultDTO.setOrdinaryRatio(group.getOrdinaryTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getOrdinaryTotal() / (float) group.getGroupTotal())));
- resultDTO.setBranchTotal(group.getBranchTotal());
- resultDTO.setBranchRatio(group.getBranchTotal() == 0 || group.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) group.getBranchTotal() / (float) group.getGroupTotal())));
- }
+ List groupList = dataStatsDao.getAgnecyGroup(agencyList, formDTO.getDateId());
+ int groupTotal = 0;
+ int ordinaryTotal = 0;
+ int branchTotal = 0;
+ for (AgencyBasicDataResultDTO g : groupList){
+ groupTotal+=g.getGroupTotal();
+ ordinaryTotal+=g.getOrdinaryTotal();
+ branchTotal+=g.getBranchTotal();
+ }
+ resultDTO.setGroupTotal(groupTotal);
+ resultDTO.setOrdinaryTotal(ordinaryTotal);
+ resultDTO.setOrdinaryRatio(resultDTO.getOrdinaryTotal() == 0 || resultDTO.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getOrdinaryTotal() / (float) resultDTO.getGroupTotal())));
+ resultDTO.setBranchTotal(branchTotal);
+ resultDTO.setBranchRatio(resultDTO.getBranchTotal() == 0 || resultDTO.getGroupTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getBranchTotal() / (float) resultDTO.getGroupTotal())));
//3.查询组织下最新话题日统计数据
//状态话题-机关日统计数据表最新日期三种状态数据
//机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
- List topic = dataStatsDao.getAgencyTopic(formDTO.getAgencyId(), formDTO.getDateId());
+ List topic = dataStatsDao.getAgencyTopic(agencyList, formDTO.getDateId());
//转议题话题-机关日统计数据表
- AgencyBasicDataResultDTO.Topic topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(formDTO.getAgencyId(), formDTO.getDateId());
+ List topicSHiftIssue = dataStatsDao.getAgencyTopicShiftIssue(agencyList, formDTO.getDateId());
//热议中话题-机关日统计数据
- AgencyBasicDataResultDTO.Topic hotdiscuss = dataStatsDao.getAgencyTopicHotDiscuss(formDTO.getAgencyId(), formDTO.getDateId());
- AtomicReference closedTotal = new AtomicReference<>(0);
- if (topic.size() > NumConstant.ZERO) {
- resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
- topic.forEach(t -> {
- if (t.getTopicStatus().equals("closed")) {
- closedTotal.set(t.getTopicCount());
- }
- });
- }
+ List hotdiscuss = dataStatsDao.getAgencyTopicHotDiscuss(agencyList, formDTO.getDateId());
+ //话题总数
+ resultDTO.setTopicTotal(topic.stream().collect(Collectors.summingInt(AgencyBasicDataResultDTO.Topic::getTopicCount)));
+ int closedTotal = topic.stream().filter(t -> t.getTopicStatus().equals("closed")).mapToInt(AgencyBasicDataResultDTO.Topic::getTopicCount).sum();
//转议题
- if (null != topicSHiftIssue) {
- resultDTO.setShiftIssueTotal(topicSHiftIssue.getShiftedIssueTotal());
- resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
- }
+ int shiftIssueTotal = topicSHiftIssue.stream().mapToInt(AgencyBasicDataResultDTO.Topic::getShiftedIssueTotal).sum();
+ resultDTO.setShiftIssueTotal(shiftIssueTotal);
+ resultDTO.setShiftIssueRatio(resultDTO.getShiftIssueTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftIssueTotal() / (float) resultDTO.getTopicTotal())));
//热议中
- if (null != hotdiscuss) {
- resultDTO.setDiscussingTotal(hotdiscuss.getTopicCount());
- resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
- }
+ int discussingTotal = hotdiscuss.stream().mapToInt(AgencyBasicDataResultDTO.Topic::getTopicCount).sum();
+ resultDTO.setDiscussingTotal(discussingTotal);
+ resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
//已处理
- resultDTO.setClosedTopicTotal(closedTotal.get());
+ resultDTO.setClosedTopicTotal(closedTotal);
resultDTO.setClosedTopicRatio(resultDTO.getClosedTopicTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedTopicTotal() / (float) resultDTO.getTopicTotal())));
//4.查询组织下最新议题日统计数据
- AgencyBasicDataResultDTO issue = dataStatsDao.getAgencyIssue(formDTO.getAgencyId(), formDTO.getDateId());
- if (null != issue) {
- resultDTO.setIssueTotal(issue.getIssueTotal());
- resultDTO.setVotingTotal(issue.getVotingTotal());
- resultDTO.setVotingRatio(resultDTO.getVotingTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getVotingTotal() / (float) resultDTO.getIssueTotal())));
- resultDTO.setClosedIssueTotal(issue.getClosedIssueTotal());
- resultDTO.setClosedIssueRatio(resultDTO.getClosedIssueTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedIssueTotal() / (float) resultDTO.getIssueTotal())));
- resultDTO.setShiftProjectTotal(issue.getShiftProjectTotal());
- resultDTO.setShiftProjectRatio(resultDTO.getShiftProjectTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftProjectTotal() / (float) resultDTO.getIssueTotal())));
- }
+ List issueList = dataStatsDao.getAgencyIssue(agencyList, formDTO.getDateId());
+ int issueTotal = 0;
+ int votingTotal = 0;
+ int closedIssueTotal = 0;
+ int shiftProjectTotal = 0;
+ for (AgencyBasicDataResultDTO i : issueList){
+ issueTotal+=i.getIssueTotal();
+ votingTotal+=i.getVotingTotal();
+ closedIssueTotal+=i.getClosedIssueTotal();
+ shiftProjectTotal+=i.getShiftProjectTotal();
+ }
+ resultDTO.setIssueTotal(issueTotal);
+ resultDTO.setVotingTotal(votingTotal);
+ resultDTO.setVotingRatio(resultDTO.getVotingTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getVotingTotal() / (float) resultDTO.getIssueTotal())));
+ resultDTO.setClosedIssueTotal(closedIssueTotal);
+ resultDTO.setClosedIssueRatio(resultDTO.getClosedIssueTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedIssueTotal() / (float) resultDTO.getIssueTotal())));
+ resultDTO.setShiftProjectTotal(shiftProjectTotal);
+ resultDTO.setShiftProjectRatio(resultDTO.getShiftProjectTotal() == 0 || resultDTO.getIssueTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getShiftProjectTotal() / (float) resultDTO.getIssueTotal())));
//5.查询组织下最新项目日统计数据
- AgencyBasicDataResultDTO project = dataStatsDao.getAgencyProject(formDTO.getAgencyId(), formDTO.getDateId());
- if (null != project) {
- resultDTO.setProjectTotal(project.getProjectTotal());
- resultDTO.setPendingTotal(project.getPendingTotal());
- resultDTO.setPendingRatio(resultDTO.getPendingTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPendingTotal() / (float) resultDTO.getProjectTotal())));
- resultDTO.setClosedProjectTotal(project.getClosedProjectTotal());
- resultDTO.setClosedProjectRatio(resultDTO.getClosedProjectTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedProjectTotal() / (float) resultDTO.getProjectTotal())));
- }
+ List projectList = dataStatsDao.getAgencyProject(agencyList, formDTO.getDateId());
+ int projectTotal = 0;
+ int pendingTotal = 0;
+ int closedProjectTotal = 0;
+ for (AgencyBasicDataResultDTO p : projectList){
+ projectTotal+=p.getProjectTotal();
+ pendingTotal+=p.getPendingTotal();
+ closedProjectTotal+=p.getClosedProjectTotal();
+ }
+ resultDTO.setProjectTotal(projectTotal);
+ resultDTO.setPendingTotal(pendingTotal);
+ resultDTO.setPendingRatio(resultDTO.getPendingTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getPendingTotal() / (float) resultDTO.getProjectTotal())));
+ resultDTO.setClosedProjectTotal(closedProjectTotal);
+ resultDTO.setClosedProjectRatio(resultDTO.getClosedProjectTotal() == 0 || resultDTO.getProjectTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getClosedProjectTotal() / (float) resultDTO.getProjectTotal())));
return resultDTO;
}
@@ -258,23 +296,25 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("user");
}
- //1.查询当前组织的直属下级组织信息【机关维度】
- List subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+ //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+ List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
if (subAgencyList.size() < NumConstant.ONE) {
return resultList;
}
- List agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+ List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
//2.查询直属下级组织注册用户日统计数据，默认按用户总数降序
List list = dataStatsDao.getSubAgencyUser(agencyIds, formDTO.getDateId());
//3.封装数据
- for (DimAgencyEntity sub : subAgencyList) {
+ for (ScreenCustomerAgencyDTO sub : subAgencyList) {
SubAgencyUserResultDTO dto = new SubAgencyUserResultDTO();
- dto.setAgencyId(sub.getId());
+ dto.setAgencyId(sub.getAgencyId());
dto.setAgencyName(sub.getAgencyName());
+ dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+ dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
for (SubAgencyUserResultDTO u : list) {
- if (sub.getId().equals(u.getAgencyId())) {
+ if (sub.getAgencyId().equals(u.getAgencyId())) {
dto.setUserTotal(u.getUserTotal());
dto.setPartyMemberTotal(u.getPartyMemberTotal());
dto.setResiTotal(u.getResiTotal());
@@ -327,23 +367,23 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("user");
}
- //1.查询组织直属网格列表【网格维度】
- List gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+ //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ List gridList = indexService.getSubGridList(formDTO.getAgencyId());
if (gridList.size() < NumConstant.ONE) {
return resultList;
}
- List gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+ List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//2.查询网格层级注册用户日统计数据，默认按用户总数降序
List list = dataStatsDao.getSubGridUser(gridIds, formDTO.getDateId());
//3.封装数据
- for (DimGridEntity gr : gridList) {
+ for (ScreenCustomerGridDTO gr : gridList) {
SubGridUserResultDTO dto = new SubGridUserResultDTO();
- dto.setGridId(gr.getId());
+ dto.setGridId(gr.getGridId());
dto.setGridName(gr.getGridName());
for (SubGridUserResultDTO re : list) {
- if (gr.getId().equals(re.getGridId())) {
+ if (gr.getGridId().equals(re.getGridId())) {
dto.setUserTotal(re.getUserTotal());
dto.setPartyMemberTotal(re.getPartyMemberTotal());
dto.setResiTotal(re.getResiTotal());
@@ -394,23 +434,25 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("group");
}
- //1.查询当前组织的直属下级组织信息【机关维度】
- List subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+ //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+ List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
if (subAgencyList.size() < NumConstant.ONE) {
return resultList;
}
- List agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+ List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
//2.查询直属下级组织小组日统计数据，默认按群组总数降序
List list = dataStatsDao.getSubAgencyGroup(agencyIds, formDTO.getDateId());
//3.封装数据
- for (DimAgencyEntity sub : subAgencyList) {
+ for (ScreenCustomerAgencyDTO sub : subAgencyList) {
SubAgencyGroupResultDTO dto = new SubAgencyGroupResultDTO();
- dto.setAgencyId(sub.getId());
+ dto.setAgencyId(sub.getAgencyId());
dto.setAgencyName(sub.getAgencyName());
+ dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+ dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
for (SubAgencyGroupResultDTO u : list) {
- if (sub.getId().equals(u.getAgencyId())) {
+ if (sub.getAgencyId().equals(u.getAgencyId())) {
dto.setGroupTotal(u.getGroupTotal());
dto.setOrdinaryTotal(u.getOrdinaryTotal());
dto.setBranchTotal(u.getBranchTotal());
@@ -460,23 +502,23 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("group");
}
- //1.查询组织直属网格列表【网格维度】
- List gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+ //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ List gridList = indexService.getSubGridList(formDTO.getAgencyId());
if (gridList.size() < NumConstant.ONE) {
return resultList;
}
- List gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+ List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//2.查询网格层级小组日统计数据，默认按群组总数降序
List list = dataStatsDao.getSubGridGroup(gridIds, formDTO.getDateId());
//3.封装数据并返回
- for (DimGridEntity gr : gridList) {
+ for (ScreenCustomerGridDTO gr : gridList) {
SubGridGroupResultDTO dto = new SubGridGroupResultDTO();
- dto.setGridId(gr.getId());
+ dto.setGridId(gr.getGridId());
dto.setGridName(gr.getGridName());
for (SubGridGroupResultDTO re : list) {
- if (gr.getId().equals(re.getGridId())) {
+ if (gr.getGridId().equals(re.getGridId())) {
dto.setGroupTotal(re.getGroupTotal());
dto.setOrdinaryTotal(re.getOrdinaryTotal());
dto.setBranchTotal(re.getBranchTotal());
@@ -527,12 +569,12 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("topic");
}
- //1.查询当前组织的直属下级组织信息【机关维度】
- List subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+ //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+ List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
if (subAgencyList.size() < NumConstant.ONE) {
return resultList;
}
- List agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+ List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
//2.查询直属下级组织状态话题-日统计数据
//机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念
@@ -548,7 +590,7 @@ public class DataStatsServiceImpl implements DataStatsService {
AtomicInteger shiftIssueTotal = new AtomicInteger(0);
AtomicInteger hotdiscussTotal = new AtomicInteger(0);
topic.forEach(t -> {
- if (t.getAgencyId().equals(sub.getId())) {
+ if (t.getAgencyId().equals(sub.getAgencyId())) {
topicTotal.addAndGet(t.getTopicCount());
if (t.getTopicStatus().equals("closed")) {
closedTotal.set(t.getTopicCount());
@@ -556,18 +598,20 @@ public class DataStatsServiceImpl implements DataStatsService {
}
});
topicShiftIssue.forEach(t -> {
- if (t.getAgencyId().equals(sub.getId())) {
+ if (t.getAgencyId().equals(sub.getAgencyId())) {
shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
}
});
hotdiscuss.forEach(t -> {
- if (t.getAgencyId().equals(sub.getId())) {
+ if (t.getAgencyId().equals(sub.getAgencyId())) {
hotdiscussTotal.addAndGet(t.getTopicCount());
}
});
- resultDTO.setAgencyId(sub.getId());
+ resultDTO.setAgencyId(sub.getAgencyId());
resultDTO.setAgencyName(sub.getAgencyName());
+ resultDTO.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+ resultDTO.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
resultDTO.setTopicTotal(topicTotal.get());
resultDTO.setDiscussingTotal(hotdiscussTotal.get());
resultDTO.setDiscussingRatio(resultDTO.getDiscussingTotal() == 0 || resultDTO.getTopicTotal() == 0 ? BigDecimal.ZERO : new BigDecimal(numberFormat.format((float) resultDTO.getDiscussingTotal() / (float) resultDTO.getTopicTotal())));
@@ -621,12 +665,12 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("topic");
}
- //1.查询组织直属网格列表【网格维度】
- List gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+ //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ List gridList = indexService.getSubGridList(formDTO.getAgencyId());
if (gridList.size() < NumConstant.ONE) {
return resultList;
}
- List gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+ List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//2.查询网格层级话题数据
//查询网格层级状态话题-日统计数据 机关日表里三种类型数据之和就是话题总量，讨论中数量与热议中不是一个概念，热议中=总量-关闭数-屏蔽数-转议题数
@@ -642,7 +686,7 @@ public class DataStatsServiceImpl implements DataStatsService {
AtomicInteger shiftIssueTotal = new AtomicInteger(0);
AtomicInteger hotdiscussTotal = new AtomicInteger(0);
topic.forEach(t -> {
- if (t.getGridId().equals(gr.getId())) {
+ if (t.getGridId().equals(gr.getGridId())) {
topicTotal.addAndGet(t.getTopicCount());
if (t.getTopicStatus().equals("closed")) {
closedTotal.set(t.getTopicCount());
@@ -650,17 +694,17 @@ public class DataStatsServiceImpl implements DataStatsService {
}
});
topicShiftIssue.forEach(t -> {
- if (t.getGridId().equals(gr.getId())) {
+ if (t.getGridId().equals(gr.getGridId())) {
shiftIssueTotal.addAndGet(t.getShiftedIssueTotal());
}
});
hotdiscuss.forEach(t -> {
- if (t.getGridId().equals(gr.getId())) {
+ if (t.getGridId().equals(gr.getGridId())) {
hotdiscussTotal.addAndGet(t.getTopicCount());
}
});
- resultDTO.setGridId(gr.getId());
+ resultDTO.setGridId(gr.getGridId());
resultDTO.setGridName(gr.getGridName());
resultDTO.setTopicTotal(topicTotal.get());
resultDTO.setDiscussingTotal(hotdiscussTotal.get());
@@ -714,23 +758,25 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("issue");
}
- //1.查询当前组织的直属下级组织信息【机关维度】
- List subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+ //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+ List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
if (subAgencyList.size() < NumConstant.ONE) {
return resultList;
}
- List agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+ List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
//2.查询直属下级组织议题日统计数据，默认按议题总数降序
List list = dataStatsDao.getSubAgencyIssue(agencyIds, formDTO.getDateId());
//3.封装数据
- for (DimAgencyEntity sub : subAgencyList) {
+ for (ScreenCustomerAgencyDTO sub : subAgencyList) {
SubAgencyIssueResultDTO dto = new SubAgencyIssueResultDTO();
- dto.setAgencyId(sub.getId());
+ dto.setAgencyId(sub.getAgencyId());
dto.setAgencyName(sub.getAgencyName());
+ dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+ dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
for (SubAgencyIssueResultDTO u : list) {
- if (sub.getId().equals(u.getAgencyId())) {
+ if (sub.getAgencyId().equals(u.getAgencyId())) {
dto.setIssueTotal(u.getIssueTotal());
dto.setVotingTotal(u.getVotingTotal());
dto.setClosedIssueTotal(u.getClosedIssueTotal());
@@ -784,23 +830,23 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("issue");
}
- //1.查询组织直属网格列表【网格维度】
- List gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+ //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ List gridList = indexService.getSubGridList(formDTO.getAgencyId());
if (gridList.size() < NumConstant.ONE) {
return resultList;
}
- List gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+ List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//2.查询网格层级议题日统计数据，默认按议题总数降序
List list = dataStatsDao.getSubGridIssue(gridIds, formDTO.getDateId());
//3.封装数据
- for (DimGridEntity gr : gridList) {
+ for (ScreenCustomerGridDTO gr : gridList) {
SubGridIssueResultDTO dto = new SubGridIssueResultDTO();
- dto.setGridId(gr.getId());
+ dto.setGridId(gr.getGridId());
dto.setGridName(gr.getGridName());
for (SubGridIssueResultDTO re : list) {
- if (gr.getId().equals(re.getGridId())) {
+ if (gr.getGridId().equals(re.getGridId())) {
dto.setIssueTotal(re.getIssueTotal());
dto.setVotingTotal(re.getVotingTotal());
dto.setClosedIssueTotal(re.getClosedIssueTotal());
@@ -854,23 +900,25 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("project");
}
- //1.查询当前组织的直属下级组织信息【机关维度】
- List subAgencyList = dataStatsDao.getSubAgencyList(formDTO.getAgencyId());
+ //1.查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+ List subAgencyList = indexService.getSubAgencyListByAgency(formDTO.getAgencyId());
if (subAgencyList.size() < NumConstant.ONE) {
return resultList;
}
- List agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+ List agencyIds = subAgencyList.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
//2.查询直属下级组织项目日统计数据，默认按项目总数降序
List list = dataStatsDao.getSubAgencyProject(agencyIds, formDTO.getDateId());
//3.封装数据
- for (DimAgencyEntity sub : subAgencyList) {
+ for (ScreenCustomerAgencyDTO sub : subAgencyList) {
SubAgencyProjectResultDTO dto = new SubAgencyProjectResultDTO();
- dto.setAgencyId(sub.getId());
+ dto.setAgencyId(sub.getAgencyId());
dto.setAgencyName(sub.getAgencyName());
+ dto.setLevel(null == sub.getLevel() ? "" : sub.getLevel());
+ dto.setAreaCode(null == sub.getAreaCode() ? "" : sub.getAreaCode());
for (SubAgencyProjectResultDTO u : list) {
- if (sub.getId().equals(u.getAgencyId())) {
+ if (sub.getAgencyId().equals(u.getAgencyId())) {
dto.setProjectTotal(u.getProjectTotal());
dto.setPendingTotal(u.getPendingTotal());
dto.setClosedProjectTotal(u.getClosedProjectTotal());
@@ -920,23 +968,23 @@ public class DataStatsServiceImpl implements DataStatsService {
formDTO.setType("project");
}
- //1.查询组织直属网格列表【网格维度】
- List gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+ //1.查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ List gridList = indexService.getSubGridList(formDTO.getAgencyId());
if (gridList.size() < NumConstant.ONE) {
return resultList;
}
- List gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+ List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//2.查询网格层级项目日统计数据，默认按项目总数降序
List list = dataStatsDao.getSubGridProject(gridIds, formDTO.getDateId());
//3.封装数据
- for (DimGridEntity gr : gridList) {
+ for (ScreenCustomerGridDTO gr : gridList) {
SubGridProjectResultDTO dto = new SubGridProjectResultDTO();
- dto.setGridId(gr.getId());
+ dto.setGridId(gr.getGridId());
dto.setGridName(gr.getGridName());
for (SubGridProjectResultDTO re : list) {
- if (gr.getId().equals(re.getGridId())) {
+ if (gr.getGridId().equals(re.getGridId())) {
dto.setProjectTotal(re.getProjectTotal());
dto.setPendingTotal(re.getPendingTotal());
dto.setClosedProjectTotal(re.getClosedProjectTotal());
@@ -1078,6 +1126,7 @@ public class DataStatsServiceImpl implements DataStatsService {
public AgencyGovrnResultDTO agencyGovrn(AgencyGovrnFormDTO formDTO) {
AgencyGovrnResultDTO resultDTO = new AgencyGovrnResultDTO();
resultDTO.setAgencyId(formDTO.getAgencyId());
+ resultDTO.setLevel(formDTO.getLevel());
NumberFormat numberFormat = NumberFormat.getInstance();
numberFormat.setMaximumFractionDigits(NumConstant.THREE);
@@ -1087,6 +1136,42 @@ public class DataStatsServiceImpl implements DataStatsService {
SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
formDTO.setDateId(format.format(yesterday));
}
+ ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId());
+ if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+ if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
+ List subAgencyIds = indexService.getAgencyByAreaCodeAgencyId(formDTO.getAgencyId(), agencyDTO.getAreaCode());
+ if (CollectionUtils.isEmpty(subAgencyIds)) {
+ subAgencyIds = new ArrayList<>();
+ }
+ subAgencyIds.add(formDTO.getAgencyId());
+ List list = dataStatsDao.getAgencyGovernDaily(subAgencyIds, formDTO.getDateId());
+ if (CollectionUtils.isNotEmpty(list)) {
+ //问题解决总数
+ Integer problemResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getProblemResolvedCount).sum();
+ //未出小组即未转议题的：话题关闭已解决数
+ Integer inGroupTopicResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getInGroupTopicResolvedCount).sum();
+ //未出小组即未转议题的：话题关闭无需解决数
+ Integer inGroupTopicUnResolvedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getInGroupTopicUnResolvedCount).sum();
+ //未出当前网格的，结案项目数
+ Integer gridSelfGovernProjectTotal = list.stream().mapToInt(FactAgencyGovernDailyEntity::getGridSelfGovernProjectTotal).sum();
+ //由社区结案的项目总数
+ Integer communityClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getCommunityClosedCount).sum();
+ //由街道结案的项目总数
+ Integer streetClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getStreetClosedCount).sum();
+ //由区直部门结案的项目总数
+ Integer districtDeptClosedCount = list.stream().mapToInt(FactAgencyGovernDailyEntity::getDistrictDeptClosedCount).sum();
+
+ resultDTO.setProblemResolvedCount(problemResolvedCount);
+ resultDTO.setGroupSelfGovernRatio(getPercentage(inGroupTopicResolvedCount + inGroupTopicUnResolvedCount, problemResolvedCount));
+ resultDTO.setGridSelfGovernRatio(getPercentage(gridSelfGovernProjectTotal, problemResolvedCount));
+ resultDTO.setCommunityResolvedRatio(getPercentage(communityClosedCount, problemResolvedCount));
+ resultDTO.setStreetResolvedRatio(getPercentage(streetClosedCount, problemResolvedCount));
+ resultDTO.setDistrictDeptResolvedRatio(getPercentage(districtDeptClosedCount, problemResolvedCount));
+
+ return resultDTO;
+ }
+ }
+ }
//1.按日期查询当前组织事件治理指数
List agencyIds = new ArrayList<>();
agencyIds.add(formDTO.getAgencyId());
@@ -1125,6 +1210,18 @@ public class DataStatsServiceImpl implements DataStatsService {
return resultList;
}
List agencyIds = subAgencyList.stream().map(DimAgencyEntity::getId).collect(Collectors.toList());
+ ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getAgencyId());
+ if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+ List subAgencies = indexService.getSubAgencyList(formDTO.getAgencyId(), agencyDTO.getAreaCode());
+ agencyIds = subAgencies.stream().map(ScreenCustomerAgencyDTO::getAgencyId).collect(Collectors.toList());
+ subAgencyList = subAgencies.stream().map(item -> {
+ DimAgencyEntity entity = new DimAgencyEntity();
+ entity.setId(item.getAgencyId());
+ entity.setAgencyName(item.getAgencyName());
+ entity.setLevel(item.getLevel());
+ return entity;
+ }).collect(Collectors.toList());
+ }
//2.按日期查询所有下级组织的事件治理指数
List list = dataStatsDao.getAgencyGovern(agencyIds, formDTO.getDateId());
@@ -1223,22 +1320,22 @@ public class DataStatsServiceImpl implements DataStatsService {
}
//1.查询组织直属网格列表【网格维度】
- List gridList = dataStatsDao.getSubGridList(formDTO.getAgencyId());
+ List gridList = indexService.getSubGridList(formDTO.getAgencyId());
if (gridList.size() < NumConstant.ONE) {
return resultList;
}
- List gridIds = gridList.stream().map(DimGridEntity::getId).collect(Collectors.toList());
+ List gridIds = gridList.stream().map(ScreenCustomerGridDTO::getGridId).collect(Collectors.toList());
//2.按日期查找组织直属网格事件治理指数列表
List list = dataStatsDao.getGridGovern(gridIds, formDTO.getDateId());
//3.封装数据
- for (DimGridEntity gr : gridList) {
+ for (ScreenCustomerGridDTO gr : gridList) {
GridGovrnResultDTO dto = new GridGovrnResultDTO();
- dto.setGridId(gr.getId());
+ dto.setGridId(gr.getGridId());
dto.setGridName(gr.getGridName());
for (GridGovrnResultDTO re : list) {
- if (gr.getId().equals(re.getGridId())) {
+ if (gr.getGridId().equals(re.getGridId())) {
dto.setProblemResolvedCount(re.getProblemResolvedCount());
dto.setGroupSelfGovernRatio(re.getGroupSelfGovernRatio());
dto.setGridSelfGovernRatio(re.getGridSelfGovernRatio());
@@ -1290,6 +1387,19 @@ public class DataStatsServiceImpl implements DataStatsService {
SimpleDateFormat format = new SimpleDateFormat(DateUtils.DATE_PATTERN_YYYYMMDD);
formDTO.setDateId(format.format(yesterday));
}
+ if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
+ ScreenCustomerAgencyDTO agencyDTO = indexService.getAgencyInfo(formDTO.getOrgId());
+ if (CollectionUtils.isNotEmpty(customerRelation.haveSubCustomer(agencyDTO.getCustomerId()))) {
+ if (OrgConstant.PROVINCE.equals(agencyDTO.getLevel()) || OrgConstant.CITY.equals(agencyDTO.getLevel()) || OrgConstant.DISTRICT.equals(agencyDTO.getLevel())) {
+ ScreenGovernRankDataDailyDTO governData = indexService.getGovernRank(formDTO.getOrgId(), agencyDTO.getAreaCode(), formDTO.getDateId());
+ resultDTO.setGovernRatio(getPercentage(governData.getGovernCount(), governData.getClosedCount()));
+ resultDTO.setResolvedRatio(getPercentage(governData.getResolvedCount(), governData.getClosedCount()));
+ resultDTO.setResponseRatio(getPercentage(governData.getResponseCount(), governData.getTransferCount()));
+ resultDTO.setSatisfactionRatio(getPercentage(governData.getSatisfactionCount(), governData.getClosedProjectCount()));
+ return resultDTO;
+ }
+ }
+ }
//1.按类型、日期查询治理指数下响应解决满意自治四个统计率
GovrnRatioResultDTO dto = indexService.governRatio(formDTO);
@@ -1302,4 +1412,31 @@ public class DataStatsServiceImpl implements DataStatsService {
return resultDTO;
}
+ @Override
+ public List listGridMemberDataStats(List gridIds,
+ String searchedStaffName,
+ String month,
+ String sort,
+ Integer pageNo,
+ Integer pageSize) {
+
+ PageHelper.startPage(pageNo, pageSize);
+ return factGridMemberStatisticsDailyDao.listGridMemberDataStats(gridIds, searchedStaffName, month, sort);
+ }
+
+ @Override
+ public GridMemberDataAnalysisResultDTO getGridMemberIssueProjectStats(String staffId) {
+ return factGridMemberStatisticsDailyDao.getGridMemberIssueProjectStats( staffId);
+ }
+ private String getPercentage(Integer countInt, Integer totalInt) {
+ if (NumConstant.ZERO == totalInt) {
+ return "0%";
+ }
+ BigDecimal count = new BigDecimal(countInt);
+ BigDecimal total = new BigDecimal(totalInt);
+ BigDecimal hundred = new BigDecimal(NumConstant.ONE_HUNDRED);
+ BigDecimal ratio = count.multiply(hundred).divide(total, NumConstant.ONE, RoundingMode.HALF_UP);
+ return ratio.toString().concat("%");
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
index 359fcbe7a0..027e36fb8a 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java
@@ -1,12 +1,10 @@
package com.epmet.dataaggre.service.epmetuser;
+import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolDateListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.PatrolRecordListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.StaffListResultDTO;
-import com.epmet.dataaggre.dto.epmetuser.result.UserInfosResultDTO;
+import com.epmet.dataaggre.dto.epmetuser.result.*;
import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
import java.util.List;
@@ -64,4 +62,23 @@ public interface EpmetUserService {
*/
List staffGridRole(List forms, String staffName);
+ /**
+ * @Param formDTO
+ * @Description 【更多-巡查记录-人员巡查记录列表】
+ * @author sun
+ */
+ List staffPatrolList(StaffListFormDTO formDTO);
+
+ /**
+ * @Description 个人中心-网格员巡查记录
+ * @author sun
+ */
+ List personalPatrolList(String staffId);
+ /**
+ * @Param formDTO
+ * @Description 对外接口--查询工作人员基本信息
+ * @author sun
+ */
+ OpenStaffDetailResultDTO openStaffDetail(OpenStaffDetailFormDTO formDTO);
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
index 175525d16d..326bb24f20 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java
@@ -4,15 +4,19 @@ 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.dataaggre.constant.DataSourceConstant;
+import com.epmet.dataaggre.dao.epmetuser.CustomerStaffDao;
import com.epmet.dataaggre.dao.epmetuser.StaffPatrolRecordDao;
import com.epmet.dataaggre.dao.epmetuser.StaffRoleDao;
import com.epmet.dataaggre.dao.epmetuser.UserBaseInfoDao;
+import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO;
import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO;
import com.epmet.dataaggre.dto.epmetuser.StaffPatrolRecordDTO;
+import com.epmet.dataaggre.dto.epmetuser.form.OpenStaffDetailFormDTO;
import com.epmet.dataaggre.dto.epmetuser.form.PatrolDateListFormDTO;
import com.epmet.dataaggre.dto.epmetuser.form.PatrolRecordListFormDTO;
import com.epmet.dataaggre.dto.epmetuser.form.StaffListFormDTO;
import com.epmet.dataaggre.dto.epmetuser.result.*;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO;
import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
@@ -25,6 +29,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.text.NumberFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,6 +55,8 @@ public class EpmetUserServiceImpl implements EpmetUserService {
private StaffPatrolRecordService staffPatrolRecordService;
@Resource
private StaffRoleDao staffRoleDao;
+ @Resource
+ private CustomerStaffDao customerStaffDao;
/**
* @Description 根据UserIds查询
@@ -247,5 +255,115 @@ public class EpmetUserServiceImpl implements EpmetUserService {
return result;
}
+ /**
+ * @Param formDTO
+ * @Description 【更多-巡查记录-人员巡查记录列表】
+ * @author sun
+ */
+ @Override
+ public List staffPatrolList(StaffListFormDTO formDTO) {
+ List resultList = new ArrayList<>();
+ //1.查询网格信息供后续封装数据使用
+ List list = govOrgService.getGridInfoList(formDTO.getGridIds(), formDTO.getUserId());
+ if (CollectionUtils.isEmpty(formDTO.getGridIds())) {
+ formDTO.setGridIds(list.stream().map(CustomerGridDTO::getId).collect(Collectors.toList()));
+ }
+
+ //2.按条件分页查询业务数据
+ int pageIndex = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize();
+ formDTO.setPageNo(pageIndex);
+ //起始查询日期
+ formDTO.setPatrolStartTime(DateUtils.getBeforeMonthDate(formDTO.getTime(), "yyyyMMdd"));
+ resultList = staffPatrolRecordDao.selectStaffPatrolList(formDTO);
+
+ //3.封装数据并返回
+ resultList.forEach(re -> list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName())));
+ //NumberFormat numberFormat = NumberFormat.getInstance();
+ //numberFormat.setMaximumFractionDigits(NumConstant.ZERO);
+ resultList.forEach(re -> {
+ String totalTime = "0分钟";
+ if (re.getTimeNum() > NumConstant.ZERO) {
+ int num = re.getTimeNum() / 60;
+ int hour = num / 60;
+ int minute = num % 60;
+ totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
+ }
+ re.setTotalTime(totalTime == "" ? "0分钟" : totalTime);
+ //re.setTotalTime(re.getTimeNum() < 1 ? BigDecimal.ZERO + "h" : new BigDecimal(numberFormat.format((float) re.getTimeNum() / (float) 3600)) + "h");
+ //re.setTotalTime(re.getTimeNum() / 60 + "分钟");
+ list.stream().filter(l -> re.getGridId().equals(l.getId())).forEach(s -> re.setGridName(s.getGridName()));
+ });
+
+ return resultList;
+ }
+
+ /**
+ * @Description 个人中心-网格员巡查记录
+ * @author sun
+ */
+ @Override
+ public List personalPatrolList(String staffId) {
+ LinkedList resultList = new LinkedList<>();
+ //1.汇总查询当前工作人员所有巡查记录数据
+ StaffListResultDTO resultDTO = staffPatrolRecordDao.selectPersonalPatrolList(staffId);
+ if (null == resultDTO) {
+ return resultList;
+ }
+ //2.封装数据并返回
+ NumberFormat numberFormat = NumberFormat.getInstance();
+ numberFormat.setMaximumFractionDigits(NumConstant.ZERO);
+ PersonalPatrolListResultDTO personal1 = new PersonalPatrolListResultDTO();
+ personal1.setKey("总次数");
+ personal1.setValue(resultDTO.getPatrolTotal().toString());
+ resultList.add(personal1);
+ PersonalPatrolListResultDTO personal2 = new PersonalPatrolListResultDTO();
+ personal2.setKey("总时长");
+ //personal2.setValue(resultDTO.getTimeNum() / 60 + "分钟");
+ String totalTime = "0分钟";
+ if (resultDTO.getTimeNum() > NumConstant.ZERO) {
+ int num = resultDTO.getTimeNum() / 60;
+ int hour = num / 60;
+ int minute = num % 60;
+ totalTime = (hour < 1 ? "" : hour + "小时") + (minute < 1 ? "" : minute + "分钟");
+ }
+ personal2.setValue(totalTime == "" ? "0分钟" : totalTime);
+ resultList.add(personal2);
+ PersonalPatrolListResultDTO personal3 = new PersonalPatrolListResultDTO();
+ personal3.setKey("事件数");
+ personal3.setValue(resultDTO.getReportProjectCount().toString());
+ resultList.add(personal3);
+
+ return resultList;
+ }
+ /**
+ * @Param formDTO
+ * @Description 对外接口--查询工作人员基本信息
+ * @author sun
+ */
+ @Override
+ public OpenStaffDetailResultDTO openStaffDetail(OpenStaffDetailFormDTO formDTO) {
+ OpenStaffDetailResultDTO resultDTO = new OpenStaffDetailResultDTO();
+ //1.按staffId查询基础信息
+ CustomerStaffDTO staffDTO = customerStaffDao.selectByMobile(formDTO.getCustomerId(), formDTO.getMobile());
+ if (null == staffDTO) {
+ return resultDTO;
+ }
+
+ //2.查询工作人员所属组织信息
+ CustomerAgencyDTO agencyDTO = govOrgService.gridByAgencyId(formDTO.getCustomerId(), staffDTO.getUserId());
+
+ //3.封装数据并返回
+ resultDTO.setCustomerId(formDTO.getCustomerId());
+ if (null != agencyDTO) {
+ resultDTO.setAgencyId(agencyDTO.getId());
+ resultDTO.setAgencyAllName(agencyDTO.getAllParentName());
+ }
+ resultDTO.setStaffId(staffDTO.getUserId());
+ resultDTO.setStaffName(staffDTO.getRealName());
+ resultDTO.setMobile(formDTO.getMobile());
+
+ return resultDTO;
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
index 909a3dc208..43be38a84f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/EvaluationIndexService.java
@@ -2,6 +2,11 @@ package com.epmet.dataaggre.service.evaluationindex;
import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
+
+import java.util.List;
/**
* @Author sun
@@ -15,4 +20,55 @@ public interface EvaluationIndexService {
* @author sun
*/
GovrnRatioResultDTO governRatio(GovrnRatioFormDTO formDTO);
+
+ /**
+ * @Description 查询areaCode对应的直属下级且不是agencyId对应的客户id的客户组织列表
+ * @author sun
+ */
+ List getAgencyByAreaCodeAgencyId(String agencyId, String areaCode);
+
+ /**
+ * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查
+ * @author sun
+ */
+ List getSubAgencyList(String agencyId, String areaCode);
+
+ /**
+ * @Description 查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ * @author sun
+ */
+ List getSubGridList(String agencyId);
+
+ /**
+ * 根据组织ID获取治理指数
+ * @author zhaoqifeng
+ * @date 2021/6/25 16:33
+ * @param agencyId
+ * @param areaCode
+ * @param dateId
+ * @return java.util.List
+ */
+ ScreenGovernRankDataDailyDTO getGovernRank(String agencyId, String areaCode, String dateId);
+
+ /**
+ * 获取组织信息
+ * @author zhaoqifeng
+ * @date 2021/6/29 13:57
+ * @param agencyId
+ * @return com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO
+ */
+ ScreenCustomerAgencyDTO getAgencyInfo(String agencyId);
+
+ /**
+ * @Description 根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+ * @author sun
+ */
+ List getAgencyIdsByAgencyId(String agencyId);
+
+ /**
+ * @Description 查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查
+ * @author sun
+ */
+ List getSubAgencyListByAgency(String agencyId);
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
index bec7bafd90..fc9e6b8ba6 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/evaluationindex/impl/EvaluationIndexServiceImpl.java
@@ -7,14 +7,21 @@ import com.epmet.dataaggre.dao.datastats.DataStatsDao;
import com.epmet.dataaggre.dao.evaluationindex.EvaluationIndexDao;
import com.epmet.dataaggre.dto.datastats.form.GovrnRatioFormDTO;
import com.epmet.dataaggre.dto.datastats.result.GovrnRatioResultDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO;
+import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO;
import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService;
+import com.epmet.dataaggre.service.opercrm.CustomerRelation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
/**
* @Author sun
@@ -26,6 +33,8 @@ import java.util.Date;
public class EvaluationIndexServiceImpl implements EvaluationIndexService {
@Autowired
private EvaluationIndexDao evaluationIndexDao;
+ @Autowired
+ private CustomerRelation customerRelation;
/**
* @Param formDTO
@@ -37,4 +46,99 @@ public class EvaluationIndexServiceImpl implements EvaluationIndexService {
return evaluationIndexDao.getAgnecyOrGridGoverRatio(formDTO.getOrgId(),formDTO.getOrgType(),formDTO.getDateId());
}
+ /**
+ * @Description 查询areaCode对应的直属下级且不是agencyId对应的客户id的客户组织列表
+ * @author sun
+ */
+ @Override
+ public List getAgencyByAreaCodeAgencyId(String agencyId, String areaCode) {
+ return evaluationIndexDao.getAgencyByAreaCodeAgencyId(agencyId,areaCode);
+ }
+
+ /**
+ * @Description 查询直属下级组织列表，有areaCode的按areaCode查，没有的按agencyId查
+ * @author sun
+ */
+ @Override
+ public List getSubAgencyList(String agencyId, String areaCode) {
+ return evaluationIndexDao.getSubAgencyList(agencyId,areaCode);
+ }
+
+ /**
+ * @Description 查询指标库组织直属网格列表【这个客户组织网格数据包括小程序的和项目上报的】
+ * @author sun
+ */
+ @Override
+ public List getSubGridList(String agencyId) {
+ return evaluationIndexDao.getSubGridList(agencyId);
+ }
+
+ /**
+ * 根据组织ID获取治理指数
+ *
+ * @param agencyId
+ * @param areaCode
+ * @param dateId
+ * @return java.util.List
+ * @author zhaoqifeng
+ * @date 2021/6/25 16:33
+ */
+ @Override
+ public ScreenGovernRankDataDailyDTO getGovernRank(String agencyId, String areaCode, String dateId) {
+ List agencyIdList = getAgencyByAreaCodeAgencyId(agencyId, areaCode);
+ if (CollectionUtils.isEmpty(agencyIdList)) {
+ agencyIdList = new ArrayList<>();
+ }
+ agencyIdList.add(agencyId);
+ return evaluationIndexDao.getGovernRankList(agencyIdList, dateId);
+ }
+
+ /**
+ * 获取组织信息
+ *
+ * @param agencyId
+ * @return com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO
+ * @author zhaoqifeng
+ * @date 2021/6/29 13:57
+ */
+ @Override
+ public ScreenCustomerAgencyDTO getAgencyInfo(String agencyId) {
+ return evaluationIndexDao.getAgencyInfo(agencyId);
+ }
+
+ /**
+ * @Description 根据组织Id查询是否存在子客户，存在的按areaCode查询当前客户之外的客户组织列表
+ * @author sun
+ */
+ @Override
+ public List getAgencyIdsByAgencyId(String agencyId) {
+ //1.查询agencyId对应组织信息
+ ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
+ //2.判断客户是否存在子客户
+ List list = customerRelation.haveSubCustomer(dto.getCustomerId());
+ if (!CollectionUtils.isNotEmpty(list)) {
+ return new ArrayList<>();
+ }
+ //3.存在子客户的，查询当前组织的areaCode对应的直属下级且不是agencyId对应的客户id的但是存在父子客户关系的客户组织列表
+ return evaluationIndexDao.getAgencyIdsByAgencyId(agencyId, dto.getAreaCode(), list);
+ }
+
+ /**
+ * @Description 查询直属下级组织列表，有子客户的按areaCode查没有的按agencyId查且是在当前客户和子客户范围内查询
+ * @author sun
+ */
+ @Override
+ public List getSubAgencyListByAgency(String agencyId) {
+ //1.查询agencyId对应组织信息
+ ScreenCustomerAgencyDTO dto = evaluationIndexDao.getByAgencyId(agencyId);
+ //2.判断客户是否存在子客户
+ List list = customerRelation.haveSubCustomer(dto.getCustomerId());
+ if (!CollectionUtils.isNotEmpty(list)) {
+ return evaluationIndexDao.getSubAgencyListByAgency(agencyId, null, null);
+ } else {
+ list.add(dto.getCustomerId());
+ return evaluationIndexDao.getSubAgencyListByAgency(null, dto.getAreaCode(), list);
+ }
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
index 8008242d5f..8cfd4a2276 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java
@@ -1,5 +1,6 @@
package com.epmet.dataaggre.service.govorg;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
import com.epmet.dataaggre.dto.govorg.result.*;
@@ -59,4 +60,16 @@ public interface GovOrgService {
* @author sun
*/
List selectGridStaffByGridIds(List gridIds, String staffName);
+
+ /**
+ * @Description 查询网格信息或查询当前人员所属组织下所有网格信息
+ * @author sun
+ */
+ List getGridInfoList(List gridIds, String staffId);
+
+ /**
+ * @Description 查询工作人员所属组织信息
+ * @author sun
+ */
+ CustomerAgencyDTO gridByAgencyId(String customerId, String staffId);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
index 29ed9208cf..31b5f9272c 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java
@@ -11,6 +11,7 @@ import com.epmet.dataaggre.dao.govorg.CustomerAgencyDao;
import com.epmet.dataaggre.dao.govorg.CustomerGridDao;
import com.epmet.dataaggre.dao.govorg.CustomerStaffAgencyDao;
import com.epmet.dataaggre.dao.govorg.CustomerStaffGridDao;
+import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO;
import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO;
import com.epmet.dataaggre.dto.govorg.form.NextAreaCodeFormDTO;
@@ -264,4 +265,24 @@ public class GovOrgServiceImpl implements GovOrgService {
return result;
}
+ /**
+ * @Description 查询网格信息或查询当前人员所属组织下所有网格信息
+ * @author sun
+ */
+ @Override
+ public List getGridInfoList(List gridIds, String staffId) {
+ //1.有网格列表的查询网格基本信息，没有的查询工作人员所属组织级下级所有的网格信息
+ List list = customerGridDao.getGridInfoList(gridIds, staffId);
+ return list;
+ }
+
+ /**
+ * @Description 查询工作人员所属组织信息
+ * @author sun
+ */
+ @Override
+ public CustomerAgencyDTO gridByAgencyId(String customerId, String staffId) {
+ return customerStaffAgencyDao.selectAgencyByStaffId(customerId, staffId);
+ }
+
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java
new file mode 100644
index 0000000000..d2fc60ad35
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/AggreGridServiceImpl.java
@@ -0,0 +1,51 @@
+package com.epmet.dataaggre.service.impl;
+
+import com.epmet.dataaggre.dto.govorg.CustomerGridDTO;
+import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO;
+import com.epmet.dataaggre.service.AggreGridService;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.service.govorg.GovOrgService;
+import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service
+public class AggreGridServiceImpl implements AggreGridService {
+
+ @Autowired
+ private GovOrgService govOrgService;
+
+ @Autowired
+ private DataStatsService dataStatsService;
+
+ @Override
+ public List getGridMemberDataAnalysis(
+ List gridIds,
+ String searchedStaffName,
+ String currStaffId,
+ String month,
+ String sort,
+ Integer pageNo,
+ Integer pageSize) {
+
+ //1.得到网格id列表
+ Map gridIdAndName = new HashMap<>();
+ List grids = govOrgService.getGridInfoList(gridIds, currStaffId);
+ grids.forEach(g -> {
+ gridIds.add(g.getId());
+ gridIdAndName.put(g.getId(), g.getGridName());
+ });
+
+ //2.查询列表，并且填充内容
+ List records = dataStatsService.listGridMemberDataStats(gridIds, searchedStaffName, month, sort, pageNo, pageSize);
+ records.forEach(r -> r.setOrgName(gridIdAndName.get(r.getGridId())));
+ return records;
+ }
+
+}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/CustomerRelation.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/CustomerRelation.java
index af0dc94e88..71d96fe17b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/CustomerRelation.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/CustomerRelation.java
@@ -10,4 +10,13 @@ import java.util.List;
*/
public interface CustomerRelation {
List selectUsedAreaCodeList(String areaCode);
+
+ /**
+ * 是否有子客户
+ * @author zhaoqifeng
+ * @date 2021/6/29 11:06
+ * @param customerId
+ * @return List
+ */
+ List haveSubCustomer(String customerId);
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java
index 045232e1a7..af5f40e53f 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercrm/impl/CustomerRelationImpl.java
@@ -5,6 +5,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant;
import com.epmet.dataaggre.dao.opercrm.CustomerRelationDao;
import com.epmet.dataaggre.service.opercrm.CustomerRelation;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -27,4 +28,17 @@ public class CustomerRelationImpl implements CustomerRelation {
public List selectUsedAreaCodeList(String areaCode) {
return customerRelationDao.selectUsedAreaCodeList(areaCode);
}
+
+ /**
+ * 是否有子客户
+ *
+ * @param customerId
+ * @return boolean
+ * @author zhaoqifeng
+ * @date 2021/6/29 11:06
+ */
+ @Override
+ public List haveSubCustomer(String customerId) {
+ return customerRelationDao.selectAllSubCustomerIds(customerId);
+ }
}
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
index fb5757da88..7b4361e463 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
@@ -12,9 +12,10 @@
fact_reg_user_agency_daily
WHERE
del_flag = '0'
- AND agency_id = #{agencyId}
AND date_id = #{dateId}
- LIMIT 1
+
+ agency_id = #{agencyId}
+
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
new file mode 100644
index 0000000000..fdbb6fdc04
--- /dev/null
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/FactGridMemberStatisticsDailyDao.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ member.id,
+ member.date_id,
+ member.month_id,
+ member.year_id,
+ member.customer_id,
+ member.agency_id,
+ member.grid_id,
+ member.pid,
+ member.pids,
+ member.staff_id,
+ member.staff_name,
+ member.project_count,
+ member.issue_to_project_count,
+ member.closed_issue_count,
+ member.project_response_count,
+ member.project_transfer_count,
+ member.project_closed_count,
+ member.project_incr,
+ member.issue_to_project_incr,
+ member.closed_issue_incr,
+ member.project_response_incr,
+ member.project_transfer_incr,
+ member.project_closed_incr,
+ member.del_flag,
+ member.revision,
+ member.created_by,
+ member.created_time,
+ member.updated_by,
+ member.updated_time
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
index 43e15095e4..3b1b0c9db3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/CustomerStaffDao.xml
@@ -3,4 +3,16 @@
+
+
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
index 662ce08625..ce078c21f3 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffPatrolRecordDao.xml
@@ -51,4 +51,70 @@
-->
+
+
+
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
index a0c2e0c245..d248aa13df 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/evaluationindex/EvaluationIndexDao.xml
@@ -20,4 +20,158 @@
AND date_id = #{dateId}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
index 92cffd9271..2ca96e0edd 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml
@@ -99,4 +99,52 @@
)
+
+
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
index 50269ca116..763c06694b 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml
@@ -16,4 +16,18 @@
AND user_id = #{userId}
+
+
\ No newline at end of file
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml
index 169a44070f..439efdb207 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercrm/CustomerRelationDao.xml
@@ -14,4 +14,13 @@
AND cr.AREA_CODE LIKE concat(#{areaCode}, '%')
AND cr.AREA_CODE != #{areaCode}
+
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/AgencyInfoDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/AgencyInfoDTO.java
index 04d4896995..e2d3f77953 100644
--- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/AgencyInfoDTO.java
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/AgencyInfoDTO.java
@@ -13,8 +13,9 @@ import java.util.List;
*/
@Data
public class AgencyInfoDTO implements Serializable {
- private String agencyId;
- private String areaCode;
- private List subAgencyIds;
- private List subGridIds;
+ private String currentAgencyId;
+ private String currentAgencyName;
+ private String currentAreaCode;
+ private List subAgencies;
+ private List subGrids;
}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerAgencyCommonDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerAgencyCommonDTO.java
new file mode 100644
index 0000000000..3a1078fd69
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerAgencyCommonDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * screen_customer_agency
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/7/13 15:31
+ */
+@Data
+public class ScreenCustomerAgencyCommonDTO implements Serializable {
+ private static final long serialVersionUID = -6222325433226628163L;
+ private String agencyId;
+ private String agencyName;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridCommonDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridCommonDTO.java
new file mode 100644
index 0000000000..2578a6c482
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridCommonDTO.java
@@ -0,0 +1,18 @@
+package com.epmet.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * screen_customer_grid
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2021/7/13 15:32
+ */
+@Data
+public class ScreenCustomerGridCommonDTO implements Serializable {
+ private static final long serialVersionUID = -4405092094598416917L;
+ private String gridId;
+ private String gridName;
+}
diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridDTO.java
new file mode 100644
index 0000000000..10c2a503c3
--- /dev/null
+++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/ScreenCustomerGridDTO.java
@@ -0,0 +1,119 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *