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

controllers/cases/signin.go

@@ -19,7 +19,7 @@ func (c *SigninController) Constructor() {
 	c.dao = cases.NewSigninServ(c.Context)
 }
 
-// GetOrgCases 获取机构案场
+
 /**
  条件:
 				 selectType: 今天,本周,本月,今年,全部
@@ -48,7 +48,7 @@ func (c *SigninController) AddSignin() {
 	phone := c.GetString("tel");
 	// openId := c.GetString("openId")
 	caseId := c.GetString("fieldId")
-	println("手机号:"+phone+" 案场:"+caseId)
+	//println("手机号:"+phone+" 案场:"+caseId)
 
 	//activityId := c.GetString("activityId")
 	activityId := "占位符"
@@ -60,7 +60,9 @@ func (c *SigninController) AddSignin() {
 	signin.Phone = phone
 	signin.OpenId = openId
 
-	//userMapping := c.Context.Get("userMap").(model.TaUserMapping)
+  // 机构
+	org := c.Context.Get("org").(model.SysOrg)
+	signin.OrgId = org.OrgId
 
 	res,err := c.dao.AddSignin(signin,caseId,activityId,&userMap)
 

models/model/ta_checkin_record.go

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

service/cases/signin.go

@@ -68,6 +68,9 @@ func (s *SigninServ) AddSignin(signin model.TaCheckinRecord,caseId string,activi
 	if activityId == ""  {
 		return nil,utils.LogError("没有活动ID")
 	}
+	if signin.OrgId == "" {
+		return nil,uints.LogError("没有机构ID")
+	}
 
 	// 获取上下文的用户
 	user := s.ctx.Get("user").(model.SysUser)