Browse Source

治理指谁网格相关v3: 网格自治占比:本网格内产生的项目,并且一直在网格级流转的项目,从哪出来归谁自治;社区、街道、区直部门解决都是指的,从本网格内出来的项目中,再去看谁解决

dev_shibei_match
yinzuomei 4 years ago
parent
commit
d894dd37e1
  1. 10
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectLogDailyDTO.java
  2. 13
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java
  3. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectLogDailyDao.java
  4. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java
  5. 8
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java
  6. 20
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernProjectInfoDTO.java
  7. 15
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java
  8. 19
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java
  9. 197
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactGridGovernDailyServiceImpl.java
  10. 23
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java
  11. 16
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java
  12. 22
      epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java
  13. 23
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectLogDailyDao.xml
  14. 59
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml
  15. 18
      epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

10
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/FactOriginProjectLogDailyDTO.java

@ -17,9 +17,10 @@
package com.epmet.dto.extract;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
@ -44,7 +45,7 @@ public class FactOriginProjectLogDailyDTO implements Serializable {
private String customerId;
/**
* 网格grid,部门department
* 网格grid,部门department,组织agency
*/
private String orgType;
@ -90,6 +91,11 @@ public class FactOriginProjectLogDailyDTO implements Serializable {
*/
private String yearId;
/**
* 项目ID
*/
private String projectId;
/**
* 议题ID
*/

13
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/constant/DimObjectActionConstant.java

@ -11,4 +11,17 @@ public interface DimObjectActionConstant {
* 发布话题
*/
String TOPIC_PUBLISH="discussing";
// response 处理/响应
// close 结案
// transfer 流转
// return 退回
// resolved 结案_已解决
// unresolved 结案_无需解决
// evaluate 满意度评价
// bad 不满意
// good 基本满意
// perfect 非常满意
// created 立项
String PROJECT_RETURN="return";
}

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

@ -18,12 +18,12 @@
package com.epmet.dao.evaluationindex.extract;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
import com.epmet.dto.extract.result.*;
import com.epmet.entity.evaluationindex.extract.FactOriginProjectLogDailyEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
@ -298,4 +298,22 @@ public interface FactOriginProjectLogDailyDao extends BaseDao<FactOriginProjectL
* @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
*/
List<OrgStatisticsResultDTO> selectGridSelfDaily(@Param("customerId") String customerId, @Param("dateId") String dateId);
/**
* @return java.util.List<com.epmet.dto.extract.FactOriginProjectLogDailyDTO>
* @param projectId
* @author yinzuomei
* @description 根据项目id 查询处理明细
* @Date 2021/5/27 12:58
**/
List<FactOriginProjectLogDailyDTO> selectListByProjectId(String projectId);
/**
* @return com.epmet.dto.extract.FactOriginProjectLogDailyDTO
* @param projectId
* @author yinzuomei
* @description 查询某一个项目的结案操作明细
* @Date 2021/5/27 12:58
**/
FactOriginProjectLogDailyDTO selectClosedLog(String projectId);
}

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

@ -29,6 +29,7 @@ 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.extract.GovernProjectInfoDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -477,4 +478,22 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
*/
List<OrgStatisticsResultDTO> selectAgencyClosedProjectCount(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param(
"closedStatus") String closedStatus, @Param("origin") String origin);
/**
* 当前网格内已结案的项目
*
* @author zhaoqifeng
* @date 2021/5/26 15:09
* @param customerId
* @param gridId
* @param projectStatus 状态:待处理 pending结案closed
* @param origin 项目来源 来源议题issue 组织agency
* @param isResolved unresolved,resolved
* @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO
*/
List<GovernProjectInfoDTO> getGridClosedProjectList(@Param("customerId")String customerId,
@Param("gridId") String gridId,
@Param("projectStatus")String projectStatus,
@Param("origin") String origin,
@Param("isResolved")String isResolved);
}

8
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/org/StatsCustomerAgencyDao.java

@ -35,4 +35,12 @@ public interface StatsCustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
CustomerAgencyEntity getRootAgencyInfo(String customerId);
List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
/**
* 查询部门所属组织信息
*
* @param deptId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
CustomerAgencyEntity selectByDeptId(String deptId);
}

20
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/GovernProjectInfoDTO.java

@ -0,0 +1,20 @@
package com.epmet.entity.evaluationindex.extract;
import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
import com.epmet.dto.extract.FactOriginProjectMainDailyDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.List;
/**
* 描述一下
*
* @author yinzuomei@elink-cn.com
* @date 2021/5/26 18:00
*/
@Data
public class GovernProjectInfoDTO extends FactOriginProjectMainDailyDTO implements Serializable {
private FactOriginProjectLogDailyDTO closeLogDTO;
private List<FactOriginProjectLogDailyDTO> projectLogDTOList;
}

15
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/ProjectInfoDTO.java

@ -1,15 +0,0 @@
package com.epmet.entity.evaluationindex.extract;
import lombok.Data;
import java.io.Serializable;
/**
* 描述一下
*
* @author yinzuomei@elink-cn.com
* @date 2021/5/26 18:00
*/
@Data
public class ProjectInfoDTO implements Serializable {
}

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

@ -30,6 +30,7 @@ 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.extract.GovernProjectInfoDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import java.util.List;
@ -448,4 +449,22 @@ public interface FactOriginProjectMainDailyService extends BaseService<FactOrigi
* @return java.util.Map<java.lang.String,com.epmet.dto.extract.result.OrgStatisticsResultDTO>
*/
Map<String, OrgStatisticsResultDTO> getAgencyClosedProjectCount(String customerId, String dateId, String closedStatus, String origin);
/**
* 当前网格内已结案的项目
*
* @author zhaoqifeng
* @date 2021/5/26 15:09
* @param customerId
* @param gridId
* @param projectStatus 状态:待处理 pending结案closed
* @param origin 项目来源 来源议题issue 组织agency
* @param isResolved unresolved,resolved
* @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO
*/
List<GovernProjectInfoDTO> getGridClosedProjectList(String customerId,
String gridId,
String projectStatus,
String origin,
String isResolved);
}

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

