From 17cff577c0e01bae5b7e7143ffdea4e18a142373 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 1 Nov 2024 19:36:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=85=E5=A4=B4=E4=B8=BB=E8=A6=81=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E9=87=8F=E5=AE=8C=E6=88=90=E6=83=85=E5=86=B5=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E8=A1=A8=E7=AE=A1=E7=90=86bug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/MainProjectCompleteDetailServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java index 392ec4211..a390bf88f 100644 --- a/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/baotou/service/impl/MainProjectCompleteDetailServiceImpl.java @@ -23,7 +23,6 @@ import com.zhgd.xmgl.modules.baotou.mapper.MainProjectCompleteDetailMapper; import com.zhgd.xmgl.modules.baotou.service.*; import com.zhgd.xmgl.util.*; import org.apache.commons.collections.MapUtils; -import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.*; import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.beans.factory.annotation.Autowired; @@ -198,7 +197,7 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl filterAlls = alls.stream().filter(o -> Objects.equals(o.getMainProjectCompleteNameId(), vo.getMainProjectCompleteNameId())).collect(Collectors.toList()); - Optional op = filterAlls.stream().filter(o -> Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst(); + Optional op = filterAlls.stream().filter(o -> period != null && Objects.equals(o.getMainProjectCompletePeriodId(), period.getId())).findFirst(); if (op.isPresent()) { BeanUtil.copyProperties(op.get(), vo); } else { @@ -696,7 +695,7 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl 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); if (Objects.equals(name.getLevel(), 1)) { mp.put("number", ++i);