From 5dc686a00b043f0a5e9b1d9d9db227a9c65ebbf2 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 5 Aug 2024 15:02:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2088090=20=E4=BC=81=E4=B8=9A=E6=A0=87?= =?UTF-8?q?=E5=87=86-=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=EF=BC=8C=E5=89=8D=E4=B8=80=E4=B8=AA=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E5=9B=9B=E4=BD=8D=E6=95=B0=E5=AD=97=EF=BC=8C=E5=86=8D?= =?UTF-8?q?=E6=AC=A1=E8=87=AA=E5=8A=A8=E7=94=9F=E6=88=90=EF=BC=8C=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E5=8F=B7=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LawsEnterpriseStandardServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java index a3e09371..36236c9a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java @@ -8,20 +8,18 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.CommonConstant; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.process.common.enums.StandardStateEnum; -import com.jero.modules.laws.common.util.DateUtil; import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; -import com.jero.modules.laws.localTool.entity.StandardEarlyWarning; import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard; -import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import com.jero.modules.laws.standard.mapper.LawsEnterpriseStandardMapper; +import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDate; -import java.util.*; +import java.util.List; import java.util.stream.Collectors; @@ -86,8 +84,13 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl esList = this.list(lambdaQueryWrapper); - return esList.stream().map(LawsEnterpriseStandard::getStandardNumber) - .map(EnterpriseStandardUtil::getSequenceNoFromStandardNo).collect(Collectors.toList()); + + return esList.stream() + .filter(s -> s.getStandardNumberTemp().matches("\\d{3}")) + .collect(Collectors.toList()) + .stream().map(LawsEnterpriseStandard::getStandardNumber) + .map(EnterpriseStandardUtil::getSequenceNoFromStandardNo) + .collect(Collectors.toList()); }