@ -19,17 +19,22 @@ package com.epmet.service.evaluationindex.extract.todata.impl;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.constant.DimObjectActionConstant;
import com.epmet.constant.DimObjectStatusConstant;
import com.epmet.constant.ProjectConstant;
import com.epmet.dao.evaluationindex.extract.FactGridGovernDailyDao;
import com.epmet.dto.extract.FactOriginProjectLogDailyDTO;
import com.epmet.dto.org.GridInfoDTO;
import com.epmet.entity.evaluationindex.extract.FactGridGovernDailyEntity;
import com.epmet.entity.evaluationindex.extract.GovernGridClosedTotalCommonDTO;
import com.epmet.entity.evaluationindex.extract.GovernGridTotalCommonDTO;
import com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO;
import com.epmet.entity.org.CustomerAgencyEntity;
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.CustomerAgencyService;
import com.epmet.service.org.CustomerGridService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
@ -39,10 +44,7 @@ import org.springframework.stereotype.Service;
import java.math.BigDecimal;
import java.text.NumberFormat;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
import java.util.stream.Collectors;
/**
@ -62,7 +64,8 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
private FactOriginProjectMainDailyService factOriginProjectMainDailyService;
@Autowired
private CustomerGridService customerGridService;
@Autowired
private CustomerAgencyService customerAgencyService;
// 指标解释:
// 1、问题解决总数:当前网格内,话题关闭(已解决+无需解决)总数、议题关闭(已解决+无需解决)总数和项目结案(议题转为项目的结案数+项目立项结案数)总数之和
@ -242,13 +245,193 @@ public class FactGridGovernDailyServiceImpl extends BaseServiceImpl<FactGridGove
}
private Map<String, GovernGridClosedTotalCommonDTO> getGovernGridClosedTotalCommonDTOMap(String customerId, List<String> gridIds) {
Map<String, GovernGridClosedTotalCommonDTO> resultMap=new HashMap<>();
for(String gridId:gridIds){
Map<String, GovernGridClosedTotalCommonDTO> resultMap = new HashMap<>();
for (String gridId : gridIds) {
GovernGridClosedTotalCommonDTO governGridClosedTotalCommonDTO = new GovernGridClosedTotalCommonDTO();
governGridClosedTotalCommonDTO.setGridId(gridId);
// 11、来源于议题的项目,未出网格结案并且已解决的项目数
int fromIssueResolvedInGridCount = NumConstant.ZERO;
// 12、来源于议题的项目,未出网格结案并且无需解决的项目数
int fromIssueUnResolvedInGridCount = NumConstant.ZERO;
// 13、来源于项目立项的项目,未出网格结案,并且已解决的项目数;因现在网格不能立项,所以此列默认为0
int fromAgencyResolvedInGridCount = NumConstant.ZERO;
// 14、来源于项目立项的项目,未出网格结案,并且无需解决的项目数;因现在网格不能立项,所以此列默认为0
int fromAgencyUnResolvedInGridCount = NumConstant.ZERO;
// 当前网格内出来的项目:由社区结案(已解决+未解决)的项目总数
int communityClosedCount= NumConstant.ZERO;
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
int streetClosedCount=NumConstant.ZERO;;
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
int districtDeptClosedCount=NumConstant.ZERO;
//当前网格内已结案的项目
List<GovernProjectInfoDTO> currentGridClosedProjectList = factOriginProjectMainDailyService.getGridClosedProjectList(customerId, gridId,
ProjectConstant.CLOSED,null,null);
for (GovernProjectInfoDTO governProjectInfoDTO : currentGridClosedProjectList) {
// 1、先判断当前项目是否出了网格
// 举例:A社区下有A1、A2两个网格;A1网格下的一个项目,流转给了A2网格的某人,他结案了。 只要项目流转部门未出grid ;就算是网格自治。
boolean inGridClosed = checkIsInGridClosed(governProjectInfoDTO.getGridId(),
governProjectInfoDTO.getProjectLogDTOList());
if (inGridClosed) {
// 2、在网格内流转结案的,计算以下下值
if (ProjectConstant.PROJECT_ORIGIN_ISSUE.equals(governProjectInfoDTO.getOrigin())) {
if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
// 11、来源于议题的项目,未出网格(在网格内流转的)结案并且已解决的项目数
fromIssueResolvedInGridCount += 1;
} else if (ProjectConstant.UNRESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
// 12、来源于议题的项目,未出网格(在网格内流转的)结案并且无需解决的项目数
fromIssueUnResolvedInGridCount += 1;
}
} else if (ProjectConstant.PROJECT_ORIGIN_AGENCY.equals(governProjectInfoDTO.getOrigin())) {
if (ProjectConstant.RESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
// 13、来源于项目立项的项目,未出网格(在网格内流转的)结案,并且已解决的项目数;因现在网格不能立项,所以此列默认为0
fromAgencyResolvedInGridCount += 1;
} else if (ProjectConstant.UNRESOLVED.equals(governProjectInfoDTO.getIsResolved())) {
// 14、来源于项目立项的项目,未出网格(在网格内流转的)结案,并且无需解决的项目数;因现在网格不能立项,所以此列默认为0
fromAgencyUnResolvedInGridCount += 1;
}
}
} else {
// 3、出了网格的判断是由谁解决的?
String resolveOrgType=getProjectResolveOrgType(governProjectInfoDTO.getProjectLogDTOList());
if("community".equals(resolveOrgType)){
// 当前网格内出来的项目:由社区结案(已解决+未解决)的项目总数
communityClosedCount+=1;
}else if("street".equals(resolveOrgType)){
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
streetClosedCount+=1;
}else if("districtdept".equals(resolveOrgType)){
// 当前网格内出来的项目:由街道结案(已解决+未解决)的项目总数
districtDeptClosedCount+=1;
}
// todo 可能是 市级解决、省级解决呢???
}
}
governGridClosedTotalCommonDTO.setFromIssueResolvedInGridCount(fromIssueResolvedInGridCount);
governGridClosedTotalCommonDTO.setFromIssueUnResolvedInGridCount(fromIssueUnResolvedInGridCount);
governGridClosedTotalCommonDTO.setFromAgencyResolvedInGridCount(fromAgencyResolvedInGridCount);
governGridClosedTotalCommonDTO.setFromAgencyUnResolvedInGridCount(fromAgencyUnResolvedInGridCount);
governGridClosedTotalCommonDTO.setCommunityClosedCount(communityClosedCount);
governGridClosedTotalCommonDTO.setStreetClosedCount(streetClosedCount);
governGridClosedTotalCommonDTO.setDistrictDeptClosedCount(districtDeptClosedCount);
resultMap.put(gridId, governGridClosedTotalCommonDTO);
}
return resultMap;
}
/**
* 已经出网格的项目到底归谁解决呢
*
* @param projectLogDTOList 当前项目所有的处理明细
* @return String 社区解决community街道解决street区直部门解决districtdept
*/
private String getProjectResolveOrgType(List<FactOriginProjectLogDailyDTO> projectLogDTOList) {
List<Integer> handleLevelList=new ArrayList<>();
for (FactOriginProjectLogDailyDTO logDailyDTO : projectLogDTOList) {
if(logDailyDTO.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){
//当前操作如果是退回,不参与比较
continue;
}
/**
* 机关级别社区级community
街道:street,
区县级: district,
市级: city
省级:province
*/
// orgType: 网格grid,部门department,组织:agency
if ("grid".equals(logDailyDTO.getOrgType())) {
handleLevelList.add(NumConstant.ONE);
} else if ("agency".equals(logDailyDTO.getOrgType())) {
CustomerAgencyEntity agencyEntity=customerAgencyService.getAgencyById(logDailyDTO.getOrgId());
if("community".equals(agencyEntity.getLevel())){
handleLevelList.add(NumConstant.TWO);
}else if("street".equals(agencyEntity.getLevel())){
handleLevelList.add(NumConstant.THREE);
}else if("district".equals(agencyEntity.getLevel())){
handleLevelList.add(NumConstant.FOUR);
}else if("city".equals(agencyEntity.getLevel())){
handleLevelList.add(NumConstant.FIVE);
}else if("province".equals(agencyEntity.getLevel())){
handleLevelList.add(NumConstant.SIX);
}
} else if ("department".equals(logDailyDTO.getOrgType())) {
CustomerAgencyEntity deptAgencyEntity=customerAgencyService.getAgencyByDeptId(logDailyDTO.getOrgId());
if("district".equals(deptAgencyEntity.getLevel())){
// 区直部门直接返回
return "districtdept";
}else if("community".equals(deptAgencyEntity.getLevel())){
handleLevelList.add(NumConstant.TWO);
}else if("street".equals(deptAgencyEntity.getLevel())){
handleLevelList.add(NumConstant.THREE);
}else if("city".equals(deptAgencyEntity.getLevel())){
handleLevelList.add(NumConstant.FIVE);
}else if("province".equals(deptAgencyEntity.getLevel())){
handleLevelList.add(NumConstant.SIX);
}
}
}
//网格:1 grid
//社区:2 community
//街道:3 street
//区县:4 district
//市级:5 city
//省:6 province
//区直部门:7 districtdept
//求出最高的处理部门级别
String result = "";
int max = Collections.max(handleLevelList);
switch (max) {
case NumConstant.ONE:
return "grid";
case NumConstant.TWO:
result = "community";
break;
case NumConstant.THREE:
result = "street";
break;
case NumConstant.FOUR:
result = "district";
break;
case NumConstant.FIVE:
result = "city";
break;
case NumConstant.SIX:
result = "province";
break;
case NumConstant.SEVEN:
result = "districtdept";
}
return result;
}
/**
* 根据项目处理的明细,判断当前项目是否在网格内自己解决的
*
* @param gridId 当前项目所属网格
* @param projectLogDTOList
* @return boolean
*/
private boolean checkIsInGridClosed(String gridId, List<FactOriginProjectLogDailyDTO> projectLogDTOList) {
boolean flag = true;
for (FactOriginProjectLogDailyDTO detail : projectLogDTOList) {
if(detail.getActionCode().equals(DimObjectActionConstant.PROJECT_RETURN)){
//当前操作如果是退回,不参与比较
continue;
}
//只要出了网格,就不算自治
if (!"grid".equals(detail.getOrgType())) {
flag = false;
break;
}
}
return flag;
}
/**
* 构造要插入的数据每个网格一天一条数据初始赋值0
*

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

@ -40,6 +40,7 @@ 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.extract.GovernProjectInfoDTO;
import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.evaluationindex.extract.todata.FactOriginProjectMainDailyService;
@ -678,5 +679,27 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
return list.stream().collect(Collectors.toMap(OrgStatisticsResultDTO::getAgencyId, Function.identity()));
}
/**
* 当前网格内已结案的项目
*
* @author zhaoqifeng
* @date 2021/5/26 15:09
* @param customerId
* @param gridId
* @param projectStatus 状态:待处理 pending结案closed
* @param origin 项目来源 来源议题issue 组织agency
* @param isResolved unresolved,resolved
* @return com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO
*/
@Override
public List<GovernProjectInfoDTO> getGridClosedProjectList(String customerId,
String gridId,
String projectStatus,
String origin,
String isResolved) {
List<GovernProjectInfoDTO> resultList=baseDao.getGridClosedProjectList(customerId,gridId,projectStatus,origin,isResolved);
return resultList;
}
}

