diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java index da023e6c0b..f91ef35e09 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/dto/result/screen/CategoryAnalysisResultDTO.java @@ -23,4 +23,14 @@ public class CategoryAnalysisResultDTO implements Serializable { * 项目总数 */ private Integer projectTotal; + + /** + * 数据更新至 + */ + private String dateId; + + /** + * 分类编码 + */ + private String categoryCode; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDetailFormDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDetailFormDTO.java index be3585067d..d9d7062a1a 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDetailFormDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/form/ScreenProjectDetailFormDTO.java @@ -16,4 +16,7 @@ public class ScreenProjectDetailFormDTO implements Serializable { @NotBlank(message = "projectId不能为空") private String projectId; + + @NotBlank(message = "customerId不能为空") + private String customerId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java index 216214d05c..48c80b86dc 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/AdvanceBranchRankResultDTO.java @@ -55,4 +55,6 @@ public class AdvanceBranchRankResultDTO implements Serializable { */ private String parentAgencyName; + private Integer sort; + private String orgId; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java index 7bec0ea542..3319d73fd1 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataResultDTO.java @@ -56,6 +56,7 @@ public class OrgRankDataResultDTO implements Serializable { */ private String parentAgencyName; + private String orgId; /** * 数据所属月份 */ diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java index 246b374752..af9d6caf5e 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/SubAgencyIndexRankResultDTO.java @@ -37,4 +37,8 @@ public class SubAgencyIndexRankResultDTO implements Serializable { * 服务能力 */ private Double serviceAbility = 0.0; + + private String orgId; + private String orgType; + private String areaCode; } diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/CustomerProjectCategoryDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/CustomerProjectCategoryDTO.java new file mode 100644 index 0000000000..2487eaee67 --- /dev/null +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/project/CustomerProjectCategoryDTO.java @@ -0,0 +1,29 @@ +package com.epmet.project; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 描述一下 + * + * @author yinzuomei@elink-cn.com + * @date 2021/5/12 11:19 + */ +@Data +public class CustomerProjectCategoryDTO implements Serializable { + + /** + * 客户自己的分类编码 + */ + private String categoryCode; + + /** + * 客户自己的分类名称 + */ + private String categoryName; + /** + * 分类等级：1、2....；产品只有2级分类 + */ + private Integer level; +} diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java index 87547a1777..e63eb501f8 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/ScreenProjectController.java @@ -74,7 +74,9 @@ public class ScreenProjectController { * @Date 2021/2/24 16:10 */ @PostMapping("projectdetailv2") - public Result projectDetail(@RequestBody ScreenProjectDetailFormDTO formDTO){ + public Result projectDetail(@RequestHeader("CustomerId") String customerId,@RequestBody ScreenProjectDetailFormDTO formDTO){ + formDTO.setCustomerId(customerId); + ValidatorUtils.validateEntity(formDTO); return screenProjectService.projectDistributionDetail(formDTO); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java index 498f57309c..a0992f8d97 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenCustomerAgencyDao.java @@ -150,6 +150,14 @@ public interface ScreenCustomerAgencyDao { **/ List selectGridList(@Param("areaCode") String areaCode,@Param("agencyId") String agencyId); + /** + * @return java.util.List + * @param areaCode + * @param agencyId + * @author yinzuomei + * @description 下一级组织+直属网格 + * @Date 2021/5/10 14:02 + **/ List getNextAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId); List selectSubAgencyIds(@Param("areaCode")String areaCode,@Param("agencyId")String agencyId); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java index 3064505cf6..9e203ee3e4 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectCategoryOrgDailyDao.java @@ -18,6 +18,7 @@ package com.epmet.datareport.dao.evaluationindex.screen; import com.epmet.dto.result.screen.CategoryAnalysisResultDTO; +import com.epmet.project.CustomerProjectCategoryDTO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -39,4 +40,6 @@ public interface ScreenProjectCategoryOrgDailyDao { * @return java.util.List */ List selectCategoryAnalysis(@Param("agencyId") String agencyId,@Param("customerId")String customerId); + + CustomerProjectCategoryDTO selectProjectCategory(@Param("categoryCode")String categoryCode, @Param("customerId")String customerId, @Param("subCustomerIds")List subCustomerIds); } \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java index 727c52298a..061d0b81f1 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenProjectDataDao.java @@ -19,9 +19,13 @@ public interface ScreenProjectDataDao { List projectDistributionDetail(@Param("projectId") String projectId); - List selectProjectImgs(@Param("projectId") String projectId); + List selectProjectImgs(@Param("projectId") String projectId, + @Param("customerId") String customerId); - List selectProjectProcess(@Param("projectId") String projectId); + List selectProjectProcess(@Param("projectId") String projectId, + @Param("customerId") String customerId); - List selectProjectProcessAttachments(@Param("processId") String processId); + List selectProjectProcessAttachments(@Param("processId") String processId, + @Param("projectId") String projectId, + @Param("customerId") String customerId); } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java index bf3f8dbdcc..535362f3ea 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java @@ -303,7 +303,7 @@ public class AgencyServiceImpl implements AgencyService { * @param agencyId * @return java.util.List * @author yinzuomei - * @description 获取当前组织的下级组织集合 + * @description 获取当前组织的下级组织集合:下一级组织+直属网格 * @Date 2021/2/25 16:52 **/ @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java index 333c129f87..54b0b797be 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/GrassrootsPartyDevServiceImpl.java @@ -67,6 +67,7 @@ public class GrassrootsPartyDevServiceImpl implements GrassrootsPartyDevService public PartymemberPercentResultDTO partymemberBaseInfo(ParymemberFormDTO param) { if(StringUtils.isNotBlank(param.getAreaCode())){ logger.info(String.format("党员基本情况-饼状图概况按照areaCode查询：%s",param.getAreaCode())); + //下一级组织+直属网格 List ids=screenCustomerAgencyService.getNextAgencyIds(param.getAreaCode(),param.getAgencyId()); if(org.apache.commons.collections4.CollectionUtils.isNotEmpty(ids)){ PartymemberPercentResultDTO result = screenUserTotalDataDao.selectAgencyPartymemberPercentByIds(ids); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 7b873568f9..12c470cd25 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -404,6 +404,7 @@ public class IndexServiceImpl implements IndexService { List streetList = screenIndexDataMonthlyDao.selectSubStreetByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum()); // 小数四舍五入 streetList.forEach(indexRank -> { + indexRank.setOrgType("street"); indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility())); indexRank.setGovernAbility(getRound(indexRank.getGovernAbility())); indexRank.setServiceAbility(getRound(indexRank.getServiceAbility())); @@ -414,6 +415,7 @@ public class IndexServiceImpl implements IndexService { List gridList = screenIndexDataMonthlyDao.selectSubGridByAreaCode(formDTO.getCustomerId(),yearId,formDTO.getAreaCode(),formDTO.getTopNum()); // 小数四舍五入 gridList.forEach(indexRank -> { + indexRank.setOrgType("grid"); indexRank.setPartyDevAbility(getRound(indexRank.getPartyDevAbility())); indexRank.setGovernAbility(getRound(indexRank.getGovernAbility())); indexRank.setServiceAbility(getRound(indexRank.getServiceAbility())); diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java index bfb5534f01..49e4aadd05 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/PartyMemberLeadServiceImpl.java @@ -120,11 +120,17 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true) @Override public ContactMassLineChartResultDTO contactMassLineChart(ContactMassLineChartFormDTO contactMassLineChartFormDTO) { + ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO(); List subAgencyIdorGridIdList=screenCustomerAgencyService.getNextAgencyIds(contactMassLineChartFormDTO.getAreaCode(),contactMassLineChartFormDTO.getAgencyId()); log.info("当前组织的下级id:"+JSON.toJSONString(subAgencyIdorGridIdList)); - - ContactMassLineChartResultDTO result = new ContactMassLineChartResultDTO(); + if(CollectionUtils.isEmpty(subAgencyIdorGridIdList)){ + //如果没有下级组织或者直属网格 + result.setXAxis(new ArrayList<>()); + result.setGroupMemberData(new ArrayList<>()); + result.setGroupData(new ArrayList<>()); + return result; + } // List contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChart(contactMassLineChartFormDTO.getAgencyId()); //多客户版修改如下： List contactMassLineChartResults = screenPartyLinkMassesDataDao.selectContactMassLineChartByAgencyIds(subAgencyIdorGridIdList); @@ -277,12 +283,16 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { gridData = screenOrgRankDataDao.selectGridDataMonthlyAreaCode(monthId,param.getAreaCode()); } if(null == gridData || gridData.isEmpty()) return result; - gridData.forEach( data -> { + int num=1; + for(OrgRankDataResultDTO data:gridData){ AdvanceBranchRankResultDTO o = ConvertUtils.sourceToTarget(data,AdvanceBranchRankResultDTO.class); o.setClosedProjectRatio(convertPercentStr(data.getClosedProjectRatio())); o.setSatisfactionRatio(convertPercentStr(data.getSatisfactionRatio())); + o.setSort(num); + o.setOrgId(data.getOrgId()); + num++; result.add(o); - }); + }; }else{ List gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId); @@ -294,12 +304,16 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService { gridData = screenOrgRankDataDao.selectGridDataMonthly(param.getAgencyId(),monthId); } if(null == gridData || gridData.isEmpty()) return result; - gridData.forEach( data -> { + int num=1; + for(OrgRankDataResultDTO data:gridData){ AdvanceBranchRankResultDTO o = ConvertUtils.sourceToTarget(data,AdvanceBranchRankResultDTO.class); o.setClosedProjectRatio(convertPercentStr(data.getClosedProjectRatio())); o.setSatisfactionRatio(convertPercentStr(data.getSatisfactionRatio())); + o.setSort(num); + o.setOrgId(data.getOrgId()); + num++; result.add(o); - }); + }; } return result; } diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java index bed88ec3d4..c2728396d0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/ScreenProjectServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.datareport.service.evaluationindex.screen.impl; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.DataSourceConstant; import com.epmet.datareport.dao.evaluationindex.screen.ScreenEventDataDao; @@ -17,10 +18,15 @@ import com.epmet.evaluationindex.screen.dto.form.ScreenProjectDistributionFormDT import com.epmet.evaluationindex.screen.dto.result.ProjectDetailResultDTO; import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDetailResultDTO; import com.epmet.evaluationindex.screen.dto.result.ScreenProjectDistributionResultDTO; +import com.epmet.feign.OperCrmOpenFeignClient; +import com.epmet.project.CustomerProjectCategoryDTO; +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 java.util.ArrayList; import java.util.List; /** @@ -29,6 +35,8 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/8/18 10:23 */ + +@Slf4j @Service @DataSource(DataSourceConstant.EVALUATION_INDEX) public class ScreenProjectServiceImpl implements ScreenProjectService { @@ -42,6 +50,8 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { @Autowired private ScreenProjectCategoryOrgDailyDao screenProjectCategoryOrgDailyDao; + @Autowired + private OperCrmOpenFeignClient operCrmOpenFeignClient; /** * @Description 3、项目详情 @@ -74,14 +84,15 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { // 1：红色：为刚提交未做任何响应处理未结案的项目； // 2：黄色: 至少做过一次响应处理答复但未结案的项目； // 3：绿色：已经结案的项目。 - List areaIds = null; + List orgIds = null; if (StringUtils.isNotBlank(formDTO.getAreaCode())){ - areaIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode()); + //所有组织+网格 + orgIds = screenProjectDataDao.selectIdsByAreaCode(formDTO.getAreaCode()); } if (formDTO.getPageSize() == null){ formDTO.setPageSize(NumConstant.TWO_HUNDRED); } - List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),areaIds,formDTO.getLevel(),formDTO.getPageSize()); + List resultDTOS = screenProjectDataDao.projectDistribution(formDTO.getAgencyId(),orgIds,formDTO.getLevel(),formDTO.getPageSize()); return resultDTOS; } @@ -90,13 +101,14 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { List resultDTOS = screenProjectDataDao.projectDistributionDetail(formDTO.getProjectId()); resultDTOS.forEach(item -> { //项目图片 - List imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId()); + List imgList = screenProjectDataDao.selectProjectImgs(formDTO.getProjectId(),item.getCustomerId()); item.setImgList(imgList); //项目处理流程 - List processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId()); + List processDTOS = screenProjectDataDao.selectProjectProcess(formDTO.getProjectId(),item.getCustomerId()); //流程附件 processDTOS.forEach(processDTO -> { - List attachmentDTOS = screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId()); + List attachmentDTOS = + screenProjectDataDao.selectProjectProcessAttachments(processDTO.getProcessId(),formDTO.getProjectId(),item.getCustomerId()); processDTO.setAttachments(attachmentDTOS); }); item.setProcessList(processDTOS); @@ -116,6 +128,25 @@ public class ScreenProjectServiceImpl implements ScreenProjectService { @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true) @Override public List categoryAnalysis(String customerId, CategoryAnalysisFormDTO formDTO) { - return screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(),customerId); + List resultDTOList = screenProjectCategoryOrgDailyDao.selectCategoryAnalysis(formDTO.getAgencyId(), customerId); + List resultList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(resultDTOList)) { + Result> crmRes = operCrmOpenFeignClient.getAllSubCustomerIds(customerId); + List subCustomerIds = new ArrayList<>(); + if (crmRes.success() && !CollectionUtils.isEmpty(crmRes.getData())) { + subCustomerIds = crmRes.getData(); + } + for (CategoryAnalysisResultDTO dto : resultDTOList) { + CustomerProjectCategoryDTO projectCategoryDTO = screenProjectCategoryOrgDailyDao.selectProjectCategory(dto.getCategoryCode(), customerId, subCustomerIds); + if (null == projectCategoryDTO || StringUtils.isBlank(projectCategoryDTO.getCategoryName())) { + log.warn(String.format("查询分类名称失败,当前客户：%s, categoryCode:%s", dto.getCategoryCode(), customerId)); + continue; + } + CategoryAnalysisResultDTO resultDto = ConvertUtils.sourceToTarget(dto, CategoryAnalysisResultDTO.class); + resultDto.setCategoryName(projectCategoryDTO.getCategoryName()); + resultList.add(resultDto); + } + } + return resultList; } } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml index fba3b96602..328bb2f753 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml @@ -272,6 +272,7 @@ and grid.PARENT_AGENCY_ID=#{agencyId} + - SELECT D.CATEGORY_NAME AS categoryName, - M.PROJECT_TOTAL AS projectTotal + SELECT '' AS categoryName, + M.PROJECT_TOTAL AS projectTotal, + m.DATE_ID as dateId, + m.CATEGORY_CODE as categoryCode FROM screen_project_category_org_daily m - left join customer_project_category_dict d - on(m.CATEGORY_CODE=D.CATEGORY_CODE - AND D.DEL_FLAG='0' - and d.CUSTOMER_ID=#{customerId}) WHERE M.DEL_FLAG = '0' - AND M.ORG_ID = #{agencyId} - AND M.DATE_ID = ( - select - date_id - from - screen_project_category_org_daily - where - del_flag = '0' - and ORG_ID = #{agencyId} - and CUSTOMER_ID=#{customerId} - order by - date_id desc, - created_time desc - limit 1 - ) - ORDER BY M.PROJECT_TOTAL desc,D.CATEGORY_NAME asc - limit 20 + and m.level='1' + AND M.ORG_ID = #{agencyId} + and M.CUSTOMER_ID=#{customerId} + AND M.DATE_ID = ( + select + date_id + from + screen_project_category_org_daily + where + del_flag = '0' + and ORG_ID = #{agencyId} + and CUSTOMER_ID=#{customerId} + order by + date_id desc, + created_time desc + limit 1 + ) + ORDER BY M.PROJECT_TOTAL desc + + + + \ No newline at end of file diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index f6c6f2b20e..2f173078a0 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -77,6 +77,7 @@ select PROJECT_IMG_URL from screen_project_img_data where del_flag = '0' and project_id = #{projectId} + and CUSTOMER_ID= #{customerId} order by sort asc diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java index 65f54cbefc..28532046fb 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java @@ -40,6 +40,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.util.StringUtils; import java.math.BigDecimal; import java.util.ArrayList; @@ -132,6 +133,9 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService { @Override @Transactional(rollbackFor = Exception.class) public void insertPartyBranchData(PartyBranchDataListFormDTO formDTO, String customerId) { + if (StringUtils.isEmpty(formDTO.getMonthId()) || formDTO.getMonthId().length() != NumConstant.SIX) { + throw new RenException("monthId格式应为: yyyyMM,当前传入:"+formDTO.getMonthId()); + } if (formDTO.getIsFirst()) { int deleteNum; do { @@ -147,6 +151,9 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService { @Override @Transactional(rollbackFor = Exception.class) public void insertOrgRankData(OrgRankDataListFormDTO formDTO, String customerId) { + if (StringUtils.isEmpty(formDTO.getMonthId()) || formDTO.getMonthId().length() != NumConstant.SIX) { + throw new RenException("monthId格式应为: yyyyMM,当前传入:"+formDTO.getMonthId()); + } if (formDTO.getIsFirst()) { int deleteNum; do { @@ -162,6 +169,9 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService { @Override @Transactional(rollbackFor = Exception.class) public void insertGovernRankData(GovernRankDataListFormDTO formDTO, String customerId) { + if (StringUtils.isEmpty(formDTO.getMonthId()) || formDTO.getMonthId().length() != NumConstant.SIX) { + throw new RenException("monthId格式应为: yyyyMM,当前传入:"+formDTO.getMonthId()); + } if (formDTO.getIsFirst()) { int deleteNum; do { @@ -250,6 +260,9 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService { @Override @Transactional(rollbackFor = Exception.class) public void insertIndexDataMonthly(IndexDataListMonthlyFormDTO formDTO, String customerId) { + if (StringUtils.isEmpty(formDTO.getMonthId()) || formDTO.getMonthId().length() != NumConstant.SIX) { + throw new RenException("monthId格式应为: yyyyMM,当前传入:"+formDTO.getMonthId()); + } if (formDTO.getIsFirst()) { int deleteNum; do { @@ -345,6 +358,9 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService { @Override @Transactional(rollbackFor = Exception.class) public void insertUserJoin(UserJoinListFormDTO formDTO, String customerId) { + if (StringUtils.isEmpty(formDTO.getMonthId()) || formDTO.getMonthId().length() != NumConstant.SIX) { + throw new RenException("monthId格式应为: yyyyMM,当前传入:"+formDTO.getMonthId()); + } if (formDTO.getIsFirst()) { int deleteNum; do { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index bdc8814ff4..f798c8b354 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -58,6 +58,7 @@ public interface CustomerAgencyDao extends BaseDao { * @Description 组织首页-下级机关列表 **/ List selectSubAgencyById(@Param("pId") String pId, @Param("agencyNum") Integer agencyNum); + List selectSubAgencyByAgencyId(@Param("pId") String pId); /** * @param pId diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index e83b78ba77..287dfef613 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -287,7 +287,7 @@ public class AgencyServiceImpl implements AgencyService { public Result subAgencyList(SubAgencyFormDTO formDTO) { SubAgencyResultDTO subAgencyResultDTO = new SubAgencyResultDTO(); //1:根据当前机关Id查询直属下一级机关列表，只返回前十条 - List agencyList = customerAgencyDao.selectSubAgencyById(formDTO.getAgencyId(),formDTO.getAgencyNum()); + List agencyList = customerAgencyDao.selectSubAgencyByAgencyId(formDTO.getAgencyId()); if (null == agencyList || agencyList.size() < NumConstant.ONE) { subAgencyResultDTO.setAgencyList(new ArrayList()); subAgencyResultDTO.setSubAgencyCount(NumConstant.ZERO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index ea6f94a1e8..f7dee28823 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -70,6 +70,16 @@ ORDER BY created_time DESC LIMIT #{agencyNum} + SELECT - COUNT( - DISTINCT - CUSTOMER_USER_ID - ) - FROM + COUNT( DISTINCT member.CUSTOMER_USER_ID ) + FROM RESI_GROUP groupp INNER JOIN RESI_GROUP_MEMBER member ON member.RESI_GROUP_ID = groupp.ID AND member.DEL_FLAG = '0' AND (member.STATUS = 'approved' OR member.STATUS = 'silent') WHERE groupp.DEL_FLAG = '0' - AND - groupp.GRID_ID = #{gridId} - AND - groupp.STATE = 'approved' - + AND groupp.GRID_ID = #{gridId} + AND groupp.STATE = 'approved'