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

Merge branch 'develop_migration' into 'develop_master'

Browse Source 
feat: There is no way the, 跑跑跑 跑数据 重置es

See merge request LiuChao/foton-slrs-system-rest!414
This commit is contained in:
super_liu
2022-03-08 16:36:54 +08:00
parent 5f055e2152 c1eeea3f1f
commit 230e035424
19 changed files with 2190 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adc-da-slrs/src/main/java/com/adc/da/slrs/sarStandardsInfo/service/impl/SarStandardsInfoServiceImpl.java
+3 -3
View File
@@ -653,7 +653,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
value= String.join(",", stringList.isEmpty() ? valArr : stringList);
break;
}
default:value = dicTypeEODao.getDicNamesByCodes(valArr);
default:value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
@@ -683,7 +683,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
valArr = Arrays.asList(value.split(","));
}
if(!valArr.isEmpty()){
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);
@@ -731,7 +731,7 @@ public class SarStandardsInfoServiceImpl extends ServiceImpl<SarStandardsInfoDao
}
} else {
List<String> valArr = Arrays.asList(value.split(","));
value = dicTypeEODao.getDicNamesByCodes(valArr);
value = dicTypeEODao.getDicNamesByCodes(valArr,"");
}
}
entry.setValue(value);