bug修改

controllers/message/location.go

@@ -60,3 +60,12 @@ func (c *MessageController) UpdateLocationSort() {
 	}
 	c.ResponseJSON("操作成功！")
 }
+
+// GetLocationInfoList 根据位置信息
+func (c *MessageController) GetLocationInfoList() {
+	infos, err := c.dao.GetLocationInfoList()
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(infos)
+}

log/common.log

@@ -0,0 +1,4 @@
+2018/09/19 10:11:21 [E] 获取人员信息失败: 当前用户没有权限查看用户信息
+2018/09/19 10:56:30 [E] 获取课程信息失败: Error 1052: Column 'org_id' in where clause is ambiguous
+2018/09/19 10:56:35 [E] 获取课程信息失败: Error 1052: Column 'org_id' in where clause is ambiguous
+2018/09/19 10:57:05 [E] 获取课程信息失败: Error 1052: Column 'org_id' in where clause is ambiguous

models/course/course.go

@@ -574,3 +574,34 @@ func (m *CourseDAO) GetCourseBySendType(typeval, caseids string) ([]model.TaCour
 	err := m.db.Where("status=?", models.STATUS_NORMAL).And("case_id in ('" + strings.Replace(caseids, ",", "','", -1) + "')").Find(&courses)
 	return courses, err
 }
+
+// CourseWithCase 课程with案场
+type CourseWithCase struct {
+	model.TaCourse `xorm:"extends"`
+	CaseName       string
+	CaseAddress    string
+}
+
+// GetSelectCourseWithCaseList 获取精选课程
+func (m *CourseDAO) GetSelectCourseWithCaseList(orgid string) ([]CourseWithCase, error) {
+	var courses []CourseWithCase
+	sql := `select a.*,b.case_name,b.case_address from ta_course a inner join sys_case b on a.case_id=b.case_id where a.is_select=` + strconv.Itoa(IS_SELECT) + ` 
+	and a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` and a.org_id='` + orgid + `'
+	and a.course_id NOT in (
+		select course_id from ta_course_detail where begin_date<=NOW()
+	)`
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}
+
+// GetCourseWithCaseByLocation 根据位置获取课程信息
+func (m *CourseDAO) GetCourseWithCaseByLocation(orgid, locationid string) ([]CourseWithCase, error) {
+	var courses []CourseWithCase
+	sql := `select a.*,b.case_name,b.case_address from ta_course a inner join sys_case b on a.case_id=b.case_id where a.status=` + strconv.Itoa(models.STATUS_NORMAL) + ` 
+	and a.org_id='` + orgid + `' and a.location_id ='` + locationid + `' 
+	and a.course_id NOT in (
+		select course_id from ta_course_detail where begin_date<=NOW()
+	)`
+	err := m.db.Sql(sql).Find(&courses)
+	return courses, err
+}

models/message/location.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"spaceofcheng/services/models"
+	"spaceofcheng/services/models/course"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strconv"
@@ -110,3 +111,22 @@ func (m *MessageDAO) UpdateLocationSortByID(orderno int) error {
 	_, err := m.db.Exec(sql)
 	return err
 }
+
+// LocationInfo 详情
+type LocationInfo struct {
+	model.TdCmsImageLocation `xorm:"extends"`
+	Banners                  []model.TaCmsImages
+	News                     []model.TaCmsNews
+	Courses                  []course.CourseWithCase
+}
+
+// GetLocationInfoList 获取列表
+func (m *MessageDAO) GetLocationInfoList(orgid string) ([]LocationInfo, error) {
+	var locations []LocationInfo
+	sql := `select * from td_cms_image_location where status>? and location_id<>'index' and org_id=? order by order_no asc`
+	err := m.db.Sql(sql, models.STATUS_DEL, orgid).Find(&locations)
+	if err != nil {
+		return nil, err
+	}
+	return locations, nil
+}

routers/guest.go

@@ -23,6 +23,7 @@ func getGuestRoutes() beego.LinkNamespace {
 		beego.NSRouter("/cms/news", &message.MessageController{}, "get:GetNewsByLocation"),
 		beego.NSRouter("/cms/case", &message.MessageController{}, "get:GetCmsCaseList"),
 		beego.NSRouter("/cms/location", &message.MessageController{}, "get:GetLocations"),
+		beego.NSRouter("/cms/location/detail", &message.MessageController{}, "get:GetLocationInfoList"),
 		beego.NSRouter("/cms/course", &course.CourseController{}, "get:GetCourseByLocation"),
 		beego.NSRouter("/cms/case/:cmscaseid", &message.MessageController{}, "get:GetCmsCaseByID"),
 

service/message/location.go

@@ -2,6 +2,7 @@ package message
 
 import (
 	"errors"
+	"spaceofcheng/services/models/message"
 	"spaceofcheng/services/models/model"
 	"spaceofcheng/services/utils"
 	"strings"
@@ -86,3 +87,45 @@ func (s *MessageServ) UpdateLocationSort(locations string) error {
 	}
 	return nil
 }
+
+// GetLocationInfoList 获取详情
+func (s *MessageServ) GetLocationInfoList() ([]message.LocationInfo, error) {
+	var org = s.ctx.Get("org").(model.SysOrg)
+	locations, err := s.dao.GetLocationInfoList(org.OrgId)
+	if err != nil {
+		utils.LogError("获取Location失败: " + err.Error())
+		return nil, errors.New("获取失败")
+	}
+	for inx, l := range locations {
+		news, err := s.dao.GetNewsByLocation(l.LocationId, org.OrgId)
+		if err != nil {
+			utils.LogError("获取新闻信息失败: " + err.Error())
+			return nil, errors.New("获取新闻信息失败")
+		}
+		locations[inx].News = news
+
+		imgs, err := s.dao.GetImgByLocation(l.LocationId, org.OrgId)
+		if err != nil {
+			utils.LogError("获取图片信息失败: " + err.Error())
+			return nil, errors.New("获取图片信息失败")
+		}
+		locations[inx].Banners = imgs
+		if l.LocationId == "selected" {
+			courses, err := s.coursedao.GetSelectCourseWithCaseList(org.OrgId)
+			if err != nil {
+				utils.LogError("获取课程信息失败: " + err.Error())
+				return nil, errors.New("获取课程信息失败")
+			}
+			locations[inx].Courses = courses
+		} else {
+			courses, err := s.coursedao.GetCourseWithCaseByLocation(org.OrgId, l.LocationId)
+			if err != nil {
+				utils.LogError("获取课程信息失败: " + err.Error())
+				return nil, errors.New("获取课程信息失败")
+			}
+			locations[inx].Courses = courses
+		}
+	}
+
+	return locations, nil
+}