diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java index d884980b..bf4657df 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystem.java @@ -27,6 +27,8 @@ public class OldSystem { private String fileId; + private String standNumber; + // 需要组合的数据 private String attFileId; diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java new file mode 100644 index 00000000..3020ce41 --- /dev/null +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/entity/OldSystemVo.java @@ -0,0 +1,15 @@ +package com.adc.da.slrs.sarBussionessStand.entity; + +import lombok.Data; + +@Data +public class OldSystemVo { + + private String id; + //标准号 + private String standNumber; + //译文件 + private String translateFileId; + //原文件 + private String originalFileId; +} diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java index af3a0f36..16478be7 100644 --- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java +++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStand/service/impl/SarBussionessStandServiceImpl.java @@ -42,6 +42,7 @@ import com.adc.da.slrs.sarBussStandSn.service.ISarBussStandSnService; import com.adc.da.slrs.sarBussStandVal.dao.SarBussStandValDao; import com.adc.da.slrs.sarBussStandVal.entity.SarBussStandVal; import com.adc.da.slrs.sarBussionessStand.entity.OldSystem; +import com.adc.da.slrs.sarBussionessStand.entity.OldSystemVo; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStand; import com.adc.da.slrs.sarBussionessStand.dao.SarBussionessStandDao; import com.adc.da.slrs.sarBussionessStand.entity.SarBussionessStandExport; @@ -2623,8 +2624,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl oldArr = new ArrayList(); - // 记录无法处理的id - Set fileEOArrayList= new HashSet<>(); + // + List objectList = new ArrayList<>(); + // 被修改的标准号和文件 + Set UpdateStandNumberFileList = new HashSet<>(); + // 无法处理的信息 标准号 和文件id + Set cannotModifyStandNumberFileList = new HashSet<>(); //海外国内的文件数据处理 处理逻辑对比 文件的名称 一致的情况下 则看老数据库 是否有对应的分类 原文 译文 if(type.equals("海外")) { List SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("FOREIGN"); @@ -2764,7 +2769,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl SarStandardsInfoList = sarStandardsInfoDao.selectListInfo("INLAND"); @@ -3127,7 +3147,12 @@ public class SarBussionessStandServiceImpl extends ServiceImpl