|
@@ -317,6 +317,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
|
|
|
List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
|
|
List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
|
|
|
costsAttrLinks.forEach(x -> {
|
|
costsAttrLinks.forEach(x -> {
|
|
|
PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();
|
|
PtlAgreementProductCostsAttrLinkHistory costsAttrLinkHistory = new PtlAgreementProductCostsAttrLinkHistory();
|
|
|
|
|
+ //处理中文逗号
|
|
|
|
|
+ if(x.getMin() != null && x.getMin().contains(","))
|
|
|
|
|
+ {
|
|
|
|
|
+ x.setMin(x.getMin().replace(",",","));
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
//单独处理车牌号
|
|
//单独处理车牌号
|
|
|
if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))) {
|
|
if ("LicenseNo".equals(x.getAttrCode()) && (x.getMin() != null && !x.getMin().equals(""))) {
|
|
@@ -409,6 +414,11 @@ public class PtlAgreementProductCostsNewServiceImpl extends ServiceImpl<PtlAgree
|
|
|
List<PtlAgreementProductCostsAttrLink> costsAttrLinks = agreementProductCosts.getCostsAttrLinks();
|
|
List<PtlAgreementProductCostsAttrLink> costsAttrLinks = agreementProductCosts.getCostsAttrLinks();
|
|
|
List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
|
|
List<PtlAgreementProductCostsAttrLink> costsAttrLink = new ArrayList<>();
|
|
|
costsAttrLinks.forEach(x -> {
|
|
costsAttrLinks.forEach(x -> {
|
|
|
|
|
+ //处理中文逗号
|
|
|
|
|
+ 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"));
|