elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

dev_shibei_match
jianjun 5 years ago
parent
4042e641c7 6973745213
commit
7949b69dee
26 changed files with 121 additions and 110 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/CpcIndexCommonDTO.java
  2. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
  3. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  4. 7
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java
  5. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
  6. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
  7. 41
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
  8. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
  9. 9
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicLogDailyService.java
  10. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
  11. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/IssueExtractService.java
  12. 18
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
  13. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicLogDailyServiceImpl.java
  14. 3
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
  15. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java
  16. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
  17. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
  18. 5
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
  19. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
  20. 2
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateDistrictServiceImpl.java
  21. 4
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
  22. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml
  23. 16
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
  24. 12
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml
  25. 6
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
  26. 4
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml

18
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/indexcollect/result/CpcIndexCommonDTO.java
View File

@ -0,0 +1,18 @@
package com.epmet.dto.indexcollect.result;
import lombok.Data;
import java.io.Serializable;
/**
* 描述一下
*
* @author yinzuomei@elink-cn.com
* @date 2020/10/12 21:57
*/
@Data
public class CpcIndexCommonDTO implements Serializable {
private static final long serialVersionUID = -424750065699208595L;
private String userId;
private Integer indexValue;
}

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java
View File

@ -23,12 +23,12 @@ import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
import com.epmet.dto.extract.result.GridProjectCountResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.extract.result.ShiftProjectCountResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginIssueMainDailyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 议题主表
@ -84,14 +84,13 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
*/
List<GridProjectCountResultDTO> selectGridProjectCount(@Param("customerId") String customerId,@Param("monthId") String monthId, @Param("status") String status);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 党员提出的话题转议题数
* @Date 2020/9/18 13:58
**/
List<Map<String, Integer>> selectShiftIssueCount(@Param("customerId") String customerId,@Param("monthId") String monthId);
List<CpcIndexCommonDTO> selectShiftIssueCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 查询网格 党员/群众 人均提出的议题转项目数

19
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
View File

@ -19,8 +19,9 @@ package com.epmet.dao.evaluationindex.extract;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@ -28,7 +29,6 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 项目主表_日统计
@ -88,14 +88,13 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
void deleteByDate(@Param("customerId") String customerId, @Param("date") String date);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 党员提出的议题转项目数
* @Date 2020/9/18 14:11
**/
List<Map<String, Integer>> selectShiftProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
List<CpcIndexCommonDTO> selectShiftProjectCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @return java.lang.Integer
@ -113,7 +112,8 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
* @param customerId
* @param gridId
* @param communityId
* @param closedStatus
* @param closedStatus :resolved unresolved
* @param projectStatus :pending closed
* @author yinzuomei
* @description 具体某个网格或者社区内的项目
* @Date 2020/9/23 18:18
@ -121,20 +121,23 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
Integer getGridOrCommunityClosedProjectTotal(@Param("customerId")String customerId,
@Param("gridId") String gridId,
@Param("communityId") String communityId,
@Param("closedStatus") String closedStatus);
@Param("closedStatus") String closedStatus,
@Param("projectStatus") String projectStatus);
/**
* @return int
* @param customerId
* @param agencyPath
* @param closedStatus
* @param closedStatus :resolved unresolved
* @param projectStatus :pending closed
* @author yinzuomei
* @description 组织下：已解决项目 or 已结案项目总数
* @Date 2020/9/24 17:38
**/
int getAgencyClosedProjectTotal(@Param("customerId") String customerId,
@Param("agencyPath")String agencyPath,
@Param("closedStatus")String closedStatus);
@Param("closedStatus")String closedStatus,
@Param("projectStatus") String projectStatus);
/**
* 组织自治项目数

7
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicLogDailyDao.java
View File

@ -19,12 +19,12 @@ package com.epmet.dao.evaluationindex.extract;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.result.PartyActiveResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 话题明细_日统计
@ -56,14 +56,13 @@ public interface FactOriginTopicLogDailyDao extends BaseDao<FactOriginTopicLogDa
int insertBatchEntity(@Param("list") List<FactOriginTopicLogDailyEntity> list);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 查询客户下，这个月内，每个党员评论话题的次数
* @Date 2020/9/18 13:36
**/
List<Map<String, Integer>> selectJoinTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
List<CpcIndexCommonDTO> selectJoinTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
@ -73,7 +72,7 @@ public interface FactOriginTopicLogDailyDao extends BaseDao<FactOriginTopicLogDa
* @description 党员自建群活跃度——话题数
* @Date 2020/9/18 15:05
**/
List<Map<String, Integer>> selectGroupTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
List<CpcIndexCommonDTO> selectGroupTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @return java.lang.Integer

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java
View File

