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

治理能力，党建实况日期条件查询

dev_shibei_match
zhaoqifeng 4 years ago
parent
0eb3574980
commit
1512336b36
11 changed files with 50 additions and 23 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. 1
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java
  2. 2
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java
  3. 2
      epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
  4. 8
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
  5. 14
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
  6. 14
      epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
  7. 16
      epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
  8. 2
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
  9. 5
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
  10. 5
      epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
  11. 4
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

1
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/PartyMemberVanguardFormDTO.java
View File

@ -15,4 +15,5 @@ public class PartyMemberVanguardFormDTO implements Serializable {
private String agencyId;
private String orgId;
private String orgType;
private String dateId;
}

2
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/BranchConAnalysisFormDTO.java
View File

@ -39,4 +39,6 @@ public class BranchConAnalysisFormDTO implements Serializable {
*/
@NotBlank(message = "orgType不能为空", groups = AddUserInternalGroup.class)
private String orgType;
private String dateId;
}

2
epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/resigroup/form/GroupActRankFormDTO.java
View File

@ -45,4 +45,6 @@ public class GroupActRankFormDTO implements Serializable {
* 排序编码；可以不传，前端自己处理。
*/
private String rankCode;
private String dateId;
}

8
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java
View File

@ -187,7 +187,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 14:40
*/
PartyMemberVanguardDetailResultDTO selectAgencyVanguardDetail(@Param("agencyId") String agencyId);
PartyMemberVanguardDetailResultDTO selectAgencyVanguardDetail(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
/**
* 查询网格党员先锋详情
@ -197,7 +197,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 14:40
*/
PartyMemberVanguardDetailResultDTO selectGridVanguardDetail(@Param("grid") String grid);
PartyMemberVanguardDetailResultDTO selectGridVanguardDetail(@Param("grid") String grid, @Param("dateId") String dateId);
/**
* 查询组织党员先锋排行
@ -207,7 +207,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 15:02
*/
List<PartyMemberVanguardDetailResultDTO> selectAgencyVanguardRank(@Param("agencyId") String agencyId);
List<PartyMemberVanguardDetailResultDTO> selectAgencyVanguardRank(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
/**
* 查询网格党员先锋排行
@ -217,7 +217,7 @@ public interface DataStatsDao {
* @author zhaoqifeng
* @date 2021/5/18 15:03
*/
List<PartyMemberVanguardDetailResultDTO> selectGridVanguardRank(@Param("agencyId") String agencyId);
List<PartyMemberVanguardDetailResultDTO> selectGridVanguardRank(@Param("agencyId") String agencyId, @Param("dateId") String dateId);
List<FactGroupActDailyDTO> branchConAnalysis(@Param("customerId") String customerId,
@Param("orgId") String orgId,

14
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java
View File

@ -1035,10 +1035,13 @@ public class DataStatsServiceImpl implements DataStatsService {
@Override
public PartyMemberVanguardDetailResultDTO vanguardDetail(PartyMemberVanguardFormDTO formDTO) {
PartyMemberVanguardDetailResultDTO result;
if (StringUtils.isBlank(formDTO.getDateId())) {
formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
}
if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) {
result = dataStatsDao.selectAgencyVanguardDetail(formDTO.getOrgId());
result = dataStatsDao.selectAgencyVanguardDetail(formDTO.getOrgId(), formDTO.getDateId());
} else {
result = dataStatsDao.selectGridVanguardDetail(formDTO.getOrgId());
result = dataStatsDao.selectGridVanguardDetail(formDTO.getOrgId(), formDTO.getDateId());
}
if (null == result) {
result = new PartyMemberVanguardDetailResultDTO();
@ -1071,13 +1074,16 @@ public class DataStatsServiceImpl implements DataStatsService {
public PartyMemberVanguardRankResultDTO vanguardRank(PartyMemberVanguardFormDTO formDTO) {
//获取组织级别
DimAgencyEntity agency = dataStatsDao.getAgencyInfo(formDTO.getAgencyId());
if (StringUtils.isBlank(formDTO.getDateId())) {
formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
}
if (null == agency) {
return new PartyMemberVanguardRankResultDTO();
}
//组织排行
List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId());
List<PartyMemberVanguardDetailResultDTO> agencyRank = dataStatsDao.selectAgencyVanguardRank(formDTO.getAgencyId(), formDTO.getDateId());
//网格排行
List<PartyMemberVanguardDetailResultDTO> gridRank = dataStatsDao.selectGridVanguardRank(formDTO.getAgencyId());
List<PartyMemberVanguardDetailResultDTO> gridRank = dataStatsDao.selectGridVanguardRank(formDTO.getAgencyId(), formDTO.getDateId());
PartyMemberVanguardRankResultDTO result = new PartyMemberVanguardRankResultDTO();
result.setAgencyRank(CollectionUtils.isNotEmpty(agencyRank)?agencyRank:Collections.emptyList());
result.setGridRank(CollectionUtils.isNotEmpty(gridRank)?gridRank:Collections.emptyList());

14
epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resigroup/impl/ResiGroupServiceImpl.java
View File

@ -22,10 +22,10 @@ import com.epmet.dataaggre.service.resigroup.ResiGroupService;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
import java.util.Comparator;
@ -120,9 +120,11 @@ public class ResiGroupServiceImpl implements ResiGroupService {
if (CollectionUtils.isEmpty(categoryList)) {
return new BranchConAnalysisResultDTO();
}
String dateId = DateUtils.getBeforeNDay(NumConstant.ONE);
if (StringUtils.isBlank(formDTO.getDateId())) {
formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
}
List<FactGroupActDailyDTO> factGroupActDailyDTOList = dataStatsService.branchConAnalysis(formDTO.getCustomerId(), formDTO.getOrgId(), formDTO.getOrgType(),
dateId, formDTO.getFirstCategoryCode());
formDTO.getDateId(), formDTO.getFirstCategoryCode());
/**
* List -> Map
* 需要注意的是：
@ -285,7 +287,9 @@ public class ResiGroupServiceImpl implements ResiGroupService {
return new ArrayList<>();
}
List<GroupActRankResultDTO> resultDTOList=new ArrayList<>();
String dateId = DateUtils.getBeforeNDay(NumConstant.ONE);
if (StringUtils.isBlank(formDTO.getDateId())) {
formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
}
// 1、根据以及编码查询出二级编码列表
List<ActCategoryDictDTO> actCategoryDictDTOList=queryActCategoryDictList(formDTO.getCustomerId(),formDTO.getFirstCategoryCode());
for(OrgInfoCommonDTO orgInfo:orgInfoDTOList){
@ -296,7 +300,7 @@ public class ResiGroupServiceImpl implements ResiGroupService {
if(!CollectionUtils.isEmpty(actCategoryDictDTOList)){
List<GroupActRankDetailDTO> detailList=new ArrayList<>();
List<GroupActRankDetailDTO> detailRecords=dataStatsService.selectGroupActRankDetail(formDTO.getCustomerId(),dateId,orgInfo.getOrgId(),actCategoryDictDTOList);
List<GroupActRankDetailDTO> detailRecords=dataStatsService.selectGroupActRankDetail(formDTO.getCustomerId(),formDTO.getDateId(),orgInfo.getOrgId(),actCategoryDictDTOList);
Map<String, GroupActRankDetailDTO> map = detailRecords.stream().collect(Collectors.toMap(GroupActRankDetailDTO::getCategoryCode, a -> a, (k1, k2) -> k1));
for(ActCategoryDictDTO actCategoryDictDTO:actCategoryDictDTOList){

16
epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml
View File

@ -395,13 +395,13 @@
PROJECT_COUNT,
PROJECT_RATIO,
PROJECT_CLOSED_COUNT,
PROJECT_CLOSED_RATIO,
MAX( DATE_ID )
PROJECT_CLOSED_RATIO
FROM
fact_party_member_vanguard_agency_daily a
INNER JOIN dim_agency b ON a.AGENCY_ID = b.ID
WHERE
a.AGENCY_ID = #{agencyId}
AND a.DATE_ID = #{dateId}
GROUP BY
AGENCY_ID
) a
@ -438,13 +438,13 @@
PROJECT_COUNT,
PROJECT_RATIO,
PROJECT_CLOSED_COUNT,
PROJECT_CLOSED_RATIO,
MAX( DATE_ID )
PROJECT_CLOSED_RATIO
FROM
fact_party_member_vanguard_grid_daily a
INNER JOIN dim_grid b ON a.GRID_ID = b.ID
WHERE
a.GRID_ID = #{grid}
AND a.DATE_ID = #{dateId}
GROUP BY
GRID_ID
) a
@ -481,13 +481,13 @@
PROJECT_COUNT,
PROJECT_RATIO,
PROJECT_CLOSED_COUNT,
PROJECT_CLOSED_RATIO,
MAX( DATE_ID )
PROJECT_CLOSED_RATIO
FROM
fact_party_member_vanguard_agency_daily a
INNER JOIN dim_agency b ON a.AGENCY_ID = b.ID
WHERE
a.PID = #{agencyId}
AND a.DATE_ID = #{dateId}
GROUP BY
AGENCY_ID
) a
@ -525,13 +525,13 @@
PROJECT_COUNT,
PROJECT_RATIO,
PROJECT_CLOSED_COUNT,
PROJECT_CLOSED_RATIO,
MAX( DATE_ID )
PROJECT_CLOSED_RATIO
FROM
fact_party_member_vanguard_grid_daily a
INNER JOIN dim_grid b ON a.GRID_ID = b.ID
WHERE
a.AGENCY_ID = #{agencyId}
AND a.DATE_ID = #{dateId}
GROUP BY
GRID_ID
) a

2
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/AdvancedBranchRankFormDTO.java
View File

@ -24,7 +24,7 @@ public class AdvancedBranchRankFormDTO implements Serializable {
@Min(value = 1, message = "查询条数必须大于0", groups = {AdvancedBranchRankFormDTO.AddUserInternalGroup.class })
private Integer topNum;
/**
* 月份Id
* 月份Id 没有月份传参时查询的是上一个月的数据
* */
private String monthId;

5
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/PartyPointRankFormDTO.java
View File

@ -31,5 +31,10 @@ public class PartyPointRankFormDTO implements Serializable {
private Integer topNum;
public interface AddUserInternalGroup {}
/**
* 月份Id 没有月份传参时查询的是上一个月的数据
* */
private String monthId;
}

5
epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/UserPointRankFormDTO.java
View File

@ -31,5 +31,10 @@ public class UserPointRankFormDTO implements Serializable {
private Integer topNum;
public interface AddUserInternalGroup {}
/**
* 月份Id 没有月份传参时查询的是上一个月的数据
* */
private String monthId;
}

4
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java
View File

@ -380,7 +380,9 @@ public class IndexServiceImpl implements IndexService {
public List<IndexAdvanceBranchRankResultDTO> advancedBranchRank(AdvancedBranchRankFormDTO formDTO) {
//根据当前所选组织，查询screen_index_data_monthly中类型为网格的按照总指数倒序，关联screen_org_rank_data表取其他数据
//1.级联查询组织下所有网格的先进支部排行数据，按总指数降序
formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
if (StringUtils.isBlank(formDTO.getMonthId())) {
formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
}
List<IndexAdvanceBranchRankResultDTO> list = screenIndexDataMonthlyDao.selectRankList(formDTO);
//2.遍历数据，小数保留一位小数，百分数添加百分号
NumberFormat nf = NumberFormat.getPercentInstance();

Write Preview
Loading…
Cancel
Save