16
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/CustomerAgencyService.java

@ -23,4 +23,20 @@ public interface CustomerAgencyService {
List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId);
/**
* 根据组织id查询基本信息
*
* @param agencyId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
CustomerAgencyEntity getAgencyById(String agencyId);
/**
* 查询部门所属组织信息
*
* @param deptId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
CustomerAgencyEntity getAgencyByDeptId(String deptId);
}

22
epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerAgencyServiceImpl.java

@ -55,4 +55,26 @@ public class CustomerAgencyServiceImpl implements CustomerAgencyService {
public List<CustomerAgencyEntity> queryAgencyListByCustomerId(String customerId) {
return customerAgencyDao.queryAgencyListByCustomerId(customerId);
}
/**
* 根据组织id查询基本信息
*
* @param agencyId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
@Override
public CustomerAgencyEntity getAgencyById(String agencyId) {
return customerAgencyDao.selectById(agencyId);
}
/**
* 查询部门所属组织信息
*
* @param deptId
* @return com.epmet.entity.evaluationindex.screen.ScreenCustomerAgencyEntity
*/
@Override
public CustomerAgencyEntity getAgencyByDeptId(String deptId) {
return customerAgencyDao.selectByDeptId(deptId);
}
}

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

@ -664,4 +664,27 @@
GROUP BY
GRID_ID
</select>
<!-- 根据项目id, 查询处理明细-->
<select id="selectListByProjectId" parameterType="java.lang.String" resultType="com.epmet.dto.extract.FactOriginProjectLogDailyDTO">
SELECT
m.*
FROM
fact_origin_project_log_daily m
WHERE
m.DEL_FLAG = '0'
AND m.PROJECT_ID = #{projectId}
</select>
<!-- 查询某一个项目的结案操作明细 -->
<select id="selectClosedLog" parameterType="java.lang.String" resultType="com.epmet.dto.extract.FactOriginProjectLogDailyDTO">
SELECT
m.*
FROM
fact_origin_project_log_daily m
WHERE
m.DEL_FLAG = '0'
and m.ACTION_CODE='close'
AND m.PROJECT_ID = #{projectId}
</select>
</mapper>

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

