From 62c8530fbf44749c7fe709bf8897a791bc7f0ef4 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Tue, 16 Jul 2024 11:36:53 +0800
Subject: [PATCH] 项目进度上报逻辑优化和待办添加区域条件筛选v0.8
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectInfoServiceImpl.java | 182 +++++++++++++++++++++------------------------
1 files changed, 84 insertions(+), 98 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 75472ee..77d3496 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
@@ -1,17 +1,17 @@
package cn.gistack.sm.sg.service.impl;
-import cn.gistack.sm.sg.DO.SgDeviceDO;
-import cn.gistack.sm.sg.DO.SgGxDO;
-import cn.gistack.sm.sg.DO.SgGxStepDO;
-import cn.gistack.sm.sg.DO.SgProjectInfoDO;
+import cn.gistack.sm.sg.DO.*;
import cn.gistack.sm.sg.DTO.ProjectSearchDTO;
import cn.gistack.sm.sg.VO.*;
import cn.gistack.sm.sg.excel.ProjectExcel;
+import cn.gistack.sm.sg.mapper.SgGxStepMapper;
+import cn.gistack.sm.sg.mapper.SgProgressReportMapper;
import cn.gistack.sm.sg.mapper.SgProjectInfoMapper;
import cn.gistack.sm.sg.service.SgProjectInfoService;
import cn.gistack.sm.sjztmd.entity.AttAdBase;
import cn.gistack.sm.sjztmd.service.IAttAdBaseService;
import cn.hutool.core.lang.copier.Copier;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
@@ -44,6 +44,13 @@
private SgProjectInfoMapper sgProjectInfoMapper;
@Autowired
private IAttAdBaseService iAttAdBaseService;
+
+ @Autowired
+ private SgProgressReportMapper sgProgressReportMapper;
+
+ @Autowired
+ private SgGxStepMapper sgGxStepMapper;
+
@Override
public IPage<SgProjectInfoDO> queryPageList(IPage<SgProjectInfoDO> page, ProjectSearchDTO searchDTO) {
List<SgProjectInfoDO> sgProjectInfoDOS = baseMapper.queryPageList(page,searchDTO);
@@ -129,6 +136,11 @@
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();
@@ -208,127 +220,82 @@
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public List<SgStatisProVO> getsgStatisticsList(String code) {
AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(code);
- List<SgStatisProVO> sgStatisProVOS;
- List<BigDecimal> bigDecimals = new ArrayList<>();
+ List<SgStatisProVO> sgStatisProVOS;
- ProjectSearchDTO projectSearchDTO = new ProjectSearchDTO();
//片区
- if (ywxtAdDetail == null){
+ if (ywxtAdDetail == null) {
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsZero(code);
- sgStatisProVOS.forEach(s->{
- if (s.getCommenceNum() == 0) {
- s.setProjectProgress("0%");
- s.setPcode("420000000000");
- s.setPname("湖北省");
- s.setAdGrad("2");
- }else {
- List<String> ids = sgProjectInfoMapper.getProjectId("2",s.getCode());
-
- ids.forEach(id->{
- projectSearchDTO.setProjectId(id);
- List<SgProjectInfoVO> list =sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
- getProjectProgress(list).forEach(ss->{
- bigDecimals.add(ss.getProjectProgressNum());
- });
- });
- BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
- String bigDecimalPercent1 = getBigDecimalPercent(reduce.divide(BigDecimal.valueOf(s.getProjectSum()), 2, RoundingMode.HALF_UP));
- s.setProjectProgress(s.getCommenceNum()==0?"0%": bigDecimalPercent1);
- s.setPcode("420000000000");
- s.setPname("湖北省");
- s.setAdGrad("2");
-
- }});
- return sgStatisProVOS;
- }
- //默认
- else if (ywxtAdDetail.getAdGrad().equals("1")) {
+ String getname = sgProjectInfoMapper.getname(code);
+ updateProjectProgress(sgStatisProVOS, code, getname, "2");
+ } else if (ywxtAdDetail.getAdGrad().equals("1")) {//默认
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsOne(code);
- sgStatisProVOS.forEach(s->{
- if (s.getCommenceNum() == 0) {
- s.setProjectProgress("0%");
- s.setPcode(ywxtAdDetail.getPAdCode());
- s.setPname(ywxtAdDetail.getPAdName());
- s.setAdGrad("0");
- }else {
- List<String> ids = sgProjectInfoMapper.getProjectId(ywxtAdDetail.getAdGrad(),s.getCode());
-
- ids.forEach(id->{
- projectSearchDTO.setProjectId(id);
- List<SgProjectInfoVO> list =sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
- getProjectProgress(list).forEach(ss->{
- bigDecimals.add(ss.getProjectProgressNum());
- });
- });
- BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
- String bigDecimalPercent1 = getBigDecimalPercent(reduce.divide(BigDecimal.valueOf(s.getProjectSum()), 2, RoundingMode.HALF_UP));
- s.setProjectProgress(s.getCommenceNum()==0?"0%": bigDecimalPercent1);
- s.setPcode(ywxtAdDetail.getPAdCode());
- s.setPname(ywxtAdDetail.getPAdName());
- s.setAdGrad("0");
-
- }});
- return sgStatisProVOS;
- }
- //区县
+ updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getPAdCode(), ywxtAdDetail.getPAdName(), "0");
+ } else {//区县
sgStatisProVOS = sgProjectInfoMapper.getsgStatisticsList(code);
- sgStatisProVOS.forEach(s->{
+ updateProjectProgress(sgStatisProVOS, ywxtAdDetail.getAdCode(), ywxtAdDetail.getAdName(), "3");
+ }
+ return sgStatisProVOS;
+ }
+
+ private void updateProjectProgress(List<SgStatisProVO> sgStatisProVOS, String pcode, String pname, String adGrad) {
+ ProjectSearchDTO projectSearchDTO = new ProjectSearchDTO();
+ for (SgStatisProVO s : sgStatisProVOS) {
if (s.getCommenceNum() == 0) {
s.setProjectProgress("0%");
- s.setPcode(ywxtAdDetail.getAdCode());
- s.setPname(ywxtAdDetail.getAdName());
- s.setAdGrad("3");
- }else {
- List<String> ids = sgProjectInfoMapper.getProjectId("3",s.getCode());
+ s.setPcode(pcode);
+ s.setPname(pname);
+ s.setAdGrad(adGrad);
+ } else {
+ List<String> ids = sgProjectInfoMapper.getProjectId(adGrad, s.getCode());
+ List<BigDecimal> bigDecimals = new ArrayList<>();
- ids.forEach(id->{
+ for (String id : ids) {
projectSearchDTO.setProjectId(id);
- List<SgProjectInfoVO> list =sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
- getProjectProgress(list).forEach(ss->{
- bigDecimals.add(ss.getProjectProgressNum());
- });
- });
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
+ getProjectProgress(list).forEach(ss -> bigDecimals.add(ss.getProjectProgressNum()));
+ }
+
BigDecimal reduce = bigDecimals.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
String bigDecimalPercent1 = getBigDecimalPercent(reduce.divide(BigDecimal.valueOf(s.getProjectSum()), 2, RoundingMode.HALF_UP));
- s.setProjectProgress(s.getCommenceNum()==0?"0%": bigDecimalPercent1);
- s.setPcode(ywxtAdDetail.getAdCode());
- s.setPname(ywxtAdDetail.getAdName());
- s.setAdGrad("3");
- }});
- return sgStatisProVOS;
-
+ s.setProjectProgress(s.getCommenceNum() == 0? "0%" : bigDecimalPercent1);
+ s.setPcode(pcode);
+ s.setPname(pname);
+ s.setAdGrad(adGrad);
+ }
+ }
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public List<SgStatistccVO> getsgStatisticscc(String code) {
AttAdBase ywxtAdDetail = iAttAdBaseService.getYwxtAdDetail(code);
- List<String> ids = sgProjectInfoMapper.getProjectId(ywxtAdDetail==null?"0":ywxtAdDetail.getAdGrad(),code);
- Map<String,Integer> mun = new HashMap<>();
- List<SgStatistccVO> sgdevices = sgProjectInfoMapper.getSgdevices(code,ywxtAdDetail==null?"0":ywxtAdDetail.getAdGrad());
- sgdevices.forEach(sgStatistccVO -> {
- mun.put(sgStatistccVO.getTypeName(),sgStatistccVO.getDeviceNum());
- }
- );
- Map<String,BigDecimal> bigDecimals = new HashMap<>();
+ List<String> ids = sgProjectInfoMapper.getProjectId(ywxtAdDetail == null ? "0" : ywxtAdDetail.getAdGrad(), code);
+ Map<String, Integer> mun = new HashMap<>();
+ List<SgStatistccVO> sgdevices = sgProjectInfoMapper.getSgdevices(code, ywxtAdDetail == null ? "0" : ywxtAdDetail.getAdGrad());
+ sgdevices.forEach(sgStatistccVO -> {
+ mun.put(sgStatistccVO.getTypeName(), sgStatistccVO.getDeviceNum());
+ }
+ );
+ Map<String, BigDecimal> bigDecimals = new HashMap<>();
ProjectSearchDTO projectSearchDTO = new ProjectSearchDTO();
- ids.forEach(id->{
+ ids.forEach(id -> {
projectSearchDTO.setProjectId(id);
- List<SgProjectInfoVO> list =sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
+ List<SgProjectInfoVO> list = sgProjectInfoMapper.queryStepByProject(projectSearchDTO);
List<SgProjectInfoDO> projectProgress = getProjectProgress(list);
- projectProgress.forEach(p->{
+ projectProgress.forEach(p -> {
List<SgTypeVO> sgGxDOS = p.getSgGxDOS();
sgGxDOS.forEach(sgTypeVO -> {
String typeProgress = sgTypeVO.getTypeProgress().replace("%", "");
- BigDecimal percentageBigDecimal = new BigDecimal(typeProgress).divide(new BigDecimal("100"),2, RoundingMode.HALF_UP);
- bigDecimals.merge(sgTypeVO.getTypeName(),percentageBigDecimal,BigDecimal::add);
+ BigDecimal percentageBigDecimal = new BigDecimal(typeProgress).divide(new BigDecimal("100"), 2, RoundingMode.HALF_UP);
+ bigDecimals.merge(sgTypeVO.getTypeName(), percentageBigDecimal, BigDecimal::add);
});
});
@@ -341,10 +308,10 @@
BigDecimal bigDecimal = bigDecimals.get(name);
Integer intValue = mun.get(name);
- BigDecimal result = bigDecimal.divide(new BigDecimal(intValue), 2, BigDecimal.ROUND_HALF_UP);
+ BigDecimal result = bigDecimal.divide(new BigDecimal(intValue), 2, RoundingMode.HALF_UP);
sgdevices.forEach(sgStatistccVO -> {
- if(sgStatistccVO.getTypeName().equals(name)){
+ if (sgStatistccVO.getTypeName().equals(name)) {
sgStatistccVO.setTypeProgress(getBigDecimalPercent(result));
}
});
@@ -389,4 +356,23 @@
}
+ // 处理查询和添加到列表的方法
+ private PreAcceVO handleQuery( int stepIdForNull, Long programId) {
+ QueryWrapper<SgProgressReportDO> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("gx_step_id", stepIdForNull)
+ .eq("profram_id", programId);
+ SgProgressReportDO sgProgressReportDO = sgProgressReportMapper.selectOne(queryWrapper);
+
+ PreAcceVO preAcceVO = new PreAcceVO();
+ if (sgProgressReportDO!= null) {
+ preAcceVO.setId(sgProgressReportDO.getId().toString());
+ preAcceVO.setName(sgProgressReportDO.getGxStepName());
+ preAcceVO.setStatus((long) sgProgressReportDO.getStatus());
+ } else {
+ preAcceVO.setName(sgGxStepMapper.selectById(stepIdForNull).getGxStepName());
+ }
+ return preAcceVO;
+
+ }
+
}
--
Gitblit v1.9.3