From 37abd8ba5e09b24f614a425e24a5b1cc3e314a34 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 18 Apr 2018 10:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=AD=A6=E6=A0=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/common/enums/CourseStatusEnums.java   | 39 ++++++++++++++++++++++
 .../java/com/lyms/platform/pojo/CourseModel.java   | 11 ++++++
 .../platform/operate/web/facade/CourseFacade.java  |  5 ++-
 .../operate/web/request/CourseRequest.java         | 12 +++++++
 .../platform/operate/web/result/CourseResult.java  | 21 ++++++++++++
 5 files changed, 87 insertions(+), 1 deletion(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java b/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java
index 9abf2ce..f75bb09 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/enums/CourseStatusEnums.java
@@ -43,4 +43,43 @@ public enum CourseStatusEnums {
         }
         return "";
     }
+
+    public enum CourseObjEnums
+    {
+        ALL(0,"全部"),YQ(1,"孕期"),BABY(2,"儿童"),CH(3,"产后");
+        CourseObjEnums(int id, String name) {
+            this.id = id;
+            this.name = name;
+        }
+
+        private int id;
+        private String name;
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+
+        public static String getNameById(int id) {
+            for (CourseStatusEnums e : CourseStatusEnums.values()) {
+                if(e.getId() == id)
+                {
+                    return e.getName();
+                }
+            }
+            return "";
+        }
+    }
 }
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
index 14ff5bc..32815f8 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CourseModel.java
@@ -66,6 +66,17 @@ public class CourseModel extends BaseModel {
 
     private String hospitalId;
 
+    //课程对象id  0全部/空 1孕期 2儿童 ，3产后
+    private Integer courseObjId;
+
+    public Integer getCourseObjId() {
+        return courseObjId;
+    }
+
+    public void setCourseObjId(Integer courseObjId) {
+        this.courseObjId = courseObjId;
+    }
+
     public Date getCourseEndTime() {
         return courseEndTime;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
index c902f22..a5c3bac 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CourseFacade.java
@@ -78,6 +78,7 @@ public class CourseFacade {
     private CourseModel getCoureseModel(CourseRequest request)
     {
         CourseModel model = new CourseModel();
+        model.setCourseObjId(request.getCourseObjId());
         model.setCourseName(request.getCourseName());
         model.setCourseAddress(request.getCourseAddress());
         model.setCourseRemark(request.getCourseRemark());
@@ -177,8 +178,10 @@ public class CourseFacade {
                     createUser = users.getName();
                 }
                 result.setCreateUser(createUser);
-
                 result.setCreated(DateUtil.getyyyy_MM_dd_hms(model.getCreated()));
+                result.setCourseObj(model.getCourseObjId() == null ? "全部" : CourseStatusEnums.CourseObjEnums.getNameById(model.getCourseObjId()));
+                result.setCourseObjId(model.getCourseObjId() == null ? 0 : model.getCourseObjId());
+
                 results.add(result);
             }
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
index b7d6b04..dcdc7a8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/CourseRequest.java
@@ -33,8 +33,20 @@ public class CourseRequest {
     //课程类别id
     private String courseTypeId;
 
+
+    //课程对象id 0全部/空 1孕期 2儿童 ，3产后
+    private Integer courseObjId;
+
     private String hospitalId;
 
+    public Integer getCourseObjId() {
+        return courseObjId;
+    }
+
+    public void setCourseObjId(Integer courseObjId) {
+        this.courseObjId = courseObjId;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
index 7f0d235..cf82f99 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/CourseResult.java
@@ -48,6 +48,27 @@ public class CourseResult {
 
     private String created;
 
+    //授课对象
+    private String courseObj;
+
+    private Integer courseObjId;
+
+    public Integer getCourseObjId() {
+        return courseObjId;
+    }
+
+    public void setCourseObjId(Integer courseObjId) {
+        this.courseObjId = courseObjId;
+    }
+
+    public String getCourseObj() {
+        return courseObj;
+    }
+
+    public void setCourseObj(String courseObj) {
+        this.courseObj = courseObj;
+    }
+
     public String getCourseTypeId() {
         return courseTypeId;
     }
-- 
1.8.3.1