Ver código fonte

静态知识维护

zhaops 4 anos atrás
pai
commit
1c0f104a61

+ 14 - 0
src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -37,11 +37,25 @@ public enum ConceptTypeEnum implements KeyedNamed {
         return null;
     }
 
+    public static ConceptTypeEnum getEnum(String name) {
+        for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
+            if (item.name.equals(name)) {
+                return item;
+            }
+        }
+        return null;
+    }
+
     public static String getName(int key) {
         ConceptTypeEnum item = getEnum(key);
         return item != null ? item.name : null;
     }
 
+    public static int getKey(String name) {
+        ConceptTypeEnum item = getEnum(name);
+        return item != null ? item.key : null;
+    }
+
     @Override
     public int getKey() {
         return key;

+ 7 - 1
src/main/java/com/diagbot/facade/ConceptInfoFacade.java

@@ -519,7 +519,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         List<ConceptInfoDTO> records = page.getRecords();
         if (ListUtil.isNotEmpty(records)) {
             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);
@@ -650,6 +652,7 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
      * @return
      */
     public ConceptInfoDTO getRecordById(IdVO idVO) {
+        List<DictionaryInfoDTO> dicList = dictionaryFacade.getListByGroupType(8);
         ConceptInfoDTO conceptInfoDTO = new ConceptInfoDTO();
         ConceptInfo conceptInfo = this.getById(idVO.getId());
         if (conceptInfo == null) {
@@ -665,6 +668,9 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
             List<ConceptDetailDTO> details = BeanUtil.listCopyTo(conceptDetailList, ConceptDetailDTO.class);
             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.setGmtModified(conceptDetailList.get(0).getGmtModified());
             conceptInfoDTO.setIsDeleted(conceptDetailList.get(0).getIsDeleted());