|
|
@@ -226,7 +226,7 @@ public class PtlAgreementProductCostsNewHistoryServiceImpl extends ServiceImpl<P
|
|
|
String desc = "";
|
|
|
for (int i = 0; i < v.size(); i++) {
|
|
|
int finalI = i;
|
|
|
- PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(v.get(finalI).getAttrCode())).findAny().get();
|
|
|
+ PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr = undwrtRulesAttrList.stream().filter(x -> x.getAttrCode().equals(v.get(finalI).getAttrCode())).findAny().orElse(new PtlAgreementUndwrtRulesAttr());
|
|
|
//数值范围判断
|
|
|
if ("inputNumber".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
|
|
|
desc += inputNumberIdentifying(ptlAgreementUndwrtRulesAttr, v.get(i)) + "\n";
|
|
|
@@ -243,8 +243,8 @@ public class PtlAgreementProductCostsNewHistoryServiceImpl extends ServiceImpl<P
|
|
|
|
|
|
private String radioIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementProductCostsAttrLinkHistory ptlAgreementProductCostsAttrLinkHistory) {
|
|
|
PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x ->
|
|
|
- x.getCode().equals(ptlAgreementProductCostsAttrLinkHistory.getMin())).findAny().get();
|
|
|
- return ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + ptlAgreementUndwrtRulesDictLabal.getName();
|
|
|
+ x.getCode().equals(ptlAgreementProductCostsAttrLinkHistory.getMin())).findAny().orElse(new PtlAgreementUndwrtRulesDictLabal());
|
|
|
+ return ptlAgreementUndwrtRulesAttr.getAttrName() + "为" + Objects.requireNonNull(ptlAgreementUndwrtRulesDictLabal).getName();
|
|
|
}
|
|
|
|
|
|
private String inputNumberIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementProductCostsAttrLinkHistory ptlAgreementProductCostsAttrLink) {
|