|
|
@ -946,7 +946,6 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
|
projectInfo.setType("1"); |
|
|
|
ProjectInfoAuthSelect projectInfoAuthSelect = CommonUtils.setGetProjectInfoAuth(projectInfo); |
|
|
|
IPage<ProjectPageOV> pageSorted = projectinfoMapper.getProjectPageSorted(page, projectInfoAuthSelect, orderBy, orderDir); |
|
|
|
Map<String, String> superLeader = dictService.selectByDictType("superLeader").stream().collect(Collectors.toMap(x -> x.getValue(), x -> x.getLabel())); |
|
|
|
List<ProjectPageOV> records = pageSorted.getRecords(); |
|
|
|
List<ProjectPageResponse> newRecords = new ArrayList<>(); |
|
|
|
IPage<ProjectPageResponse> result = new Page<>(); |
|
|
@ -957,7 +956,6 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl<HuzhouProjectinfoM |
|
|
|
ProjectProgressOV progress = this.getProgress(projectIds); |
|
|
|
ProjectPageResponse build = new ProjectPageResponse(); |
|
|
|
BeanUtils.copyProperties(r, build); |
|
|
|
build.setSuperLeader(superLeader.get(r.getSuperLeader())); |
|
|
|
BigDecimal totalDecimal = BigDecimal.valueOf(r.getTotalMoney()); |
|
|
|
BigDecimal roundedTotalDecimal = totalDecimal.setScale(2, RoundingMode.HALF_UP); |
|
|
|
BigDecimal centralDecimal = BigDecimal.valueOf(r.getCentralMoney()); |
|
|
|