From 8c01b11d18e207ab58eda396fe92f00aaed27186 Mon Sep 17 00:00:00 2001 From: zyd Date: Mon, 24 Oct 2022 11:04:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=86=8D=E5=A4=84?= =?UTF-8?q?=E7=90=86=E8=A2=AB=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E5=8F=B7?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E8=A1=A5=E5=85=A8=E6=97=B6=EF=BC=8C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E8=A1=A5=E5=85=85=E9=94=99=E8=AF=AF=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=9B=B4=E6=96=B0=E7=8A=B6=E6=80=81=E7=9A=84?= =?UTF-8?q?BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/DataSyncServiceImpl.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java index a65524ea..d6eeb052 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/DataSync/service/impl/DataSyncServiceImpl.java @@ -213,10 +213,20 @@ public class DataSyncServiceImpl implements IDataSyncService { // 1.1.1.1.2.1 拼接 被代替标准号 String btd = bdtList.stream().map(info1 -> { String addStrandNumber = ""; - if (StringUtils.isNotEmpty(info1.getStandYear())) { - addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber() + "-" + info1.getStandYear(); - } else { - addStrandNumber = info1.getStandSort() + " " + info1.getStandNumber(); + //var judgeFn = new RegExp(/\s+/g); + //if(judgeFn.test(nowstandinfo.standSort)){ + // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //}else if(nowstandinfo.standSort === 'Q/QCBFC'){ + // nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //}else { + // nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + //} + if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort().indexOf(" ")>0){ + addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); + }else if(StringUtils.isNotBlank(info1.getStandSort()) && info1.getStandSort() =="Q/QCBFC"){ + addStrandNumber = info1.getStandSort() + info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); + }else{ + addStrandNumber = info1.getStandSort()+" "+ info1.getStandNumber() +(StringUtils.isNotBlank(info1.getStandYear())?("-" + info1.getStandYear()):""); } return addStrandNumber; }).collect(Collectors.joining(","));