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

controllers/cases/signin.go

@@ -38,7 +38,7 @@ func (c *SigninController) GetSigninWhere() {
 	if err != nil {
 		c.ResponseError(err)
 	}
-
+	
 	c.ResponseJSON(res)
 }
 

models/cases/signin.go

@@ -66,18 +66,26 @@ type SigninInfo struct {
 	var sql string
 	switch selectType {
 		case ALL:
-			sql = `select * from ta_checkin_record ORDER BY create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case TODAY:
-			sql = `select * from ta_checkin_record where to_days(create_date) = to_days(now()) ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where to_days(tcr.create_date) = to_days(now()) and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case THIS_WEEK:
-			sql = `SELECT * FROM ta_checkin_record WHERE YEARWEEK(date_format(create_date,'%Y-%m-%d')) = YEARWEEK(now()) ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE YEARWEEK(date_format(tcr.create_date,'%Y-%m-%d')) = YEARWEEK(now())  and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case THIS_MONTH:
-			sql = `SELECT * FROM ta_checkin_record WHERE DATE_FORMAT(create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id WHERE DATE_FORMAT(tcr.create_date,'%Y%m') = DATE_FORMAT(CURDATE(),'%Y%m') and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 		case THIS_YEAR:
-			sql = `select * from ta_checkin_record where YEAR(create_date)=YEAR(NOW()) ORDER BY create_date DESC limit` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
+			sql = `select tcr.*,user_id from ta_checkin_record tcr LEFT JOIN ta_customer tc on tcr.customer_id = tc.customer_id where YEAR(tcr.create_date)=YEAR(NOW()) and tcr.case_id='` + caseid + `' ORDER BY tcr.create_date DESC limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	}
 	
 	err := m.db.Sql(sql).Find(&signin)
+	// for index := 0; 0 < len(signin); index++ {
+	// 	println("用户编号:"+signin[index].UserId+"-")
+	// 	if signin[index].UserId == "" {
+	// 		signin[index].UserId = "前台用户"
+	// 	} else {
+	// 		signin[index].UserId = "后台用户"	
+	// 	}
+	// }
 	return signin,err
  }
 

models/model/ta_checkin_record.go

@@ -17,6 +17,7 @@ type TaCheckinRecord struct {
    ActivityId    string    `xorm:"VARCHAR(64)"`  
    ActivityName  string    `xorm:"VARCHAR(64)"`  
    CreateDate    time.Time `xorm:"DATETIME"`     
-   Status        int       `xorm:"SMALLINT(6)"` 
+   Status        int       `xorm:"SMALLINT(6)"`
+   UserId        string    `xorm:"VARCHAR(64)"`
    
 }

service/cases/signin.go

@@ -38,7 +38,7 @@ func (s *SigninServ) GetSigninWhere(selectType int,caseid string,page, pageSize
 	 if len(info) >0 {
 		total = len(info)
 	 }
-	
+
 	return map[string]interface{}{
 		"list":     info,
 		"pagesize": pageSize,