From 50d9bdada4aeacf4946ee2573600f406631acfcd Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 8 Sep 2016 16:01:06 +0800
Subject: [PATCH] code update

---
 .../com/lyms/platform/common/enums/SmsTimeTypeEnums.java    | 13 ++++++++-----
 .../lyms/platform/operate/web/facade/SmsConfigFacade.java   |  1 +
 .../java/com/lyms/platform/operate/web/result/SmsObj.java   |  9 +++++++++
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsTimeTypeEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsTimeTypeEnums.java
index f85257b..0666c54 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/SmsTimeTypeEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/SmsTimeTypeEnums.java
@@ -13,13 +13,16 @@ public enum SmsTimeTypeEnums {
 
     private String title;
 
-    public SmsTimeTypeEnums getEnum(int id) {
-        for (SmsTimeTypeEnums yn : values()) {
-            if (yn.getId() == id) {
-                return yn;
+    public static String getNameById(Integer id) {
+        if (id != null)
+        {
+            for (SmsTimeTypeEnums yn : values()) {
+                if (yn.getId() == id) {
+                    return yn.getTitle();
+                }
             }
         }
-        return null;
+        return "";
     }
 
     public int getId() {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
index 085d478..0e1e8ea 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java
@@ -698,6 +698,7 @@ public class SmsConfigFacade {
 						{
 							map.put("actualTime", "");
 						}
+						map.put("timeType",SmsTimeTypeEnums.getNameById(obj.getTimeType()));
 
 						map.put("smsStatus", SmsStatusEnums.getNameById(obj.getStatus()));
 						list.add(map);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java
index cd1ee56..0d46540 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmsObj.java
@@ -20,6 +20,15 @@ public class SmsObj{
     private Integer          sendCount;
     private Integer         subTypeId;
     private Integer        typeId;
+    private Integer        timeType;
+
+    public Integer getTimeType() {
+        return timeType;
+    }
+
+    public void setTimeType(Integer timeType) {
+        this.timeType = timeType;
+    }
 
     public String getPhone() {
         return phone;
-- 
1.8.3.1