FT/foton-slrs-system-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

清单 导入 接口 修改

Browse Source
This commit is contained in:
yuezhihang
2022-04-27 13:42:33 +08:00
parent 0acb645cda
commit 41b19d1481
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/entity/ExportEmptyModel.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class ExportEmptyModel {
@DateTimeFormat(pattern = "yyyy-MM-dd") @DateTimeFormat(pattern = "yyyy-MM-dd")
private Date zccssrqgj; private Date zccssrqgj;
private String standId; private String id;
private String compareFlag; private String compareFlag;
adc-da-slrs/src/main/java/com/adc/da/slrs/sarLawsDetailedList/service/impl/SarLawsDetailedListServiceImpl.java
+6 -6
View File
@@ -861,9 +861,9 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
infoEOPage.setStandNumber(exportEmptyModel.getStandNumber()); infoEOPage.setStandNumber(exportEmptyModel.getStandNumber());
List<SarStandardsInfo> infos=standardsInfoDao.getSarStandardsInfoByNum(infoEOPage ,"0"); List<SarStandardsInfo> infos=standardsInfoDao.getSarStandardsInfoByNum(infoEOPage ,"0");
if (null!= infos && infos.size()>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(); SarBussionessStandEOPage page = new SarBussionessStandEOPage();
page.setPage(1); page.setPage(1);
@@ -873,10 +873,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
page.setStandCode(exportEmptyModel.getStandNumber()); page.setStandCode(exportEmptyModel.getStandNumber());
List<SarBussionessStand> sarBussionessStands = sarBussionessStandDao.getBussionessStandInfoByNum(page); List<SarBussionessStand> sarBussionessStands = sarBussionessStandDao.getBussionessStandInfoByNum(page);
if (null != sarBussionessStands && sarBussionessStands.size() > 0) { 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<SarLawsStandInfo> getSarStandardsInfoPage(SarLawsStandInfoPage page); //判断是否在企标里 List<SarLawsStandInfo> getSarStandardsInfoPage(SarLawsStandInfoPage page);
SarLawsStandInfoPage lawsStandInfoPage = new SarLawsStandInfoPage(); SarLawsStandInfoPage lawsStandInfoPage = new SarLawsStandInfoPage();
lawsStandInfoPage.setPage(1); lawsStandInfoPage.setPage(1);
@@ -886,10 +886,10 @@ public class SarLawsDetailedListServiceImpl extends ServiceImpl<SarLawsDetailedL
lawsStandInfoPage.setUserId(LoginUserUtil.getUserId()); lawsStandInfoPage.setUserId(LoginUserUtil.getUserId());
List<SarLawsStandInfo> sarLawsStandInfos = sarLawsStandInfoDao.getSarStandardsInfoByNum(lawsStandInfoPage); List<SarLawsStandInfo> sarLawsStandInfos = sarLawsStandInfoDao.getSarStandardsInfoByNum(lawsStandInfoPage);
if (null != sarLawsStandInfos && sarLawsStandInfos.size() > 0) { 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+"行标准号不存在，请检查标准号是否正确；"); stringBuilder.append("第"+i+"行标准号不存在，请检查标准号是否正确；");
} }
//验证完标准号 再来验证适用认证 写的是否合理 字典编码 SYRZCLASS0 //验证完标准号 再来验证适用认证 写的是否合理 字典编码 SYRZCLASS0