admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

包头主要工程量完成情况详情表管理bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-11-01 19:36:03 +08:00
parent 2a717a07bd
commit 17cff577c0
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java
View File

@ -23,7 +23,6 @@ import com.zhgd.xmgl.modules.baotou.mapper.MainProjectCompleteDetailMapper;
import com.zhgd.xmgl.modules.baotou.service.*; import com.zhgd.xmgl.modules.baotou.service.*;
import com.zhgd.xmgl.util.*; import com.zhgd.xmgl.util.*;
import org.apache.commons.collections.MapUtils; import org.apache.commons.collections.MapUtils;
import org.apache.poi.hssf.usermodel.*;
import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.usermodel.*;
import org.apache.poi.ss.util.CellRangeAddress; import org.apache.poi.ss.util.CellRangeAddress;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@ -198,7 +197,7 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl<MainProjec
BeanUtil.copyProperties(name, vo); BeanUtil.copyProperties(name, vo);
vo.setMainProjectCompleteNameId(vo.getId()); vo.setMainProjectCompleteNameId(vo.getId());
List<MainProjectCompleteDetailVo> filterAlls = alls.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId())).collect(Collectors.toList()); List<MainProjectCompleteDetailVo> filterAlls = alls.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId())).collect(Collectors.toList());
Optional<MainProjectCompleteDetailVo> op = filterAlls.stream().filter(o -> Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst(); Optional<MainProjectCompleteDetailVo> op = filterAlls.stream().filter(o -> period != null && Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst();
if (op.isPresent()) { if (op.isPresent()) {
BeanUtil.copyProperties(op.get(), vo); BeanUtil.copyProperties(op.get(), vo);
} else { } else {
@ -696,7 +695,7 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl<MainProjec
overviewList.add(map); overviewList.add(map);
} }
name.setOverviewList(overviewList); name.setOverviewList(overviewList);
BigDecimal totalDesignQuantity = totalList.stream().filter(o -> Objects.equals(unit.getId(), o.getDeviceUnitId())&&Objects.equals(name.getMainProjectCompleteNameId(), o.getMainProjectCompleteNameId())).map(MainProjectCompleteTotal::getTotalDesignQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal totalDesignQuantity = totalList.stream().filter(o -> Objects.equals(unit.getId(), o.getDeviceUnitId()) && Objects.equals(name.getMainProjectCompleteNameId(), o.getMainProjectCompleteNameId())).map(MainProjectCompleteTotal::getTotalDesignQuantity).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add);
BigDecimal cumulativeCompletedQuantity = nameDetails.stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add); BigDecimal cumulativeCompletedQuantity = nameDetails.stream().map(MainProjectCompleteDetail::getCompletedQuantityThisMonth).reduce(BigDecimal.ZERO, BigDecimal::add);
if (Objects.equals(name.getLevel(), 1)) { if (Objects.equals(name.getLevel(), 1)) {
mp.put("number", ++i); mp.put("number", ++i);