|
@@ -519,7 +519,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
List<ConceptInfoDTO> records = page.getRecords();
|
|
List<ConceptInfoDTO> records = page.getRecords();
|
|
if (ListUtil.isNotEmpty(records)) {
|
|
if (ListUtil.isNotEmpty(records)) {
|
|
records.forEach(record -> {
|
|
records.forEach(record -> {
|
|
- record.setTypeName(convertTypeName(record.getTypeName(), 2, dicList));
|
|
|
|
|
|
+ String typeName = convertTypeName(record.getType(), 2, dicList);
|
|
|
|
+ record.setTypeName(typeName);
|
|
|
|
+ record.setType(String.valueOf(ConceptTypeEnum.getKey(typeName)));
|
|
});
|
|
});
|
|
}
|
|
}
|
|
page.setRecords(records);
|
|
page.setRecords(records);
|
|
@@ -650,6 +652,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
public ConceptInfoDTO getRecordById(IdVO idVO) {
|
|
public ConceptInfoDTO getRecordById(IdVO idVO) {
|
|
|
|
+ List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
|
|
ConceptInfoDTO conceptInfoDTO = new ConceptInfoDTO();
|
|
ConceptInfoDTO conceptInfoDTO = new ConceptInfoDTO();
|
|
ConceptInfo conceptInfo = this.getById(idVO.getId());
|
|
ConceptInfo conceptInfo = this.getById(idVO.getId());
|
|
if (conceptInfo == null) {
|
|
if (conceptInfo == null) {
|
|
@@ -665,6 +668,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
|
|
List<ConceptDetailDTO> details = BeanUtil.listCopyTo(conceptDetailList, ConceptDetailDTO.class);
|
|
List<ConceptDetailDTO> details = BeanUtil.listCopyTo(conceptDetailList, ConceptDetailDTO.class);
|
|
conceptInfoDTO.setDetails(details);
|
|
conceptInfoDTO.setDetails(details);
|
|
//启用状态、修改人、修改时间为明细的内容
|
|
//启用状态、修改人、修改时间为明细的内容
|
|
|
|
+ String typeName = convertTypeName(conceptInfoDTO.getType(), 2, dicList);
|
|
|
|
+ conceptInfoDTO.setTypeName(typeName);
|
|
|
|
+ conceptInfoDTO.setType(String.valueOf(ConceptTypeEnum.getKey(typeName)));
|
|
conceptInfoDTO.setModifier(conceptDetailList.get(0).getModifier());
|
|
conceptInfoDTO.setModifier(conceptDetailList.get(0).getModifier());
|
|
conceptInfoDTO.setGmtModified(conceptDetailList.get(0).getGmtModified());
|
|
conceptInfoDTO.setGmtModified(conceptDetailList.get(0).getGmtModified());
|
|
conceptInfoDTO.setIsDeleted(conceptDetailList.get(0).getIsDeleted());
|
|
conceptInfoDTO.setIsDeleted(conceptDetailList.get(0).getIsDeleted());
|