|
@@ -227,7 +227,7 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
|
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLink = new ArrayList<>();
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLink = new ArrayList<>();
|
|
|
rulesAttrList.forEach(x -> {
|
|
rulesAttrList.forEach(x -> {
|
|
|
//单独处理车牌号
|
|
//单独处理车牌号
|
|
|
- if ("LicenseNo".equals(x.getAttrCode())) {
|
|
|
|
|
|
|
+ if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))) {
|
|
|
x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
|
|
x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
|
|
|
x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
|
|
x.setRulesId(ptlAgreementUndwrtRulesNew.getId());
|
|
|
x.setId(0);
|
|
x.setId(0);
|
|
@@ -297,6 +297,16 @@ public class PtlAgreementUndwrtRulesNewServiceImpl extends ServiceImpl<PtlAgreem
|
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLinks = agreementUndwrtRules.getRulesAttrList();
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLinks = agreementUndwrtRules.getRulesAttrList();
|
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLink = new ArrayList<>();
|
|
List<PtlAgreementUndwrtRulesAttrLink> costsAttrLink = new ArrayList<>();
|
|
|
costsAttrLinks.forEach(x -> {
|
|
costsAttrLinks.forEach(x -> {
|
|
|
|
|
+ //转换数组
|
|
|
|
|
+ if(x.getMinArray() != null && x.getMinArray().length > 0){
|
|
|
|
|
+ x.setMin(String.join(",",x.getMinArray()));
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ //处理中文逗号
|
|
|
|
|
+ if(x.getMin() != null && x.getMin().contains(","))
|
|
|
|
|
+ {
|
|
|
|
|
+ x.setMin(x.getMin().replace(",",","));
|
|
|
|
|
+ }
|
|
|
//单独处理车牌号
|
|
//单独处理车牌号
|
|
|
if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && x.getMin() != "")) {
|
|
if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && x.getMin() != "")) {
|
|
|
x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
|
|
x.setOperator(x.getDictLabal().getJSONObject(0).getString("parentNumber"));
|