Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
fd650d2f3c
|
|
@ -822,6 +822,8 @@ public class SltAgreementInfoServiceImpl implements ISltAgreementInfoService {
|
||||||
List<SltAgreementInfo> sltReportedList = sltAgreementInfoMapper.getSltReportedList(bean);
|
List<SltAgreementInfo> sltReportedList = sltAgreementInfoMapper.getSltReportedList(bean);
|
||||||
if (sltReportedList != null) {
|
if (sltReportedList != null) {
|
||||||
sltReportedList.removeIf(Objects::isNull);
|
sltReportedList.removeIf(Objects::isNull);
|
||||||
|
// 去掉没有审核的or审核不通过的
|
||||||
|
sltReportedList.removeIf(obj -> Objects.isNull(obj.getSltStatus()) || !Objects.equals("2", obj.getSltStatus()));
|
||||||
sltReportedList.forEach(sltAgreementInfo -> {
|
sltReportedList.forEach(sltAgreementInfo -> {
|
||||||
if (sltAgreementInfo.getCosts() == null || sltAgreementInfo.getCosts().equals(BigDecimal.ZERO)) {
|
if (sltAgreementInfo.getCosts() == null || sltAgreementInfo.getCosts().equals(BigDecimal.ZERO)) {
|
||||||
sltAgreementInfo.setCosts(
|
sltAgreementInfo.setCosts(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue