上一版代码处理包无指令情况
This commit is contained in:
parent
abd4a76a35
commit
cd71f4f2d9
|
|
@ -66,6 +66,9 @@ public class CareDirectivePlanServiceImpl extends ServiceImpl<CareDirectivePlanM
|
||||||
groupList.stream().forEach(item -> {
|
groupList.stream().forEach(item -> {
|
||||||
if ("Y".equals(item.getIzPackage())) {
|
if ("Y".equals(item.getIzPackage())) {
|
||||||
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
|
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
|
||||||
|
if (CollectionUtils.isEmpty(directives)) {
|
||||||
|
directives = List.of();
|
||||||
|
}
|
||||||
item.setDirectivesList(BeanUtil.copyToList(directives, CareDirectivePlan.class));
|
item.setDirectivesList(BeanUtil.copyToList(directives, CareDirectivePlan.class));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,9 @@ public class InvoicingDirectivePlanServiceImpl extends ServiceImpl<InvoicingDire
|
||||||
groupList.stream().forEach(item -> {
|
groupList.stream().forEach(item -> {
|
||||||
if ("Y".equals(item.getIzPackage())) {
|
if ("Y".equals(item.getIzPackage())) {
|
||||||
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
|
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
|
||||||
|
if (CollectionUtils.isEmpty(directives)) {
|
||||||
|
directives = List.of();
|
||||||
|
}
|
||||||
item.setDirectivesList(BeanUtil.copyToList(directives, InvoicingDirectivePlan.class));
|
item.setDirectivesList(BeanUtil.copyToList(directives, InvoicingDirectivePlan.class));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,9 @@ public class LogisticsDirectivePlanServiceImpl extends ServiceImpl<LogisticsDire
|
||||||
groupList.stream().forEach(item -> {
|
groupList.stream().forEach(item -> {
|
||||||
if ("Y".equals(item.getIzPackage())) {
|
if ("Y".equals(item.getIzPackage())) {
|
||||||
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
|
List<DirectiveEntity> directives = packageMap.get(item.getDirectiveId()).getDirectives();
|
||||||
|
if (CollectionUtils.isEmpty(directives)) {
|
||||||
|
directives = List.of();
|
||||||
|
}
|
||||||
item.setDirectivesList(BeanUtil.copyToList(directives, LogisticsDirectivePlan.class));
|
item.setDirectivesList(BeanUtil.copyToList(directives, LogisticsDirectivePlan.class));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue