Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

controllers/user/user.go

@@ -79,8 +79,8 @@ func (c *UserController) GetUserList() {
 func (c *UserController) GetUserTypes() {
 	// cases := c.Context.Get("cases").([]model.SysUserCase)
 	// caseIDs := c.GetCaseIDs(cases)
-	orgid := c.GetString(":org")
-	usertypes, err := c.dao.GetUserTypes(orgid)
+	org := c.Context.Get("org").(model.SysOrg)
+	usertypes, err := c.dao.GetUserTypes(org.OrgId)
 	if err != nil {
 		c.ResponseError(err)
 	}

models/course/course.go

@@ -224,36 +224,52 @@ func (m *CourseDAO) GetCourseDetail(courseid string) ([]model.TaCourseDetail, er
 	return details, err
 }
 
+// DetailInfo 排课记录
+type DetailInfo struct {
+	model.TaCourseDetail `xorm:"extends"`
+	CourseStatus         int
+	CourseName           string
+	CaseName             string
+	CaseAddress          string
+}
+
 // GetDetails 获取所有的排课记录
-func (m *CourseDAO) GetDetails(caseid, date string) ([]model.TaCourseDetail, error) {
-	var details []model.TaCourseDetail
-	err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("DATE_FORMAT(begin_date,'%Y-%m') = ?", date).Find(&details)
+func (m *CourseDAO) GetDetails(caseid, date string) ([]DetailInfo, error) {
+	var details []DetailInfo
+
+	sql := `select a.*,b.course_name,b.status as course_status,c.case_name,c.case_address from ta_course_detail a 
+	inner join ta_course b on a.course_id=b.course_id 
+	inner join sys_case c on a.case_id=c.case_id where a.status>` + strconv.Itoa(models.STATUS_DEL) + `
+	and b.status>` + strconv.Itoa(models.STATUS_DEL) + ` and a.case_id='` + caseid + `' and DATE_FORMAT(a.begin_date,'%Y-%m') = '` + date + `'`
+	err := m.db.Sql(sql).Find(&details)
+
+	// err := m.db.Where("status>"+strconv.Itoa(models.STATUS_DEL)).And("DATE_FORMAT(begin_date,'%Y-%m') = ?", date).Find(&details)
 	return details, err
 }
 
 // GetCourseSchedule 获取需要排课的记录
 func (m *CourseDAO) GetCourseSchedule(name, caseids, date string, page, pageSize int) ([]model.TaCourse, error) {
 	var courses []model.TaCourse
-	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And(date + " BETWEEN begin_date and end_date")
+	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And("'" + date + "' BETWEEN begin_date and end_date")
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
 	}
 	if caseids != "" {
-		dao.And("caseids in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+		dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 	}
-	err := dao.OrderBy("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
+	err := dao.Desc("create_date").Limit(pageSize, (page-1)*pageSize).Find(&courses)
 	return courses, err
 }
 
 // GetCourseScheduleCount 获取排课记录数
 func (m *CourseDAO) GetCourseScheduleCount(name, caseids, date string) (int, error) {
 	var courses []model.TaCourse
-	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And(date + " BETWEEN begin_date and end_date")
+	dao := m.db.Where("status=?", STATUS_UNPUBLISH).And("schedule_num<course_num").And("'" + date + "' BETWEEN begin_date and end_date")
 	if name != "" {
 		dao.And("course_name like '%" + name + "%'")
 	}
 	if caseids != "" {
-		dao.And("caseids in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
+		dao.And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')")
 	}
 	err := dao.Find(&courses)
 	return len(courses), err

models/course/tag.go

@@ -5,6 +5,7 @@ import (
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
+	"time"
 )
 
 // GetTagsList 获取标签列表
@@ -31,6 +32,7 @@ func (m *CourseDAO) GetTagsCount(orgid string) (int, error) {
 func (m *CourseDAO) AddCourseTag(tag model.TdCourseTag) (*model.TdCourseTag, error) {
 	tag.TagId = utils.GetGUID()
 	tag.Status = models.STATUS_NORMAL
+	tag.CreateDate = time.Now()
 	_, err := m.db.Insert(tag)
 	return &tag, err
 }

routers/common.go

@@ -177,7 +177,7 @@ func getCommonRoutes() beego.LinkNamespace {
 		beego.NSRouter("/course", &course.CourseController{}, "put:SaveCourse"),
 		beego.NSRouter("/course/:courseid", &course.CourseController{}, "delete:DeleteCourse"),
 		beego.NSRouter("/course/:courseid/public", &course.CourseController{}, "put:CoursePublic"),
-		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "get:CourseUnPublic"),
+		beego.NSRouter("/course/:courseid/unpublic", &course.CourseController{}, "put:CourseUnPublic"),
 		beego.NSRouter("/courseimg/:courseid", &course.CourseController{}, "get:GetCourseImgs"),
 		beego.NSRouter("/courseimg", &course.CourseController{}, "post:SaveCourseImg"),
 		beego.NSRouter("/courseimg", &course.CourseController{}, "put:SaveCourseImg"),

service/course/course.go

@@ -134,7 +134,7 @@ func (s *CourseServ) SaveCourse(course model.TaCourse, tagids string) (*model.Ta
 	if course.BeginDate.IsZero() || course.EndDate.IsZero() {
 		return nil, utils.LogError("课程时间不允许为空！")
 	}
-	if course.EndDate.After(course.BeginDate) {
+	if !course.EndDate.After(course.BeginDate) {
 		return nil, utils.LogError("截止时间必须大于开始时间！")
 	}
 	if tagids == "" {
@@ -176,7 +176,7 @@ func (s *CourseServ) SaveCourse(course model.TaCourse, tagids string) (*model.Ta
 			tagid = newtag.TagId
 		}
 		var coursetag = model.TaCourseTag{
-			CourseId: course.CourseId,
+			CourseId: newInfo.CourseId,
 			TagId:    tagid,
 		}
 		courseTags = append(courseTags, coursetag)
@@ -306,7 +306,7 @@ func (s *CourseServ) GetCourseSchedule(name, caseids, date string, page, pageSiz
 }
 
 // GetDetails 获取所有排课
-func (s *CourseServ) GetDetails(caseid, date string) ([]model.TaCourseDetail, error) {
+func (s *CourseServ) GetDetails(caseid, date string) ([]course.DetailInfo, error) {
 	if caseid == "" {
 		return nil, utils.LogError("请先选择案场！")
 	}