|
@@ -198,7 +198,7 @@ public class BizDeductController extends BaseController {
|
|
entrustCondition.setId(conditions.getEntrustOrderId());
|
|
entrustCondition.setId(conditions.getEntrustOrderId());
|
|
BizEntrustOrder bizEntrustOrder = bizEntrustOrderService.getList(entrustCondition).stream().findFirst().orElse(null);
|
|
BizEntrustOrder bizEntrustOrder = bizEntrustOrderService.getList(entrustCondition).stream().findFirst().orElse(null);
|
|
if (bizEntrustOrder == null) {
|
|
if (bizEntrustOrder == null) {
|
|
- new RuntimeException("委托单不存在");
|
|
|
|
|
|
+ throw new RuntimeException("委托单不存在");
|
|
}
|
|
}
|
|
// 结算订单号
|
|
// 结算订单号
|
|
bizDeduct.setFormNo(bizEntrustOrder.getFormNo());
|
|
bizDeduct.setFormNo(bizEntrustOrder.getFormNo());
|
|
@@ -267,8 +267,14 @@ public class BizDeductController extends BaseController {
|
|
List<String> months = loopEntrust.stream().map(v -> DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd")).distinct().sorted().collect(Collectors.toList());
|
|
List<String> months = loopEntrust.stream().map(v -> DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd")).distinct().sorted().collect(Collectors.toList());
|
|
List<BizCompany> finalCompanies = companies;
|
|
List<BizCompany> finalCompanies = companies;
|
|
months.forEach(l -> {
|
|
months.forEach(l -> {
|
|
- List<BizEntrust> monthEntrust = loopEntrust.stream().filter(v -> DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd").equals(l)).collect(Collectors.toList());
|
|
|
|
- finalCompanies.stream().filter(v -> monthEntrust.stream().anyMatch(e -> e.getCompanyId().equals(v.getId()))).forEach(v -> {
|
|
|
|
|
|
+ List<BizEntrust> monthEntrust = loopEntrust.stream()
|
|
|
|
+ .filter(v ->
|
|
|
|
+ DateTime.of(v.getWorkMonth()).toString("yyyy-MM-dd").equals(l))
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
+ finalCompanies.stream().filter(v ->
|
|
|
|
+ monthEntrust.stream()
|
|
|
|
+ .anyMatch(e -> e.getCompanyId().equals(v.getId())))
|
|
|
|
+ .forEach(v -> {
|
|
BizStatementAccountLoop item = new BizStatementAccountLoop();
|
|
BizStatementAccountLoop item = new BizStatementAccountLoop();
|
|
item.setEntrustOrderId(bizDeduct.getEntrustOrderId());
|
|
item.setEntrustOrderId(bizDeduct.getEntrustOrderId());
|
|
item.setSocialCreditCode(v.getSocialCreditCode());
|
|
item.setSocialCreditCode(v.getSocialCreditCode());
|