1

models/verify/verify.go

@@ -28,9 +28,6 @@ type MyCourse struct {
 	CourseName                   string
 	DetailName                   string
 	LocationName                 string
-	phone                        string
-	CustomerName                 string
-	Name                         string
 }
 
 func (m *VerifyDAO) GetCustomerCourseDetailById(id string) (*model.TaCustomerCourseDetail, error) {
@@ -53,16 +50,12 @@ func (m *VerifyDAO) GetCustomerCourseList(customerCourseId, caseid string, page
 	d.case_name,
 	b.course_name,	
 	c.detail_name,
-	f.location_name,
-	g.customer_name,
-	g.phone,
-	g.name
-FROM
+	f.location_name
+	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
 	INNER JOIN sys_case d ON d.case_id = a.case_id
-	INNER JOIN ta_customer g ON g.customer_id = b.customer_id
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND a.customer_course_id = '` + customerCourseId + `'
@@ -80,7 +73,7 @@ func (m *VerifyDAO) GetCustomerCourseListCount(customerCourseId, caseid string)
 	d.case_name,
 	b.course_name,	
 	c.detail_name
-FROM
+	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
@@ -110,20 +103,12 @@ func (m *VerifyDAO) GetCustomerCourseListByTel(tel, caseid string, page, pageSiz
 	a.*,
 	d.case_name,
 	b.course_name,
-	c.detail_name,
-<<<<<<< HEAD
-	e.customer_name,
-	e.name,
-	e.phone
-=======
-	f.location_name
->>>>>>> 3222288848b3f933a4154106d71a5f0547c96ab6
-FROM
+	c.detail_name
+	FROM
 	ta_customer_course_detail a
 	INNER JOIN ta_customer_course b ON a.customer_course_id = b.customer_course_id
 	INNER JOIN ta_course_detail c ON c.detail_id = a.detail_id
 	INNER JOIN sys_case d ON d.case_id = a.case_id
-	INNER JOIN ta_customer e ON b.customer_id = e.customer_id
 	LEFT JOIN td_cms_image_location f on b.location_id=f.location_id
 	WHERE DATE_FORMAT(a.start_date,'%Y-%m-%d') = DATE_FORMAT(NOW(),'%Y-%m-%d')
 	AND e.phone = '` + tel + `'