diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 4e7a09fd26..4a2b4821e2 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -1586,6 +1586,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); } + // 分类编码长度 Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length)); List list = pageInfo.getList(); @@ -1600,8 +1601,10 @@ public class IssueServiceImpl extends BaseServiceImpl imp if (!usersResult.success()){ throw new EpmetException("查询人员姓名失败..."); } + // 默认最多50 产品要求 Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal())); result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total); + // 赋值展示名字 list.forEach(l -> { l.setSort(no.getAndSet(no.get() + NumConstant.ONE)); usersResult.getData().forEach(u -> { @@ -1631,6 +1634,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); } + // 分类编码长度 Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); List result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId()); if(CollectionUtils.isEmpty(result)){ @@ -1647,7 +1651,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp */ @Override public List getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { - List result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); + List result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); if (CollectionUtils.isEmpty(result)){ return new ArrayList<>(); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 13b710ec7f..771dfd2d74 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2982,6 +2982,7 @@ public class ProjectServiceImpl extends BaseServiceImpl disposeTimeInterval(List categories, String date,List listResult){ + // 把一天分成6段 List intervalTimeList = getIntervalTimeList("00:00", "24:00", 240); List result = new ArrayList<>(); Map> groupByCode = categories.stream().collect(Collectors.groupingBy(ProjectCategoryByDateDTO::getCategoryCode));