|
@@ -439,7 +439,9 @@ public class FbsWorkingStatisticsController {
|
|
|
BigDecimal allHors = new BigDecimal("0");
|
|
|
BigDecimal allNum = new BigDecimal("0");
|
|
|
for (FbsWorkingStatistics o:list1){
|
|
|
- allHors = allHors.add(o.getWorkingHours());
|
|
|
+ if(o.getWorkingHours()!=null){
|
|
|
+ allHors = allHors.add(o.getWorkingHours());
|
|
|
+ }
|
|
|
if(StringUtils.isNotBlank(o.getQualifiedNumber())){
|
|
|
allNum = allNum.add(new BigDecimal(o.getQualifiedNumber()));
|
|
|
}
|