Browse Source

签到列表 添加机构

keyman1995 6 years ago
parent
commit
e82ef046ea
3 changed files with 9 additions and 3 deletions
  1. 5
    3
      controllers/cases/signin.go
  2. 1
    0
      models/model/ta_checkin_record.go
  3. 3
    0
      service/cases/signin.go

+ 5
- 3
controllers/cases/signin.go View File

19
 	c.dao = cases.NewSigninServ(c.Context)
19
 	c.dao = cases.NewSigninServ(c.Context)
20
 }
20
 }
21
 
21
 
22
-// GetOrgCases 获取机构案场
22
+
23
 /**
23
 /**
24
  条件:
24
  条件:
25
 				 selectType: 今天,本周,本月,今年,全部
25
 				 selectType: 今天,本周,本月,今年,全部
48
 	phone := c.GetString("tel");
48
 	phone := c.GetString("tel");
49
 	// openId := c.GetString("openId")
49
 	// openId := c.GetString("openId")
50
 	caseId := c.GetString("fieldId")
50
 	caseId := c.GetString("fieldId")
51
-	println("手机号:"+phone+" 案场:"+caseId)
51
+	//println("手机号:"+phone+" 案场:"+caseId)
52
 
52
 
53
 	//activityId := c.GetString("activityId")
53
 	//activityId := c.GetString("activityId")
54
 	activityId := "占位符"
54
 	activityId := "占位符"
60
 	signin.Phone = phone
60
 	signin.Phone = phone
61
 	signin.OpenId = openId
61
 	signin.OpenId = openId
62
 
62
 
63
-	//userMapping := c.Context.Get("userMap").(model.TaUserMapping)
63
+  // 机构
64
+	org := c.Context.Get("org").(model.SysOrg)
65
+	signin.OrgId = org.OrgId
64
 
66
 
65
 	res,err := c.dao.AddSignin(signin,caseId,activityId,&userMap)
67
 	res,err := c.dao.AddSignin(signin,caseId,activityId,&userMap)
66
 
68
 

+ 1
- 0
models/model/ta_checkin_record.go View File

17
 	ActivityName string    `xorm:"VARCHAR(64)"`
17
 	ActivityName string    `xorm:"VARCHAR(64)"`
18
 	CreateDate   time.Time `xorm:"DATETIME"`
18
 	CreateDate   time.Time `xorm:"DATETIME"`
19
 	Status       int       `xorm:"SMALLINT(6)"`
19
 	Status       int       `xorm:"SMALLINT(6)"`
20
+	OrgId				 string    `xorm:"VARCHAR(64)"`
20
 }
21
 }

+ 3
- 0
service/cases/signin.go View File

68
 	if activityId == ""  {
68
 	if activityId == ""  {
69
 		return nil,utils.LogError("没有活动ID")
69
 		return nil,utils.LogError("没有活动ID")
70
 	}
70
 	}
71
+	if signin.OrgId == "" {
72
+		return nil,uints.LogError("没有机构ID")
73
+	}
71
 
74
 
72
 	// 获取上下文的用户
75
 	// 获取上下文的用户
73
 	user := s.ctx.Get("user").(model.SysUser)
76
 	user := s.ctx.Get("user").(model.SysUser)