xingzai vor 1 Jahr
Ursprung
Commit
6b57202798

+ 7 - 5
controllers/activity_sign.go

@@ -143,15 +143,17 @@ func (this *ActivitySignCoAntroller) Detail() {
 		condition = " AND  open_id = ?  AND activity_id = ?  "
 		pars = append(pars, user.OpenId, activityId)
 		signinDetail, err := models.GetCygxActivitySigninDetail(condition, pars)
-		if err != nil {
+		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "签到失败"
 			br.ErrMsg = "获取失败GetCygxActivitySigninDetail,Err:" + err.Error()
 			return
 		}
-		detail.BusinessCard = signinDetail.BusinessCard
-		detail.Mobile = signinDetail.Mobile
-		detail.RealName = signinDetail.RealName
-		detail.CompanyName = signinDetail.CompanyName
+		if signinDetail != nil {
+			detail.BusinessCard = signinDetail.BusinessCard
+			detail.Mobile = signinDetail.Mobile
+			detail.RealName = signinDetail.RealName
+			detail.CompanyName = signinDetail.CompanyName
+		}
 	}
 	resp.Detail = detail
 	br.Ret = 200

+ 1 - 1
controllers/report.go

@@ -1456,7 +1456,7 @@ func (this *ReportController) IsShow() {
 	resp.SearchTxtList.YanXuanSearch = "全局搜索"
 	resp.SearchTxtList.ActivitySearch = "全局搜索"
 	resp.SearchTxtList.TabSearch = "请输入关键词"
-	resp.IsShow = true
+	//resp.IsShow = true
 	br.Ret = 200
 	br.Success = true
 	br.Data = resp

+ 9 - 0
models/activity_offline_meeting_detail.go

@@ -16,6 +16,7 @@ type CygxActivityOfflineMeetingDetail struct {
 	CompanyId   int       `description:"公司ID"`
 	CompanyName string    `description:"公司名称"`
 	IsMeeting   int       `description:"是否到会  1.是 ,0否"`
+	SigninTime  string    `description:"签到时间"`
 }
 
 // 列表
@@ -55,3 +56,11 @@ func GetCygxActivityOfflineMeetingDetailCount(condition string, pars []interface
 	err = o.Raw(sqlCount, pars).QueryRow(&count)
 	return
 }
+
+// UpdateCygxActivityOfflineMeetingDetailSigninTime  修改签到时间
+func UpdateCygxActivityOfflineMeetingDetailSigninTime(activityId, userId int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE cygx_activity_offline_meeting_detail SET signin_time = NOW()  WHERE activity_id  = ? AND  user_id = ? `
+	_, err = o.Raw(sql, activityId, userId).Exec()
+	return
+}

+ 4 - 3
models/activity_signin.go

@@ -73,11 +73,11 @@ func GetCygxActivitySigninDetail(condition string, pars []interface{}) (item *Cy
 	return
 }
 
-// 修改是否推送消息状态
+// 修改创建时间,做签到时间使用
 func UpdatedateCygxActivitySignin(item *CygxActivitySignin) (err error) {
-	sql := ` UPDATE cygx_activity_signin SET  create_time= NOW()   WHERE   user_id = ?  AND activity_id = ? `
+	sql := ` UPDATE cygx_activity_signin SET  create_time= NOW()   WHERE   open_id = ?  AND activity_id = ? `
 	o := orm.NewOrm()
-	_, err = o.Raw(sql, item.UserId, item.ActivityId).Exec()
+	_, err = o.Raw(sql, item.OpenId, item.ActivityId).Exec()
 	return
 }
 
@@ -92,6 +92,7 @@ func AddCygxActivitySignin(item *CygxActivitySignin) (err error) {
 func UpdateCygxActivitySignin(item *CygxActivitySignin) (err error) {
 	o := orm.NewOrm()
 	updateParams := make(map[string]interface{})
+	updateParams["UserId"] = item.UserId
 	updateParams["Mobile"] = item.Mobile
 	updateParams["Email"] = item.Email
 	updateParams["CompanyId"] = item.CompanyId

+ 8 - 0
services/activity_signin.go

@@ -84,6 +84,7 @@ func AddCygxActivityOfflineMeetingDetail(activityid int, user *models.WxUserItem
 			item.CompanyName = v.CompanyName
 			if user.UserId == v.UserId {
 				item.IsMeeting = 1
+				item.SigninTime = time.Now().Format(utils.FormatDateTime)
 			}
 			items = append(items, item)
 		}
@@ -103,6 +104,13 @@ func AddCygxActivityOfflineMeetingDetail(activityid int, user *models.WxUserItem
 		return
 	}
 
+	//修改签到时间
+	err = models.UpdateCygxActivityOfflineMeetingDetailSigninTime(activityid, user.UserId)
+	if err != nil {
+		err = errors.New("UpdateCygxActivityOfflineMeetingDetailSigninTime, Err: " + err.Error())
+		return
+	}
+
 	return
 
 }