|
|
@@ -488,7 +488,7 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
|
|
|
.collect(Collectors.toMap(PtlAgreementUndwrtRulesAttr::getAttrCode, attr -> attr));
|
|
|
|
|
|
// 确定需要处理的规则ID列表
|
|
|
- List<String> ruleIds;
|
|
|
+ List<String> ruleIds = null;
|
|
|
if (rules.getParentId() != null && !rules.getParentId().isEmpty()) {
|
|
|
ruleIds = baseMapper.queryListByParentId(rules.getParentId()).stream()
|
|
|
.map(AgreementRulesVo::getId).collect(Collectors.toList());
|
|
|
@@ -766,13 +766,22 @@ public class PtlAgreementUndwrtRulesServiceImpl extends ServiceImpl<PtlAgreement
|
|
|
private String checkBoxIdentifying(PtlAgreementUndwrtRulesAttr ptlAgreementUndwrtRulesAttr, PtlAgreementUndwrtRulesAttrLink linkList) {
|
|
|
StringBuilder returnMsg = new StringBuilder();
|
|
|
returnMsg.append(ptlAgreementUndwrtRulesAttr.getAttrName()).append("为");
|
|
|
- for(int i=0;i<linkList.getMinArray().length;i++) {
|
|
|
- int finalI = i;
|
|
|
- if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo") || ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseArea")) {
|
|
|
- returnMsg.append(linkList.getMinArray()[i]).append(",");
|
|
|
- }else {
|
|
|
- PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
|
|
|
- returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName()).append(",");
|
|
|
+ if (linkList.getMinArray() == null) {
|
|
|
+ String minStr = linkList.getMin();
|
|
|
+ if (minStr != null && minStr.length() > 0) {
|
|
|
+ String[] minArray = minStr.split(",");
|
|
|
+ linkList.setMinArray(minArray);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (linkList.getMinArray() != null) {
|
|
|
+ for(int i=0;i<linkList.getMinArray().length;i++) {
|
|
|
+ int finalI = i;
|
|
|
+ if(ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseNo") || ptlAgreementUndwrtRulesAttr.getAttrCode().equals("LicenseArea")) {
|
|
|
+ returnMsg.append(linkList.getMinArray()[i]).append(",");
|
|
|
+ }else {
|
|
|
+ PtlAgreementUndwrtRulesDictLabal ptlAgreementUndwrtRulesDictLabal = ptlAgreementUndwrtRulesAttr.getDictLabal().stream().filter(x -> x.getCode().equals(linkList.getMinArray()[finalI])).findAny().get();
|
|
|
+ returnMsg.append(ptlAgreementUndwrtRulesDictLabal.getName()).append(",");
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return returnMsg.toString();
|