@ -20,12 +20,12 @@ package com.epmet.dao.evaluationindex.extract;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
/**
* 话题主表_日统计
@ -65,7 +65,7 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
* @description 党员提出话题数：返回每个党员这个月内，提出的话题数
* @Date 2020/9/18 11:05
**/
List<Map<String, Integer>> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
List<CpcIndexCommonDTO> selectPartyCreateTopicCount(@Param("customerId") String customerId, @Param("monthId") String monthId);
/**
* @Description 查询网格 党员/群众 人均提出话题数

2
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginProjectMainDailyEntity.java
View File

@ -133,6 +133,4 @@ public class FactOriginProjectMainDailyEntity extends BaseEpmetEntity {
*/
private String finishOrgIds;
private String closedStatus;
}

41
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/dataToIndex/impl/CalCpcIndexServiceImpl.java
View File

@ -2,6 +2,7 @@ package com.epmet.service.evaluationindex.extract.dataToIndex.impl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.utils.DateUtils;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.indexcoll.FactIndexPartyAblityCpcMonthlyEntity;
import com.epmet.service.evaluationindex.extract.dataToIndex.CalCpcIndexService;
import com.epmet.service.evaluationindex.extract.todata.*;
@ -158,12 +159,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
* @Date 2020/9/18 10:59
**/
private Map<String, Integer> calCreateTopicCount(String customerId, String monthId) {
List<Map<String, Integer>> mapList = factOriginTopicMainDailyService.selectPartyCreateTopicCount(customerId, monthId);
List<CpcIndexCommonDTO> list = factOriginTopicMainDailyService.selectPartyCreateTopicCount(customerId, monthId);
Map<String, Integer> resultMap = new HashMap<>();
for (Map<String, Integer> map : mapList) {
for (Map.Entry<String, Integer> m : map.entrySet()) {
resultMap.put(m.getKey(), m.getValue());
}
for (CpcIndexCommonDTO cpcIndexCommonDTO: list) {
resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
}
return resultMap;
}
@ -177,12 +176,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
* @Date 2020/9/18 13:33
**/
private Map<String, Integer> calJoinTopicCount(String customerId, String monthId) {
List<Map<String, Integer>> mapList = factOriginTopicLogDailyService.selectJoinTopicCount(customerId, monthId);
List<CpcIndexCommonDTO> list = factOriginTopicLogDailyService.selectJoinTopicCount(customerId, monthId);
Map<String, Integer> resultMap = new HashMap<>();
for (Map<String, Integer> map : mapList) {
for (Map.Entry<String, Integer> m : map.entrySet()) {
resultMap.put(m.getKey(), m.getValue());
}
for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
}
return resultMap;
}
@ -197,12 +194,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
* @Date 2020/9/18 13:53
**/
private Map<String, Integer> calShiftIssueCount(String customerId, String monthId) {
List<Map<String, Integer>> mapList = issueExtractService.selectShiftIssueCount(customerId, monthId);
List<CpcIndexCommonDTO> list = issueExtractService.selectShiftIssueCount(customerId, monthId);
Map<String, Integer> resultMap = new HashMap<>();
for (Map<String, Integer> map : mapList) {
for (Map.Entry<String, Integer> m : map.entrySet()) {
resultMap.put(m.getKey(), m.getValue());
}
for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
}
return resultMap;
}
@ -217,12 +212,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
**/
private Map<String, Integer> calShiftProjectCount(String customerId, String monthId) {
//查询fact_origin_project_main_daily 表 中议题的议题的状态为 shift_
List<Map<String, Integer>> mapList = factOriginProjectMainDailyService.selectShiftProjectCount(customerId, monthId);
List<CpcIndexCommonDTO> list = factOriginProjectMainDailyService.selectShiftProjectCount(customerId, monthId);
Map<String, Integer> resultMap = new HashMap<>();
for (Map<String, Integer> map : mapList) {
for (Map.Entry<String, Integer> m : map.entrySet()) {
resultMap.put(m.getKey(), m.getValue());
}
for (CpcIndexCommonDTO cpcIndexCommonDTO : list) {
resultMap.put(cpcIndexCommonDTO.getUserId(), cpcIndexCommonDTO.getIndexValue());
}
return resultMap;
}
@ -337,12 +330,10 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
数据来源：话题表。
计算方法：从话题表中统计党员自建群i的话题总数；对所有自建群话题数累加。
对评价结果的影响：正向。*/
List<Map<String, Integer>> mapList = factOriginTopicLogDailyService.selectGroupTopicCount(customerId, monthId);
List<CpcIndexCommonDTO> list = factOriginTopicLogDailyService.selectGroupTopicCount(customerId, monthId);
Map<String, Integer> resultMap = new HashMap<>();
for (Map<String, Integer> map : mapList) {
for (Map.Entry<String, Integer> m : map.entrySet()) {
resultMap.put(m.getKey(), m.getValue());
}
for (CpcIndexCommonDTO dto : list) {
resultMap.put(dto.getUserId(), dto.getIndexValue());
}
return resultMap;
}

15
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
View File

@ -22,10 +22,10 @@ import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import com.mysql.cj.x.protobuf.MysqlxDatatypes;
import java.util.List;
import java.util.Map;
@ -147,14 +147,13 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
void deleteByDate(String customerId, String date);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 党员提出的议题转项目数
* @Date 2020/9/18 14:11
**/
List<Map<String, Integer>> selectShiftProjectCount(String customerId, String monthId);
List<CpcIndexCommonDTO> selectShiftProjectCount(String customerId, String monthId);
/**
* @return java.lang.Integer
@ -171,23 +170,25 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
* @return java.lang.Integer
* @param customerId
* @param gridId
* @param closedStatus
* @param closedStatus :resolved unresolved
* @param projectStatus :pending closed
* @author yinzuomei
* @description 具体某个网格内的项目
* @Date 2020/9/23 18:17
**/
Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId,String closedStatus);
Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId,String closedStatus,String projectStatus);
/**
* @return int
* @param customerId
* @param agencyPath
* @param closedStatus
* @param closedStatus :resolved unresolved
* @param projectStatus :pending closed
* @author yinzuomei
* @description 组织下：已解决项目 or 已结案项目总数
* @Date 2020/9/24 17:37
**/
int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus);
int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus);
/**
* 自治项目数

9
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicLogDailyService.java
View File

@ -18,12 +18,11 @@
package com.epmet.service.evaluationindex.extract.todata;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.extract.result.PartyActiveResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
import java.util.List;
import java.util.Map;
/**
* 话题明细_日统计
@ -34,24 +33,22 @@ import java.util.Map;
public interface FactOriginTopicLogDailyService extends BaseService<FactOriginTopicLogDailyEntity> {
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 查询客户下，这个月内，每个党员评论话题的次数
* @Date 2020/9/18 13:35
**/
List<Map<String, Integer>> selectJoinTopicCount(String customerId, String monthId);
List<CpcIndexCommonDTO> selectJoinTopicCount(String customerId, String monthId);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 党员自建群活跃度——话题数
* @Date 2020/9/18 14:33
**/
List<Map<String, Integer>> selectGroupTopicCount(String customerId, String monthId);
List<CpcIndexCommonDTO> selectGroupTopicCount(String customerId, String monthId);
/**
* @return int

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginTopicMainDailyService.java
View File

@ -21,10 +21,10 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.dto.extract.form.ExtractOriginFormDTO;
import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
import java.util.List;
import java.util.Map;
/**
@ -44,14 +44,13 @@ public interface FactOriginTopicMainDailyService extends BaseService<FactOriginT
Boolean topicCleaning(ExtractOriginFormDTO extractOriginFormDTO);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId yyyyMM
* @author yinzuomei
* @description 党员提出话题数：返回每个党员这个月内，提出的话题数
* @Date 2020/9/18 11:03
**/
List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId);
List<CpcIndexCommonDTO> selectPartyCreateTopicCount(String customerId, String monthId);
/**
* @Description 查询网格 党员/群众 人均提出话题数

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/IssueExtractService.java
View File

@ -5,9 +5,9 @@ import com.epmet.dto.extract.form.GridIssueCountResultDTO;
import com.epmet.dto.extract.result.GridProjectCountResultDTO;
import com.epmet.dto.extract.result.PartyActiveResultDTO;
import com.epmet.dto.extract.result.ShiftProjectCountResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import java.util.List;
import java.util.Map;
/**
* @Author zxc
@ -60,14 +60,13 @@ public interface IssueExtractService {
List<GridProjectCountResultDTO> selectGridProjectCount(String customerId, String monthId,String status);
/**
* @return java.util.List<java.util.Map<java.lang.String,java.lang.Integer>>
* @param customerId
* @param monthId
* @author yinzuomei
* @description 党员提出的话题转议题数
* @Date 2020/9/18 13:57
**/
List<Map<String, Integer>> selectShiftIssueCount(String customerId, String monthId);
List<CpcIndexCommonDTO> selectShiftIssueCount(String customerId, String monthId);
/**
* @Description 查询网格 党员/群众 人均提出的议题转项目数

18
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
View File

@ -30,6 +30,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginProjectMainDailyDao;
import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
import com.epmet.dto.extract.result.GridProjectClosedTotalResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
@ -141,13 +142,12 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
/**
* @param customerId
* @param monthId
* @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
* @author yinzuomei
* @description 党员提出的议题转项目数
* @Date 2020/9/18 14:11
**/
@Override
public List<Map<String, Integer>> selectShiftProjectCount(String customerId, String monthId) {
public List<CpcIndexCommonDTO> selectShiftProjectCount(String customerId, String monthId) {
//查询项目主表fact_origin_project_main_daily，这个月内新增的项目，按话题发布人分组
/*含义：评价周期内，党员提出的议题转数目数。
数据来源：项目表。
@ -176,29 +176,31 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
/**
* @param customerId
* @param gridId
* @param closedStatus
* @param closedStatus :resolved unresolved
* @param projectStatus :pending closed
* @return java.lang.Integer
* @author yinzuomei
* @description 具体某个网格内的项目
* @Date 2020/9/23 18:17
**/
@Override
public Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId,String communityId, String closedStatus) {
return baseDao.getGridOrCommunityClosedProjectTotal(customerId,gridId,communityId,closedStatus);
public Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId,String communityId, String closedStatus,String projectStatus) {
return baseDao.getGridOrCommunityClosedProjectTotal(customerId,gridId,communityId,closedStatus,projectStatus);
}
/**
* @param customerId
* @param agencyPath
* @param closedStatus
* @param closedStatus :resolved unresolved
* @param projectStatus :pending closed
* @return int
* @author yinzuomei
* @description 组织下：已解决项目 or 已结案项目总数
* @Date 2020/9/24 17:37
**/
@Override
public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
public int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus,String projectStatus) {
return baseDao.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus,projectStatus);
}
@Override

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicLogDailyServiceImpl.java
View File

