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-sys/src/main/java/com/adc/da/sys/dao/DicTypeEODao.java
+1 -1
View File
@@ -66,7 +66,7 @@ public interface DicTypeEODao extends BaseMapper<DicTypeEO> {
public List<SelectionResult> getDicTypeByDicId(@Param("dicId") String dicId);
public String getDicNamesByCodes(@Param("codeList") List<String> codeList);
public String getDicNamesByCodes(@Param("codeList") List<String> codeList, @Param("dicId") String dicId);
public int insertSelective(DicTypeEO dictionaryEO);
adc-da-sys/src/main/java/com/adc/da/sys/service/IDicTypeEOService.java
+1 -1
View File
@@ -64,7 +64,7 @@ public interface IDicTypeEOService extends IService<DicTypeEO> {
public List<SelectionResult> getDicTypeByDicId(String dicId);
public String getDicNamesByCodes(List<String> codeList);
public String getDicNamesByCodes(List<String> codeList,String dicId);
public int insertSelective(DicTypeEO dictionaryEO);
adc-da-sys/src/main/java/com/adc/da/sys/service/impl/DicTypeEOServiceImpl.java
+2 -2
View File
@@ -419,8 +419,8 @@ public class DicTypeEOServiceImpl extends ServiceImpl<DicTypeEODao,DicTypeEO> im
}
@Override
public String getDicNamesByCodes(List<String> codeList) {
return dicTypeEODao.getDicNamesByCodes(codeList);
public String getDicNamesByCodes(List<String> codeList,String dicId) {
return dicTypeEODao.getDicNamesByCodes(codeList,dicId);
}
@Override