1

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4145,7 +4145,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             double totalWorkingHours = targetPlanTotal.getTotalWorkingHours();
                             double totalWages = targetPlanTotal.getTotalWages();
                             //获当前分配日期下的所填报人员工时成本总和
-                            double workTimeSum = targetPlanTotal.getTotalFillTime();
+                            double workTimeSum = targetPlanTotal.getTotalFillTime()==null?0.0:targetPlanTotal.getTotalFillTime();
                             BigDecimal decimal = new BigDecimal(targetPlanTotal.getTotalProgress());
                             decimal = decimal.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                             BigDecimal costSum = new BigDecimal(targetPlanTotal.getTotalWages());
@@ -4191,7 +4191,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                             double totalWorkingHours = targetPlanTotal.getTotalWorkingHours();
                             double totalWages = targetPlanTotal.getTotalWages();
                             //获当前分配日期下的所填报人员工时成本总和
-                            double workTimeSum = targetPlanTotal.getTotalFillTime();
+                            double workTimeSum = targetPlanTotal.getTotalFillTime()==null?0.0:targetPlanTotal.getTotalFillTime();
                             BigDecimal decimal = new BigDecimal(targetPlanTotal.getTotalProgress());
                             decimal = decimal.divide(new BigDecimal(100), 2, RoundingMode.HALF_UP);
                             BigDecimal costSum = new BigDecimal(targetPlanTotal.getTotalWages());