@ -22,6 +22,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.constant.DataSourceConstant;
import com.epmet.dao.evaluationindex.extract.FactOriginTopicLogDailyDao;
import com.epmet.dto.extract.result.PartyActiveResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicLogDailyService;
import org.springframework.stereotype.Service;
@ -29,7 +30,6 @@ import org.springframework.util.CollectionUtils;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
/**
* 话题明细_日统计
@ -45,13 +45,12 @@ public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl<FactOrig
/**
* @param customerId
* @param monthId
* @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
* @author yinzuomei
* @description 查询客户下，这个月内，每个党员评论话题的次数
* @Date 2020/9/18 13:35
**/
@Override
public List<Map<String, Integer>> selectJoinTopicCount(String customerId, String monthId) {
public List<CpcIndexCommonDTO> selectJoinTopicCount(String customerId, String monthId) {
//这个月内新增的话题评论，按人分组，不限制评论时的身份，以当前用户最新身份为准
return baseDao.selectJoinTopicCount(customerId,monthId);
}
@ -59,13 +58,12 @@ public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl<FactOrig
/**
* @param customerId
* @param monthId
* @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
* @author yinzuomei
* @description 党员自建群活跃度——话题数
* @Date 2020/9/18 14:33
**/
@Override
public List<Map<String, Integer>> selectGroupTopicCount(String customerId, String monthId) {
public List<CpcIndexCommonDTO> selectGroupTopicCount(String customerId, String monthId) {
return baseDao.selectGroupTopicCount(customerId,monthId);
}

3
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java
View File

@ -31,6 +31,7 @@ import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao;
import com.epmet.dto.extract.form.ExtractOriginFormDTO;
import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
import com.epmet.dto.extract.result.OrgStatisticsResultDTO;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.dto.org.GridInfoDTO;
import com.epmet.dto.topic.TopicOriginInfoDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginTopicLogDailyEntity;
@ -258,7 +259,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
* @Date 2020/9/18 11:03
**/
@Override
public List<Map<String, Integer>> selectPartyCreateTopicCount(String customerId, String monthId) {
public List<CpcIndexCommonDTO> selectPartyCreateTopicCount(String customerId, String monthId) {
//这个月内新增的话题，按人分组，不限制发话题人的身份，也就是说以用户最新的身份为准
return baseDao.selectPartyCreateTopicCount(customerId,monthId);
}

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

@ -16,6 +16,7 @@ import com.epmet.dto.extract.form.GridIssueCountResultDTO;
import com.epmet.dto.extract.form.IssueLogDailyFormDTO;
import com.epmet.dto.extract.form.IssueMainDailyFormDTO;
import com.epmet.dto.extract.result.*;
import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
import com.epmet.service.Issue.IssueService;
import com.epmet.service.evaluationindex.extract.todata.IssueExtractService;
import com.epmet.service.topic.TopicService;
@ -293,14 +294,13 @@ public class IssueExtractServiceImpl implements IssueExtractService {
/**
* @param customerId
* @param monthId
* @return java.util.List<java.util.Map < java.lang.String, java.lang.Integer>>
* @author yinzuomei
* @description 党员提出的话题转议题数
* @Date 2020/9/18 13:57
**/
@DataSource(DataSourceConstant.STATS)
@Override
public List<Map<String, Integer>> selectShiftIssueCount(String customerId, String monthId) {
public List<CpcIndexCommonDTO> selectShiftIssueCount(String customerId, String monthId) {
//查询fact_origin_issue_main_daily 表，转议题的时间在评价周期内的，按发布话题的人分组
/*含义：评价周期内，党员提出的话题转为议题的数目。
数据来源：议题表。

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/ProjectExtractServiceImpl.java
View File

@ -87,12 +87,11 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
List<FactOriginProjectMainDailyEntity> closeProjects =
pendingList.stream().flatMap(pending -> closedList.stream().filter(closed -> pending.getId().equals(closed.getProjectId())).map(process -> {
FactOriginProjectMainDailyEntity entity = new FactOriginProjectMainDailyEntity();
entity.setId(process.getId());
entity.setId(process.getProjectId());
entity.setProjectStatus("close");
entity.setCreatedTime(DateUtils.stringToDate(pending.getDateId(), DateUtils.DATE_PATTERN_YYYYMMDD));
entity.setUpdatedTime(process.getUpdatedTime());
entity.setIsResolved(process.getIsResolved());
entity.setClosedStatus(entity.getIsResolved());
return entity;
})).collect(Collectors.toList());
@ -140,7 +139,6 @@ public class ProjectExtractServiceImpl implements ProjectExtractService {
entity.setIssueId(project.getOriginId());
entity.setProjectStatus(project.getStatus());
entity.setIsResolved(project.getClosedStatus());
entity.setClosedStatus(entity.getIsResolved());
entity.setCreatedTime(project.getCreatedTime());
entity.setUpdatedTime(project.getUpdatedTime());
entity.setPids(project.getOrgIdPath());

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PioneerDataExtractServiceImpl.java
View File

@ -5,6 +5,7 @@ import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.constant.DimObjectStatusConstant;
import com.epmet.constant.IndexCalConstant;
import com.epmet.constant.OrgTypeConstant;
import com.epmet.constant.ProjectConstant;
import com.epmet.entity.evaluationindex.screen.ScreenPioneerDataEntity;
import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueLogDailyService;
import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
@ -284,7 +285,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
//组织下：已解决项目 or 已结案项目总数
private int getAgencyClosedProjectTotal(String customerId, String agencyPath, String closedStatus) {
return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus);
return factOriginProjectMainDailyService.getAgencyClosedProjectTotal(customerId,agencyPath,closedStatus, ProjectConstant.CLOSED);
}
//组织下：议题转项目数
@ -317,7 +318,7 @@ public class PioneerDataExtractServiceImpl implements PioneerDataExtractService
* @description 网格或者社区下: 已解决项目
**/
private Integer getGridOrCommunityClosedProjectTotal(String customerId, String gridId, String communityId, String closedStatus) {
return factOriginProjectMainDailyService.getGridOrCommunityClosedProjectTotal(customerId, gridId, communityId, closedStatus);
return factOriginProjectMainDailyService.getGridOrCommunityClosedProjectTotal(customerId, gridId, communityId, closedStatus,ProjectConstant.CLOSED);
}
/**

5
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
View File

@ -122,8 +122,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
log.debug("user:{}", JSON.toJSONString(user));
if (!user.getRegTotal().equals(0)) {
BigDecimal avgIssueCount = new BigDecimal(issue.getIssueIncr()).divide(new BigDecimal(user.getRegTotal())
.divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP)
.multiply(new BigDecimal(NumConstant.ONE_HUNDRED));
.divide(new BigDecimal(NumConstant.ONE_HUNDRED)), 4, BigDecimal.ROUND_HALF_UP);
entity.setAvgIssue(avgIssueCount);
}
});
@ -146,6 +145,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
//遍历实际参与人数
Map<String, List<IssueVoteUserCountResultDTO>> voteMap = voteCountList.stream().collect(Collectors.groupingBy(IssueVoteUserCountResultDTO::getOrgId));
log.debug("平均参与度：实际参与人数:{}", JSON.toJSONString(voteMap));
for (Map.Entry<String, List<IssueVoteUserCountResultDTO>> entry : voteMap.entrySet()) {
String gridId = entry.getKey();
ScreenUserJoinEntity entity = insertMap.get(gridId);
@ -154,6 +154,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
BigDecimal votedByIssueCount = new BigDecimal(issueList.get(0).getIssueCount());
for (IssueVoteUserCountResultDTO vote : issueList) {
Integer memberCount = gridMemberCount.get(gridId);
log.debug("平均参与度：网格Id:{},实际投票人数:{},参与投票人数:{}", gridId, vote.getVoteCount(), memberCount);
if (memberCount == null) {
memberCount = 0;
}

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateCommunityServiceImpl.java
View File

@ -278,7 +278,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
if (IndexCodeEnum.SHE_QU_XIA_SHU_SYWGZLNLHZPJZ.getCode().equals(detail.getIndexCode())) {
List<SubGridAvgResultDTO> subGridGovernAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
if (CollectionUtils.isEmpty(subGridGovernAvg)){
log.error("社区下级治理能力平均分集合为空");
log.warn("社区下级治理能力平均分集合为空");
}else{
MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
List<List<SubGridAvgResultDTO>> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE);
@ -351,7 +351,7 @@ public class IndexCalculateCommunityServiceImpl implements IndexCalculateCommuni
if (IndexCodeEnum.SHE_QU_XIA_JI_SYWGFWNLDFPJZ.getCode().equals(indexCode)) {
List<SubGridAvgResultDTO> subGridServiceAvg = factIndexGridScoreDao.selectSubGridAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
if (CollectionUtils.isEmpty(subGridServiceAvg)) {
log.error("查询社区下级所有网格服务能力得分平均值集合为空");
log.warn("查询社区下级所有网格服务能力得分平均值集合为空");
} else {
MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
List<List<SubGridAvgResultDTO>> serviceAvgList = ListUtils.partition(subGridServiceAvg, IndexCalConstant.PAGE_SIZE);

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

@ -309,7 +309,7 @@ public class IndexCalculateDistrictServiceImpl implements IndexCalculateDistrict
}
}
if (CollectionUtils.isEmpty(deptScoreAvgList)) {
log.error("查询所有直属部门治理能力平均值集合为空");
log.warn("查询所有直属部门治理能力平均值集合为空");
} else{
MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(deptScoreAvgList.stream().map(o -> o.getScore()).collect(Collectors.toList()));
List<List<SubAgencyScoreAvgResultDTO>> governAvg = ListUtils.partition(deptScoreAvgList, IndexCalConstant.PAGE_SIZE);

4
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/IndexCalculateStreetServiceImpl.java
View File

@ -279,7 +279,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SYSQZLNLHZ.getCode().equals(detail.getIndexCode())) {
List<SubCommunityAvgResultDTO> subGridGovernAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.ZHI_LI_NENG_LI.getCode());
if (CollectionUtils.isEmpty(subGridGovernAvg)){
log.error("查询街道下属所有社区治理能力汇总为空");
log.warn("查询街道下属所有社区治理能力汇总为空");
}else if (subGridGovernAvg.size() > NumConstant.ZERO) {
MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subGridGovernAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
List<List<SubCommunityAvgResultDTO>> governAvg = ListUtils.partition(subGridGovernAvg, IndexCalConstant.PAGE_SIZE);
@ -352,7 +352,7 @@ public class IndexCalculateStreetServiceImpl implements IndexCalculateStreetServ
if (IndexCodeEnum.JIE_DAO_XIA_SHU_SQFWNLDFPYZ.getCode().equals(indexCode)) {
List<SubCommunityAvgResultDTO> subCommServiceAvg = communityScoreDao.selectSubCommAvgScore(customerId, monthId,IndexCodeEnum.FU_WU_NENG_LI.getCode());
if (CollectionUtils.isEmpty(subCommServiceAvg)) {
log.error("查询街道下属社区服务能力得分平均值为空");
log.warn("查询街道下属社区服务能力得分平均值为空");
} else if (subCommServiceAvg.size() > NumConstant.ZERO) {
MaxAndMinBigDecimalResultDTO maxAndMinBigDecimal = this.getMaxAndMinBigDecimal(subCommServiceAvg.stream().map(o -> o.getScore()).collect(Collectors.toList()));
List<List<SubCommunityAvgResultDTO>> serviceAvgList = ListUtils.partition(subCommServiceAvg, IndexCalConstant.PAGE_SIZE);

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

@ -111,10 +111,10 @@
</select>
<!-- 党员提出的话题转议题数 -->
<select id="selectShiftIssueCount" parameterType="map" resultType="java.util.Map">
<select id="selectShiftIssueCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
SELECT
t1.CREATE_TOPIC_USER_ID AS USER_ID,
COUNT( 1 ) AS SHIFT_ISSUE_COUNT
t1.CREATE_TOPIC_USER_ID AS userId,
COUNT( 1 ) AS indexValue
FROM
fact_origin_issue_main_daily t1
WHERE

16
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
View File

@ -113,10 +113,10 @@
</delete>
<!-- 党员提出的议题转项目数 -->
<select id="selectShiftProjectCount" parameterType="map" resultType="java.util.Map">
<select id="selectShiftProjectCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
SELECT
t1.TOPIC_CREATOR_ID AS USER_ID,
COUNT( 1 ) AS SHIFT_PROJECT_COUNT
t1.TOPIC_CREATOR_ID AS userId,
COUNT( 1 ) AS indexValue
FROM
fact_origin_project_main_daily t1
WHERE
@ -160,7 +160,10 @@
and t1.AGENCY_ID=#{communityId}
</if>
<if test='null != closedStatus and "" != closedStatus'>
and t1.CLOSED_STATUS=#{closedStatus}
and t1.IS_RESOLVED=#{closedStatus}
</if>
<if test='null != projectStatus and "" != projectStatus'>
and t1.PROJECT_STATUS=#{projectStatus}
</if>
</select>
@ -175,7 +178,10 @@
AND T1.CUSTOMER_ID = #{customerId}
and t1.PIDS LIKE CONCAT(#{agencyPath},'%')
<if test='null != closedStatus and "" != closedStatus'>
and t1.CLOSED_STATUS=#{closedStatus}
and t1.IS_RESOLVED=#{closedStatus}
</if>
<if test='null != projectStatus and "" != projectStatus'>
and t1.PROJECT_STATUS=#{projectStatus}
</if>
</select>
<select id="getSelfProject" resultType="com.epmet.dto.extract.result.OrgStatisticsResultDTO">

12
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml
View File

@ -69,10 +69,10 @@
</insert>
<!-- 查询客户下，这个月内，每个党员评论话题的次数 -->
<select id="selectJoinTopicCount" parameterType="map" resultType="java.util.Map">
<select id="selectJoinTopicCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
SELECT
t1.OPERATE_USER_ID,
count( 1 ) AS JOIN_TOPIC_COUNT
t1.OPERATE_USER_ID as userId,
count( 1 ) AS indexValue
FROM
fact_origin_topic_log_daily t1
WHERE
@ -85,9 +85,9 @@
</select>
<!-- 党员自建群活跃度——话题数 -->
<select id="selectGroupTopicCount" parameterType="map" resultType="java.util.Map">
select T2.USER_ID,
COUNT(1) AS GROUP_TOPIC_COUNT
<select id="selectGroupTopicCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
select T2.USER_ID as userId,
COUNT(1) AS indexValue
from fact_origin_topic_main_daily t1
INNER JOIN (
select main.GROUP_OWNER_ID AS USER_ID,main.ID AS GROUP_ID

6
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml
View File

@ -68,10 +68,10 @@
</insert>
<!-- 党员提出话题数：返回每个党员这个月内，提出的话题数 -->
<select id="selectPartyCreateTopicCount" parameterType="map" resultType="java.util.Map">
<select id="selectPartyCreateTopicCount" parameterType="map" resultType="com.epmet.dto.indexcollect.result.CpcIndexCommonDTO">
SELECT
T1.CREATE_TOPIC_USER_ID AS USER_ID,
COUNT( 1 ) AS CREATE_TOPIC_COUNT
T1.CREATE_TOPIC_USER_ID AS userId,
COUNT( 1 ) AS indexValue
FROM
fact_origin_topic_main_daily t1
WHERE

4
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml
View File

@ -77,7 +77,7 @@
</select>
<select id="selectClosedProjectList" resultType="com.epmet.entity.project.ProjectProcessEntity">
SELECT
pp.PROJECT_ID,
pp.PROJECT_ID ,
pp.CREATED_TIME,
p.CLOSED_STATUS AS isResolved
FROM project_process pp
@ -215,7 +215,7 @@
pp.PROJECT_ID,
pp.OPERATION,
pp.STAFF_ID,
pp.CREATED_TIME,
pp.CREATED_TIME
FROM
project_process pp
INNER JOIN project p ON pp.PROJECT_ID = p.ID

Write Preview
Loading…
Cancel
Save