luyan
/
epmet-cloud-lingshan
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

治理指数网格v2,

master
yinzuomei 4 years ago
parent
ac551e3f4d
commit
c032326cd1
6 changed files with 133 additions and 46 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. 10
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
  2. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  3. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
  4. 82
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
  5. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
  6. 33
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml

10
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/ProjectConstant.java
View File

@ -71,4 +71,14 @@ public interface ProjectConstant {
String ISSUE = "issue";
/**
* 项目来源于议题
*/
String PROJECT_ORIGIN_ISSUE="issue";
/**
* 项目来源于 工作端立项
*/
String PROJECT_ORIGIN_AGENCY="agency";
}

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

@ -28,6 +28,7 @@ import com.epmet.dto.screen.ScreenProjectDataDTO;
import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -445,4 +446,23 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
*/
List<OrgStatisticsResultDTO> selectPartyMemberClosedProjectStaticByGrid(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* 5、当前网格内：来源于议题的项目：结案已解决数、
* 6、当前网格内：来源于议题的项目：结案无需解决数、
* 7、当前网格内：项目立项，结案已解决数；默认为0、
* 8、当前网格内：项目立项，结案无需解决数；默认为0、
*
* @param customerId
* @param gridIds
* @param projectStatus 状态:待处理 pending，结案closed
* @param origin 项目来源 来源：议题issue 组织agency
* @param isResolved unresolved,resolved
* @return com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO
*/
List<GovernGridTotalCommonDTO> selectGroupByGrid(@Param("customerId")String customerId,
@Param("gridIds")List<String> gridIds,
@Param("projectStatus")String projectStatus,
@Param("origin")String origin,
@Param("isResolved")String isResolved);
}

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

@ -29,6 +29,7 @@ import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import java.util.List;
@ -421,4 +422,18 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
*/
Map<String, OrgStatisticsResultDTO> getPartyMemberClosedProjectStatic(String customerId, String dateId, String type);
/**
* 5、当前网格内：来源于议题的项目：结案已解决数、
* 6、当前网格内：来源于议题的项目：结案无需解决数、
* 7、当前网格内：项目立项，结案已解决数；默认为0、
* 8、当前网格内：项目立项，结案无需解决数；默认为0、
*
* @param customerId
* @param gridIds
* @param projectStatus 状态:待处理 pending，结案closed
* @param origin 项目来源 来源：议题issue 组织agency
* @param isResolved unresolved,resolved
* @return
*/
List<GovernGridTotalCommonDTO> queryGridProjectValue(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved);
}

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

