From 8cb672af822d4a0ff4373d6ebaaf2657ed0e6b44 Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 09 Aug 2024 18:51:32 +0800
Subject: [PATCH] 湖北水库：新增项目、项目进度排序
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 61 +++++++++++++++++++++++-------
1 files changed, 46 insertions(+), 15 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
index 77d3496..be99689 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java
@@ -54,13 +54,13 @@
@Override
public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
- List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ /*List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
if (CollectionUtils.isNotEmpty(projectProgress)){
Map<Long, String> progressMap = projectProgress.stream().filter(s->s.getProjectProgress()!=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
sgProjectInfoDOS.forEach(s->{
s.setProjectProgress(progressMap.get(s.getId()));
});
- }
+ }*/
return page.setRecords(sgProjectInfoDOS);
}
@@ -71,8 +71,17 @@
*/
@Override
public List<SgProjectInfoDO> queryStepByProject(ProjectSearchDTO searchDTO) {
+ List<PreAcceVO> palist = new ArrayList<>();
List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject( searchDTO);
- return getProjectProgress(list);
+ palist.add(handleQuery(25, list.get(0).getId()));
+ palist.add(handleQuery(26, list.get(0).getId()));
+ List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
+ projectProgress.forEach(s->{
+ s.setPreAcce(palist);
+ });
+
+
+ return projectProgress;
}
/**
@@ -81,7 +90,7 @@
* @return
*/
@NotNull
- private List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) {
+ public List<SgProjectInfoDO> getProjectProgress(List<SgProjectInfoVO> list) {
//项目分组
Map<Long, List<SgProjectInfoVO>> projectMap = list.stream().collect(Collectors.groupingBy(SgProjectInfoVO::getId));
List<SgProjectInfoDO> result = new ArrayList<>();
@@ -113,7 +122,6 @@
SgDeviceDO sgDeviceDO = new SgDeviceDO();
sgDeviceDO.setId(dId);
sgDeviceDO.setDeviceName(deList.get(0).getDeviceName());
- sgDeviceDO.setStatus( deList.get(0).getDeviceStatus());
List<SgGxStepDO> stepDOS = deList.stream().filter(s->s.getReportStatus()==null || s.getReportStatus()!=4).map(s -> SgGxStepDO.builder().id(s.getStepId()).gxStepNum(s.getGxStepNum()).gxStepName(s.getGxStepName()).deviceId(s.getDId()).approvalStatus(s.getReportStatus()).build()).collect(Collectors.toList());
List<SgGxStepDO> stepOver = stepDOS.stream().filter(s -> s.getApprovalStatus() != null && s.getApprovalStatus() == 2).collect(Collectors.toList());
BigDecimal stepSize = BigDecimal.valueOf(stepDOS.size());
@@ -122,6 +130,7 @@
stepOverSize = BigDecimal.valueOf(stepOver.size());
}
BigDecimal divide = stepOverSize.divide(stepSize, 2, RoundingMode.HALF_UP);
+ sgDeviceDO.setStatus(divide.compareTo(new BigDecimal(1)) == 0?2:deList.get(0).getDeviceStatus());
sgDeviceDO.setProgress(divide.toString());
sgDeviceDO.setDeviceProgress(getBigDecimalPercent(divide));
sgDeviceDO.setStepDOList(stepDOS);
@@ -136,11 +145,6 @@
typeVO.setTypeProgress(getBigDecimalPercent(divideDevice));
sgGxDOS.add(typeVO);
}
-
- List<PreAcceVO> palist = new ArrayList<>();
- palist.add(handleQuery( 25, list.get(0).getId()));
- palist.add(handleQuery(26,list.get(0).getId()));
- sgProjectInfoDO.setPreAcce(palist);
BigDecimal allDeviceSize = BigDecimal.valueOf(allDevice.size());
if (!allDeviceSize.equals(BigDecimal.ZERO)){
double sum = allDevice.stream().mapToDouble(s -> Double.parseDouble(s.getProgress())).sum();
@@ -158,7 +162,13 @@
@Override
public List<SgProjectInfoVO> progressList(ProjectSearchDTO searchDTO) {
List<SgProjectInfoVO> list = new ArrayList<>();
- List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ List<SgProjectInfoDO> projectProgress = new ArrayList<>();
+ if(StringUtils.isNotBlank(searchDTO.getAdCode())){
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
+ }else {
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ }
+
if (CollectionUtils.isNotEmpty(projectProgress)){
projectProgress.forEach(s->{
SgProjectInfoVO sgProjectInfoVO = new SgProjectInfoVO();
@@ -181,10 +191,22 @@
*/
@Override
public IPage<SgProjectInfoVO> progressPage(IPage<SgProjectInfoVO> page, ProjectSearchDTO searchDTO) {
- List<SgProjectInfoVO> list = sgProjectInfoMapper.progressList(page, searchDTO);
+ List<SgProjectInfoVO> list = new ArrayList<>();
+ if(!searchDTO.getAdCode().isEmpty()){
+ list = sgProjectInfoMapper.progressList1(page, searchDTO);
+ }else {
+ list = sgProjectInfoMapper.progressList(page, searchDTO);
+ }
+
List<Long> ids = list.stream().map(SgProjectInfoVO::getId).collect(Collectors.toList());
searchDTO.setProjectIds(ids);
- List<SgProjectInfoDO> projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ List<SgProjectInfoDO> projectProgress = new ArrayList<>();
+ if(!searchDTO.getAdCode().isEmpty()){
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject1(searchDTO));
+ }else {
+ projectProgress = getProjectProgress(sgProjectInfoMapper.queryStepByProject(searchDTO));
+ }
+
if (CollectionUtils.isNotEmpty(projectProgress)){
Map<Long, String> progressMap = projectProgress.stream().filter(s->s!=null && s.getProjectProgress() !=null).collect(Collectors.toMap(SgProjectInfoDO::getId, SgProjectInfoDO::getProjectProgress));
list.forEach(s->{
@@ -229,7 +251,8 @@
//片区
if (ywxtAdDetail == null) {
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
- String getname = sgProjectInfoMapper.getname(code);
+// String getname = sgProjectInfoMapper.getname(code);
+ String getname = code;
updateProjectProgress(sgStatisProVOS, code, getname, "2");
} else if (ywxtAdDetail.getAdGrad().equals("1")) {//默认
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsOne(code);
@@ -368,8 +391,16 @@
preAcceVO.setId(sgProgressReportDO.getId().toString());
preAcceVO.setName(sgProgressReportDO.getGxStepName());
preAcceVO.setStatus((long) sgProgressReportDO.getStatus());
+ preAcceVO.setProgramId(programId);
+ preAcceVO.setGxDeviceId(sgProgressReportDO.getGxDeviceId());
+ preAcceVO.setGxStepId(sgProgressReportDO.getGxStepId());
} else {
- preAcceVO.setName(sgGxStepMapper.selectById(stepIdForNull).getGxStepName());
+ SgGxStepDO sgGxStepDO = sgGxStepMapper.selectById(stepIdForNull);
+ preAcceVO.setName(sgGxStepDO.getGxStepName());
+ preAcceVO.setProgramId(programId);
+ preAcceVO.setGxDeviceId(stepIdForNull != 25? (long)998:(long)999);
+ preAcceVO.setGxStepId(sgGxStepDO.getId());
+
}
return preAcceVO;
--
Gitblit v1.9.3