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<MainProjec
             BeanUtil.copyProperties(name, vo);
             vo.setMainProjectCompleteNameId(vo.getId());
             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()) {
                 BeanUtil.copyProperties(op.get(), vo);
             } else {
@@ -696,7 +695,7 @@ public class MainProjectCompleteDetailServiceImpl extends ServiceImpl<MainProjec
                 overviewList.add(map);
             }
             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);
             if (Objects.equals(name.getLevel(), 1)) {
                 mp.put("number", ++i);