|
|
@@ -1557,6 +1557,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
List<String> hisNames = originList
|
|
|
.stream()
|
|
|
.map(i -> i.getHisName())
|
|
|
+ .distinct()
|
|
|
.collect(Collectors.toList());
|
|
|
|
|
|
originList = originList.stream().distinct().collect(Collectors.toList());
|
|
|
@@ -1594,6 +1595,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
List<MappingConfigWrapper> db_matchList = Lists.newLinkedList();
|
|
|
List<MappingConfigWrapper> db_unMatchList = Lists.newLinkedList();
|
|
|
Map<String, List<MappingConfigWrapper>> db_matchMap = new HashMap<>();
|
|
|
+ Map<String, List<MappingConfigWrapper>> db_fullMatchMap = new HashMap<>();
|
|
|
Map<String, List<MappingConfigWrapper>> db_unMatchMap = new HashMap<>();
|
|
|
synchronized (this) {
|
|
|
List<Long> deleteIds = Lists.newLinkedList();
|
|
|
@@ -1605,7 +1607,8 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
|
|
|
if (ListUtil.isNotEmpty(dbList)) {
|
|
|
List<MappingConfigWrapper> dbWrapperList = BeanUtil.listCopyTo(dbList, MappingConfigWrapper.class);
|
|
|
- dbWrapperList = addNames(dbWrapperList, StatusEnum.Enable.getKey());
|
|
|
+ //保留所有原始数据（禁用的和启用的）
|
|
|
+ dbWrapperList = addNames(dbWrapperList, null);
|
|
|
for (MappingConfigWrapper item : dbWrapperList) {
|
|
|
if (StringUtil.isBlank(item.getHisDetailName())) {
|
|
|
item.setHisDetailName("");
|
|
|
@@ -1625,6 +1628,12 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
|
|
|
db_matchMap = db_matchList.stream().collect(Collectors.groupingBy(i -> i.getHisName() + "_"
|
|
|
+ i.getHisCode() + "_"
|
|
|
+ i.getHisDetailName()));
|
|
|
+ db_fullMatchMap = db_matchList.stream()
|
|
|
+ .collect(Collectors.groupingBy(i -> i.getHisName() + "_"
|
|
|
+ + i.getHisCode() + "_"
|
|
|
+ + i.getHisDetailName() + "_"
|
|
|
+ + i.getUniqueName() + "_"
|
|
|
+ + i.getForm()));
|
|
|
db_unMatchList = dbWrapperList.stream().filter(i -> i.getIsMatch().equals(0)).collect(Collectors.toList());
|
|
|
db_unMatchMap = db_unMatchList.stream().collect(Collectors.groupingBy(i -> i.getHisName() + "_"
|
|
|
+ i.getHisCode() + "_"
|
zhaops