@ -963,4 +963,63 @@
</if>
GROUP BY AGENCY_ID
</select>
<resultMap type="com.epmet.entity.evaluationindex.extract.GovernProjectInfoDTO" id="GetGridClosedProjectListMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="issueCreatorId" column="ISSUE_CREATOR_ID"/>
<result property="issueId" column="ISSUE_ID"/>
<result property="topicId" column="TOPIC_ID"/>
<result property="gridId" column="GRID_ID"/>
<result property="pid" column="PID"/>
<result property="agencyId" column="AGENCY_ID"/>
<result property="projectStatus" column="PROJECT_STATUS"/>
<result property="topicCreatorId" column="TOPIC_CREATOR_ID"/>
<result property="isParty" column="IS_PARTY"/>
<result property="isOverdue" column="IS_OVERDUE"/>
<result property="isSatisfied" column="IS_SATISFIED"/>
<result property="finishOrgIds" column="FINISH_ORG_IDS"/>
<association property="closeLogDTO"
select="com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao.selectClosedLog"
column="ID">
</association>
<collection property="projectLogDTOList" column="ID" ofType="com.epmet.dto.extract.FactOriginProjectLogDailyDTO"
select="com.epmet.dao.evaluationindex.extract.FactOriginProjectLogDailyDao.selectListByProjectId">
<result property="orgType" column="ORG_TYPE"/>
<result property="orgId" column="ORG_ID"/>
<result property="agencyId" column="AGENCY_ID"/>
<result property="pid" column="PID"/>
<result property="pids" column="PIDS"/>
<result property="projectId" column="PROJECT_ID"/>
<result property="operationUserId" column="OPERATION_USER_ID"/>
<result property="actionCode" column="ACTION_CODE"/>
<result property="isActive" column="IS_ACTIVE"/>
</collection>
</resultMap>
<select id="getGridClosedProjectList" parameterType="map" resultMap="GetGridClosedProjectListMap">
SELECT
*
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 != gridId and "" != gridId'>
AND m.GRID_ID = #{gridId}
</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>
</select>
</mapper>

18
epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/StatsCustomerAgencyDao.xml

@ -132,4 +132,22 @@
where ca.del_flag='0'
and ca.CUSTOMER_ID=#{customerId}
</select>
<select id="selectByDeptId" parameterType="java.lang.String" resultType="com.epmet.entity.org.CustomerAgencyEntity">
SELECT
*
FROM
customer_agency ca
WHERE
ca.DEL_FLAG = '0'
AND ca.id =(
SELECT
cd.AGENCY_ID
FROM
customer_department cd
WHERE
cd.id = #{deptId}
AND cd.DEL_FLAG = '0'
)
</select>
</mapper>
Loading…
Cancel
Save