|
|
@@ -42,24 +42,12 @@ public class BuildDescUtils {
|
|
|
// minArray 转 Set,避免循环内反复创建 List 做 contains 查找
|
|
|
Set<String> minCodes = Arrays.stream(link.getMinArray()).collect(Collectors.toSet());
|
|
|
String names = Optional.ofNullable(link.getDictLabal()).orElse(Collections.emptyList()).stream().filter(labal -> minCodes.contains(labal.getCode())).map(PtlAgreementUndwrtRulesDictLabal::getName).collect(Collectors.joining(","));
|
|
|
- if (link.getOperator() != null && "1".equals(link.getOperator())) {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(names).append(";\t\t");
|
|
|
- } else {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("不包含").append(names).append(";\t\t");
|
|
|
- }
|
|
|
+ desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append((link.getOperator() != null && "1".equals(link.getOperator())) ? "包含" : "不包含").append(names).append(";\t\t");
|
|
|
} else {
|
|
|
- if (link.getOperator() != null && "1".equals(link.getOperator())) {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(link.getMin()).append(";\t\t");
|
|
|
- } else {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("不包含").append(link.getMin()).append(";\t\t");
|
|
|
- }
|
|
|
+ desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append((link.getOperator() != null && "1".equals(link.getOperator())) ? "包含" : "不包含").append(link.getMin()).append(";\t\t");
|
|
|
}
|
|
|
} else if ("inputTag".equals(attrType)) {
|
|
|
- if (link.getOperator() != null && "1".equals(link.getOperator())) {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(link.getMin()).append(";\t\t");
|
|
|
- } else {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("不包含").append(link.getMin()).append(";\t\t");
|
|
|
- }
|
|
|
+ desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append((link.getOperator() != null && "1".equals(link.getOperator())) ? "包含" : "不包含").append(link.getMin()).append(";\t\t");
|
|
|
}
|
|
|
}
|
|
|
return desc.toString();
|
|
|
@@ -122,11 +110,7 @@ public class BuildDescUtils {
|
|
|
desc.append(checkBoxIdentifying(ptlAgreementUndwrtRulesAttr, sortedLinks.get(i)));
|
|
|
}
|
|
|
if ("inputTag".equals(ptlAgreementUndwrtRulesAttr.getAttrType())) {
|
|
|
- if (sortedLinks.get(i).getOperator() != null && sortedLinks.get(i).getOperator().equals("1")) {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("包含").append(sortedLinks.get(i).getMin()).append(",");
|
|
|
- } else {
|
|
|
- desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("不包含").append(sortedLinks.get(i).getMin()).append(",");
|
|
|
- }
|
|
|
+ desc.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append((sortedLinks.get(i).getOperator() != null && sortedLinks.get(i).getOperator().equals("1")) ? "包含" : "不包含").append(sortedLinks.get(i).getMin()).append(",");
|
|
|
}
|
|
|
}
|
|
|
// 相邻的","或","转换为"或"字
|
|
|
@@ -156,12 +140,7 @@ public class BuildDescUtils {
|
|
|
// minArray 转 Set,避免循环内反复创建 List 做 contains 查找
|
|
|
Set<String> minCodes = Arrays.stream(link.getMinArray()).collect(Collectors.toSet());
|
|
|
String names = Optional.ofNullable(dictLabalList).orElse(Collections.emptyList()).stream().filter(labal -> minCodes.contains(labal.getCode())).map(PtlAgreementUndwrtRulesDictLabal::getName).collect(Collectors.joining(","));
|
|
|
-
|
|
|
- if (link.getOperator() != null && "1".equals(link.getOperator())) {
|
|
|
- returnMsg.append(undwrtRulesAttr.getAttrName()).append("包含").append(names).append(",");
|
|
|
- } else {
|
|
|
- returnMsg.append(undwrtRulesAttr.getAttrName()).append("不包含").append(names).append(",");
|
|
|
- }
|
|
|
+ returnMsg.append(undwrtRulesAttr.getAttrName()).append((link.getOperator() != null && "1".equals(link.getOperator())) ? "包含" : "不包含").append(names).append(",");
|
|
|
}
|
|
|
return returnMsg.toString();
|
|
|
}
|