|
@@ -333,7 +333,7 @@ public class BizCollectionController extends BaseController {
|
|
collectionCondition.setStatus((byte)1);
|
|
collectionCondition.setStatus((byte)1);
|
|
List<BizCollection> collections = collectionService.getListByBean(collectionCondition);
|
|
List<BizCollection> collections = collectionService.getListByBean(collectionCondition);
|
|
collection.setNonpayment(archiveInput.getTrueAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())).compareTo(BigDecimal.ZERO) > 0);
|
|
collection.setNonpayment(archiveInput.getTrueAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())).compareTo(BigDecimal.ZERO) > 0);
|
|
- collection.setNonpaymentAmount(archiveInput.getTrueAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getAmount().doubleValue()).sum())));
|
|
|
|
|
|
+ collection.setNonpaymentAmount(archiveInput.getTrueAmount().subtract(BigDecimal.valueOf(collections.stream().mapToDouble(v -> v.getArriveAmount().doubleValue()).sum())));
|
|
}
|
|
}
|
|
SysFileStorage fileConditions = new SysFileStorage();
|
|
SysFileStorage fileConditions = new SysFileStorage();
|
|
fileConditions.setMasterId(collection.getId());
|
|
fileConditions.setMasterId(collection.getId());
|