|
@ -88,7 +88,7 @@ public class StdService implements IStdService {
|
|
*/
|
|
*/
|
|
public List<AdapterDictEntryModel> getDictByScheme(String schemeVersion, String dictId) {
|
|
public List<AdapterDictEntryModel> getDictByScheme(String schemeVersion, String dictId) {
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
map.put("adapterDictId", dictId);
|
|
|
|
|
|
map.put("stdDictId", dictId);
|
|
AdapterVersion version = new AdapterVersion(schemeVersion);
|
|
AdapterVersion version = new AdapterVersion(schemeVersion);
|
|
return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
|
|
return dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
|
|
}
|
|
}
|
|
@ -99,7 +99,7 @@ public class StdService implements IStdService {
|
|
public DictionaryResult getDictResultByVersion(String schemeVersion, String dictId) throws Exception {
|
|
public DictionaryResult getDictResultByVersion(String schemeVersion, String dictId) throws Exception {
|
|
DictionaryResult re = new DictionaryResult();
|
|
DictionaryResult re = new DictionaryResult();
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
Map<String,Object> map = new HashMap<String,Object>();
|
|
map.put("adapterDictId", dictId);
|
|
|
|
|
|
map.put("stdDictId", dictId);
|
|
AdapterVersion version = new AdapterVersion(schemeVersion);
|
|
AdapterVersion version = new AdapterVersion(schemeVersion);
|
|
List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
|
|
List<AdapterDictEntryModel> dictentryList = dictentryService.getList(AdapterDictEntryModel.class, version.getDictEntryTableName(), net.sf.json.JSONObject.fromObject(map).toString(), null, null, null);
|
|
|
|
|
|
@ -108,10 +108,14 @@ public class StdService implements IStdService {
|
|
if(!CollectionUtil.isEmpty(dictentryList)) {
|
|
if(!CollectionUtil.isEmpty(dictentryList)) {
|
|
for(AdapterDictEntryModel adapterDictEntryModel : dictentryList)
|
|
for(AdapterDictEntryModel adapterDictEntryModel : dictentryList)
|
|
{
|
|
{
|
|
DictItem dict = new DictItem();
|
|
|
|
dict.setCode(adapterDictEntryModel.getAdapterEntryCode());
|
|
|
|
dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
|
|
|
|
list.add(dict);
|
|
|
|
|
|
String code = adapterDictEntryModel.getAdapterEntryCode();
|
|
|
|
if(code!=null)
|
|
|
|
{
|
|
|
|
DictItem dict = new DictItem();
|
|
|
|
dict.setCode(code);
|
|
|
|
dict.setValue(adapterDictEntryModel.getAdapterEntryValue());
|
|
|
|
list.add(dict);
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
re.setDetailModelList(list);
|
|
re.setDetailModelList(list);
|