diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java index 5f16170..407e150 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/FyTypeEnums.java @@ -30,11 +30,11 @@ public enum FyTypeEnums { return ""; } - public static List getFyTypeEnums() { - List list = new ArrayList<>(); + public static List> getFyTypeEnums() { + List> list = new ArrayList<>(); for (FyTypeEnums e : FyTypeEnums.values()) { - Map rootMap = new HashMap(); - rootMap.put("id", e.getId()); + Map rootMap = new HashMap(); + rootMap.put("id", String.valueOf(e.getId())); rootMap.put("name", e.getName()); list.add(rootMap); } diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java index fe25a56..00d10bd 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WyTypeEnums.java @@ -30,11 +30,11 @@ public enum WyTypeEnums { return ""; } - public static List getWyTypeEnums() { - List list = new ArrayList<>(); + public static List> getWyTypeEnums() { + List> list = new ArrayList<>(); for (WyTypeEnums e : WyTypeEnums.values()) { - Map rootMap = new HashMap(); - rootMap.put("id", e.getId()); + Map rootMap = new HashMap(); + rootMap.put("id", String.valueOf(e.getId())); rootMap.put("name", e.getName()); list.add(rootMap); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java index 741bdbd..b7ba770 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyCheckFacade.java @@ -418,7 +418,7 @@ public class BabyCheckFacade { */ private BabyCheckResult getBabyCheckResult(BabyCheckModel checkModel) { BabyCheckResult model = new BabyCheckResult(); - model.setId(model.getId()); + model.setId(checkModel.getId()); model.setBuildId(checkModel.getBuildId());