@ -27,6 +27,7 @@ import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
import com.epmet.service.evaluationindex.extract.todata.FactGridGovernDailyService;
import com.epmet.service.evaluationindex.extract.todata.FactOriginIssueMainDailyService;
import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDailyService;
import com.epmet.service.org.CustomerGridService;
import lombok.extern.slf4j.Slf4j;
@ -56,6 +57,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
@Autowired
private FactOriginIssueMainDailyService factOriginIssueMainDailyService;
@Autowired
private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
@Autowired
private CustomerGridService customerGridService;
@ -91,9 +94,12 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
Map<String, Integer> topicResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED,NumConstant.ZERO_STR);
Map<String, Integer> topicUnResolvedMap=getTopicMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED,NumConstant.ZERO_STR);
Map<String, Integer> issueResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.RESOLVED);
Map<String, Integer> issueUnResolvedMap=getIssueMap(customerId, null,ProjectConstant.CLOSED, DimObjectStatusConstant.UNRESOLVED);
Map<String,Integer> issueProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.RESOLVED);
Map<String,Integer> issueProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_ISSUE,DimObjectStatusConstant.UNRESOLVED);
Map<String,Integer> approvalProjectResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.RESOLVED);
Map<String,Integer> approvalProjectUnResolvedMap=getGridProjectMap(customerId,null,ProjectConstant.CLOSED,ProjectConstant.PROJECT_ORIGIN_AGENCY,DimObjectStatusConstant.UNRESOLVED);
for(FactGridGovernDailyEntity insertEntity:insertEntityList){
//1、当前网格内，话题关闭已解决数
@ -112,18 +118,24 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
if(issueUnResolvedMap.containsKey(insertEntity.getGridId())){
insertEntity.setIssueUnResolvedCount(issueUnResolvedMap.get(insertEntity.getGridId()));
}
// todo
// 5、当前网格内：来源于议题的项目：结案已解决数
insertEntity.setIssueProjectResolvedCount(calIssueProjectResolvedCount(customerId,insertEntity.getGridId()));
if(issueProjectResolvedMap.containsKey(insertEntity.getGridId())){
insertEntity.setIssueProjectResolvedCount(issueProjectResolvedMap.get(insertEntity.getGridId()));
}
// 6、当前网格内：来源于议题的项目：结案无需解决数
insertEntity.setIssueProjectUnResolvedCount(calIssueProjectUnResolvedCount(customerId,insertEntity.getGridId()));
if(issueProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
insertEntity.setIssueProjectUnResolvedCount(issueProjectUnResolvedMap.get(insertEntity.getGridId()));
}
//7、当前网格内：项目立项，结案已解决数；默认为0，
insertEntity.setApprovalProjectResolvedCount(calApprovalProjectResolvedCount(customerId,insertEntity.getGridId()));
if(approvalProjectResolvedMap.containsKey(insertEntity.getGridId())){
insertEntity.setApprovalProjectResolvedCount(approvalProjectResolvedMap.get(insertEntity.getGridId()));
}
// 8、当前网格内：项目立项，结案无需解决数；默认为0，
insertEntity.setApprovalProjectUnResolvedCount(calApprovalProjectUnResolvedCount(customerId,insertEntity.getGridId()));
if(approvalProjectUnResolvedMap.containsKey(insertEntity.getGridId())){
insertEntity.setApprovalProjectUnResolvedCount(approvalProjectUnResolvedMap.get(insertEntity.getGridId()));
}
// todo
// 9、当前网格内，未出小组即未转议题的：话题关闭已解决数
insertEntity.setInGroupTopicResolvedCount(calInGroupTopicResolvedCount(customerId,insertEntity.getGridId()));
// 10、当前网格内，未出小组即未转议题的：话题关闭无需解决数
@ -230,52 +242,30 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
return resultMap;
}
/**
* 5、当前网格内：来源于议题的项目：结案已解决数
*
* @param customerId
* @param gridId
*/
private Integer calIssueProjectResolvedCount(String customerId, String gridId) {
// todo
return 0;
}
/**
* 6、当前网格内：来源于议题的项目：结案无需解决数
* 5、当前网格内：来源于议题的项目：结案已解决数、
* 6、当前网格内：来源于议题的项目：结案无需解决数、
* 7、当前网格内：项目立项，结案已解决数；默认为0、
* 8、当前网格内：项目立项，结案无需解决数；默认为0、
*
* @param customerId
* @param gridId
* @param gridIds
* @param projectStatus 状态:待处理 pending，结案closed
* @param origin 项目来源 来源：议题issue 组织agency
* @param isResolved unresolved,resolved
* @return
*/
private Integer calIssueProjectUnResolvedCount(String customerId, String gridId) {
// todo
return 0;
private Map<String, Integer> getGridProjectMap(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved) {
Map<String, Integer> resultMap = new HashMap<>();
List<GovernGridTotalCommonDTO> list = factOriginProjectMainDailyService.queryGridProjectValue(customerId, gridIds, projectStatus, origin, isResolved);
for (GovernGridTotalCommonDTO gridTotalCommonDTO : list) {
resultMap.put(gridTotalCommonDTO.getGridId(), gridTotalCommonDTO.getTotal());
}
return resultMap;
}
/**
* 7、当前网格内：项目立项，结案已解决数；默认为0，
*
* @param customerId
* @param gridId
*/
private Integer calApprovalProjectResolvedCount(String customerId, String gridId) {
// todo
return 0;
}
/**
* 8、当前网格内：项目立项，结案无需解决数；默认为0，
*
* @param customerId
* @param gridId
*/
private Integer calApprovalProjectUnResolvedCount(String customerId, String gridId) {
// todo
return 0;
}
/**
* 9、当前网格内，未出小组即未转议题的：话题关闭已解决数

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

@ -39,6 +39,7 @@ import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectMainDailyEntity;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity;
import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
@ -639,5 +640,23 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
}
}
/**
* 5、当前网格内：来源于议题的项目：结案已解决数、
* 6、当前网格内：来源于议题的项目：结案无需解决数、
* 7、当前网格内：项目立项，结案已解决数；默认为0、
* 8、当前网格内：项目立项，结案无需解决数；默认为0、
*
* @param customerId
* @param gridIds
* @param projectStatus 状态:待处理 pending，结案closed
* @param origin 项目来源 来源：议题issue 组织agency
* @param isResolved unresolved,resolved
* @return com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO
*/
@Override
public List<GovernGridTotalCommonDTO> queryGridProjectValue(String customerId, List<String> gridIds, String projectStatus, String origin, String isResolved) {
return baseDao.selectGroupByGrid(customerId,gridIds,projectStatus,origin,isResolved);
}
}

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

@ -914,4 +914,37 @@
ON a.AGENCY_ID = b.AGENCY_ID
</select>
<!-- 5、当前网格内：来源于议题的项目：结案已解决数、6、当前网格内：来源于议题的项目：结案无需解决数、7、当前网格内：项目立项，结案已解决数；默认为0、8、当前网格内：项目立项，结案无需解决数；默认为0、 -->
<select id="selectGroupByGrid" parameterType="map" resultType="com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO">
SELECT
m.CUSTOMER_ID AS customerId,
m.GRID_ID AS gridId,
count( 1 ) AS total
FROM
fact_origin_project_main_daily m
WHERE
m.DEL_FLAG = '0'
<if test='null != customerId and "" != customerId'>
AND m.CUSTOMER_ID = #{customerId}
</if>
<if test='null != origin and "" != origin'>
AND m.ORIGIN = #{origin}
</if>
<if test='null != projectStatus and "" != projectStatus'>
AND m.PROJECT_STATUS = #{projectStatus}
</if>
<if test='null != isResolved and "" != isResolved'>
AND m.IS_RESOLVED = #{isResolved}
</if>
<if test="gridIds != null and gridIds.size() > 0">
AND m.GRID_ID in
<foreach item="gridId" collection="gridIds" open="(" separator="," close=")">
#{gridId}
</foreach>
</if>
GROUP BY
m.CUSTOMER_ID,
m.GRID_ID
</select>
</mapper>

Write Preview
Loading…
Cancel
Save