From 41b19d148105dd9fe2b299f2ca759ae59b02f091 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 27 Apr 2022 13:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=85=E5=8D=95=20=E5=AF=BC=E5=85=A5=20?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sarLawsDetailedList/entity/ExportEmptyModel.java | 2 +- .../service/impl/SarLawsDetailedListServiceImpl.java | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java index b9074f37..90100c78 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java @@ -31,7 +31,7 @@ public class ExportEmptyModel { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date zccssrqgj; - private String standId; + private String id; private String compareFlag; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java index 220f3df3..5cd92b54 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java @@ -861,9 +861,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl infos=standardsInfoDao.getSarStandardsInfoByNum(infoEOPage ,"0"); if (null!= infos && infos.size()>0){ - exportEmptyModel.setStandId(infos.get(0).getId()); + exportEmptyModel.setId(infos.get(0).getId()); } - if (null==exportEmptyModel.getStandId()) { + if (null==exportEmptyModel.getId()) { //判断是否在政策里 SarBussionessStandEOPage page = new SarBussionessStandEOPage(); page.setPage(1); @@ -873,10 +873,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl sarBussionessStands = sarBussionessStandDao.getBussionessStandInfoByNum(page); if (null != sarBussionessStands && sarBussionessStands.size() > 0) { - exportEmptyModel.setStandId(sarBussionessStands.get(0).getId()); + exportEmptyModel.setId(sarBussionessStands.get(0).getId()); } } - if (null==exportEmptyModel.getStandId()) { + if (null==exportEmptyModel.getId()) { //判断是否在企标里 List getSarStandardsInfoPage(SarLawsStandInfoPage page); SarLawsStandInfoPage lawsStandInfoPage = new SarLawsStandInfoPage(); lawsStandInfoPage.setPage(1); @@ -886,10 +886,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl sarLawsStandInfos = sarLawsStandInfoDao.getSarStandardsInfoByNum(lawsStandInfoPage); if (null != sarLawsStandInfos && sarLawsStandInfos.size() > 0) { - exportEmptyModel.setStandId(sarLawsStandInfos.get(0).getId()); + exportEmptyModel.setId(sarLawsStandInfos.get(0).getId()); } } - if (null==exportEmptyModel.getStandId() || exportEmptyModel.getStandId().isEmpty()){ + if (null==exportEmptyModel.getId() || exportEmptyModel.getId().isEmpty()){ stringBuilder.append("第"+i+"行标准号不存在，请检查标准号是否正确；"); } //验证完标准号 再来验证适用认证 写的是否合理 字典编码 SYRZCLASS0