Browse Source

no message

zhangchuanxing 2 weeks ago
parent
commit
5722c81252
3 changed files with 28 additions and 6 deletions
  1. 19 0
      models/admin.go
  2. 3 3
      services/cygx_template_record_source.go
  3. 6 3
      services/morning_meeting.go

+ 19 - 0
models/admin.go

@@ -62,6 +62,13 @@ func GetSysAdminById(adminId int) (item *Admin, err error) {
 	return
 }
 
+func GetSysAdminByName(realName string) (item *Admin, err error) {
+	sql := `SELECT * FROM admin WHERE real_name=? `
+	o := orm.NewOrmUsingDB("weekly_report")
+	err = o.Raw(sql, realName).QueryRow(&item)
+	return
+}
+
 func GetSysAdminByMobile(mobile string) (item *Admin, err error) {
 	sql := `SELECT * FROM admin WHERE mobile=? LIMIT 1 `
 	o := orm.NewOrmUsingDB("weekly_report")
@@ -138,3 +145,15 @@ func GetAdminByAdminIds(adminId []int) (items []*AdminMobileResp, err error) {
 	_, err = o.Raw(sql, adminId).QueryRows(&items)
 	return
 }
+
+// 根据多个用户名获取管理员列表信息
+func GetAdminByRealName(realName []string) (items []*AdminMobileResp, err error) {
+	lenArr := len(realName)
+	if lenArr == 0 {
+		return
+	}
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := ` SELECT mobile  FROM admin  WHERE  enabled = 1 AND  real_name  IN (` + utils.GetOrmInReplace(lenArr) + `)`
+	_, err = o.Raw(sql, realName).QueryRows(&items)
+	return
+}

+ 3 - 3
services/cygx_template_record_source.go

@@ -43,10 +43,10 @@ func SendCygxTemplateRecordSource(log models.WxUserRaiLabelRedis) (err error) {
 		err = errors.New("GetCompanyProductByCompanyIdAndProductId, Err:" + e.Error())
 		return
 	}
-	var adminIds []int
+	var realNames []string
 
-	adminIds = append(adminIds, companyProduct.SellerId, companyProduct.ShareSellerId)
-	listAdmin, e := models.GetAdminByAdminIds(adminIds)
+	realNames = append(realNames, companyProduct.SellerName, strings.Replace(companyProduct.ShareSeller, "6", "", -1))
+	listAdmin, e := models.GetAdminByRealName(realNames)
 	if e != nil {
 		err = errors.New("GetAdminByAdminIds, Err: " + e.Error())
 		return

+ 6 - 3
services/morning_meeting.go

@@ -321,8 +321,8 @@ func HandleMorningMeetingReviewPush(meetingId int) {
 }
 
 //func init() {
-//	//SendWxMsgMorningMeetingApproveResult(1, 1)
-//	SendWxMsgMorningMeetingApproveSubmit(1)
+//	SendWxMsgMorningMeetingApproveResult(22, 1)
+//	//SendWxMsgMorningMeetingApproveSubmit(1)
 //}
 
 // 晨会点评内容完成审核时,给提交人发送模板消息(服务销售openID取销售原账号对应的openID,根据姓名匹配查询)
@@ -352,7 +352,7 @@ func SendWxMsgMorningMeetingApproveResult(logId, status int) (err error) {
 	}
 
 	//获取建会人员信息
-	admin, e := models.GetSysAdminById(reviewDetail.OpUserId)
+	admin, e := models.GetSysAdminByName(strings.Replace(reviewDetail.OpUserName, "6", "", -1))
 	if e != nil {
 		err = errors.New("GetMorningMeetingReviewById, Err: " + e.Error())
 		return
@@ -363,6 +363,7 @@ func SendWxMsgMorningMeetingApproveResult(logId, status int) (err error) {
 		err = errors.New("GetWxOpenIdByMobileList, Err: " + e.Error())
 		return
 	}
+
 	if len(openIdList) == 0 {
 		return
 	}
@@ -371,6 +372,8 @@ func SendWxMsgMorningMeetingApproveResult(logId, status int) (err error) {
 	for _, v := range openIdList {
 		openIdArr = append(openIdArr, v.OpenId)
 	}
+	//fmt.Println(openIdArr)
+	//return
 	redirectUrl := ""
 
 	keyword1 = "晨会点评内容审核"