|
@ -1586,6 +1586,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp |
|
|
formDTO.setOrgId(staffInfo.getAgencyId()); |
|
|
formDTO.setOrgId(staffInfo.getAgencyId()); |
|
|
formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); |
|
|
formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); |
|
|
} |
|
|
} |
|
|
|
|
|
// 分类编码长度
|
|
|
Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); |
|
|
Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); |
|
|
PageInfo<ResiBuzzDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length)); |
|
|
PageInfo<ResiBuzzDTO> pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectIssueLimit50(formDTO.getOrgId(), formDTO.getOrgType(), formDTO.getStatus(),length)); |
|
|
List<ResiBuzzDTO> list = pageInfo.getList(); |
|
|
List<ResiBuzzDTO> list = pageInfo.getList(); |
|
@ -1600,8 +1601,10 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp |
|
|
if (!usersResult.success()){ |
|
|
if (!usersResult.success()){ |
|
|
throw new EpmetException("查询人员姓名失败..."); |
|
|
throw new EpmetException("查询人员姓名失败..."); |
|
|
} |
|
|
} |
|
|
|
|
|
// 默认最多50 产品要求
|
|
|
Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal())); |
|
|
Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal())); |
|
|
result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total); |
|
|
result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total); |
|
|
|
|
|
// 赋值展示名字
|
|
|
list.forEach(l -> { |
|
|
list.forEach(l -> { |
|
|
l.setSort(no.getAndSet(no.get() + NumConstant.ONE)); |
|
|
l.setSort(no.getAndSet(no.get() + NumConstant.ONE)); |
|
|
usersResult.getData().forEach(u -> { |
|
|
usersResult.getData().forEach(u -> { |
|
@ -1631,6 +1634,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp |
|
|
formDTO.setOrgId(staffInfo.getAgencyId()); |
|
|
formDTO.setOrgId(staffInfo.getAgencyId()); |
|
|
formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); |
|
|
formDTO.setOrgType(IssueConstant.ISSUE_AGENCY); |
|
|
} |
|
|
} |
|
|
|
|
|
// 分类编码长度
|
|
|
Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); |
|
|
Integer length = baseDao.selectOneLevelCategoryLength(tokenDto.getCustomerId()); |
|
|
List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId()); |
|
|
List<ResiBuzzLeftPieChartResultDTO> result = baseDao.resiBuzzLeftPieChart(formDTO.getOrgId(), formDTO.getOrgType(), length, tokenDto.getCustomerId()); |
|
|
if(CollectionUtils.isEmpty(result)){ |
|
|
if(CollectionUtils.isEmpty(result)){ |
|
@ -1647,7 +1651,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp |
|
|
*/ |
|
|
*/ |
|
|
@Override |
|
|
@Override |
|
|
public List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { |
|
|
public List<ProjectDistributionAnalysisRightDTO> getProjectCountByGrid(ProjectDistributionAnalysisFormDTO formDTO) { |
|
|
List<ProjectDistributionAnalysisRightDTO> result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); |
|
|
List<ProjectDistributionAnalysisRightDTO> result = baseDao.getProjectCountByGrid(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); |
|
|
if (CollectionUtils.isEmpty(result)){ |
|
|
if (CollectionUtils.isEmpty(result)){ |
|
|
return new ArrayList<>(); |
|
|
return new ArrayList<>(); |
|
|
} |
|
|
} |
|
|