From 0d341e0026e2e0b4c6c120c149a670725d120f6e Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 21 Jul 2016 14:46:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=A8=E6=9E=9A=E4=B8=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/common/enums/WeekEnums.java  | 12 ++++++++----
 .../platform/operate/web/controller/EnumsController.java     |  2 +-
 2 files changed, 9 insertions(+), 5 deletions(-)

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<String> getWeekEnums() {
-        List<String> list = new ArrayList<>();
-        for (WeekEnums e : WeekEnums.values()) {
-           list.add(e.getName());
+    public static List<Map> getWeekEnums() {
+        List<Map> 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<String> getWeeks() {
+    public  List<Map> getWeeks() {
         return  WeekEnums.getWeekEnums();
     }
 
-- 
1.8.3.1