|
@@ -23,7 +23,6 @@ import javax.annotation.Resource;
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
import java.util.ArrayList;
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import java.util.List;
|
|
-import java.util.Objects;
|
|
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Collectors;
|
|
import java.util.stream.Stream;
|
|
import java.util.stream.Stream;
|
|
|
|
|
|
@@ -104,8 +103,12 @@ public class TBDingStatisticBySupplierServiceImpl extends ServiceImpl<TBDingStat
|
|
addHours = addHours.add(tbDingAdd.getAddHours());
|
|
addHours = addHours.add(tbDingAdd.getAddHours());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- tbDingStatisticBySupplier.setAddDays(addDays);
|
|
|
|
- tbDingStatisticBySupplier.setAddHours(addHours);
|
|
|
|
|
|
+ if (SystemConstant.effectBigDecimal(addDays)) {
|
|
|
|
+ tbDingStatisticBySupplier.setAddDays(addDays);
|
|
|
|
+ }
|
|
|
|
+ if (SystemConstant.effectBigDecimal(addHours)) {
|
|
|
|
+ tbDingStatisticBySupplier.setAddHours(addHours);
|
|
|
|
+ }
|
|
tbDingStatisticBySupplier.setWorkDays(tbDingStatisticBySupplier.getWorkDays().add(addDays));
|
|
tbDingStatisticBySupplier.setWorkDays(tbDingStatisticBySupplier.getWorkDays().add(addDays));
|
|
tbDingStatisticBySupplier.setWorkHours(workHours.add(addHours));
|
|
tbDingStatisticBySupplier.setWorkHours(workHours.add(addHours));
|
|
}
|
|
}
|