diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java index dc06678..2202dc5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java +++ b/platform-common/src/main/java/com/lyms/platform/common/enums/WeekEnums.java @@ -38,13 +38,17 @@ public enum WeekEnums { return 0; } - public static List getWeekEnums() { - List list = new ArrayList<>(); - for (WeekEnums e : WeekEnums.values()) { - list.add(e.getName()); + public static List getWeekEnums() { + List list = new ArrayList<>(); + for (SendDateEnums e : SendDateEnums.values()) { + Map rootMap = new HashMap(); + rootMap.put("id", e.getId()); + rootMap.put("name", e.getName()); + list.add(rootMap); } return list; } + private int id; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java index 4ca5afc..bd8954b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/EnumsController.java @@ -331,7 +331,7 @@ public class EnumsController { */ @RequestMapping(value = "/getWeeks", method = RequestMethod.GET) @ResponseBody - public List getWeeks() { + public List getWeeks() { return WeekEnums.getWeekEnums(); }