Merge branch 'cygx/fix_bug_10-09' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/cygx/activity_meet.go

@@ -352,17 +352,17 @@ func (this *ActivityMeetCoAntroller) MeetingDo() {
 		br.ErrMsg = "操作失败,Err:" + errInfo.Error()
 		return
 	}
-	//校验活动后台管理员、销售是否有修改权限
-	havePower, popupMsg, err := cygxService.CheckActivityUpdatePower(AdminUser.AdminId, activityInfo)
-	if err != nil {
-		br.Msg = "获取管理员身份信息失败"
-		br.ErrMsg = "获取管理员身份信息失败，Err:" + err.Error()
-		return
-	}
-	if !havePower {
-		br.Msg = popupMsg
-		return
-	}
+	////校验活动后台管理员、销售是否有修改权限
+	//havePower, popupMsg, err := cygxService.CheckActivityUpdatePower(AdminUser.AdminId, activityInfo)
+	//if err != nil {
+	//	br.Msg = "获取管理员身份信息失败"
+	//	br.ErrMsg = "获取管理员身份信息失败，Err:" + err.Error()
+	//	return
+	//}
+	//if !havePower {
+	//	br.Msg = popupMsg
+	//	return
+	//}
 	noMeetingUids, err := cygx.GetSignupUserIds(activityId, meetingUids) //未到会的用户ID
 	if err != nil {
 		br.Msg = "获取信息失败"

controllers/cygx/contract_allocation.go

@@ -212,7 +212,7 @@ func (this *ContractAllocationController) CompanyContractList() {
 
 	//默认只查询权益 2023-06-01 之后的合同
 	condition += ` AND c.product_id = ?  AND a.start_date > ? `
-	pars = append(pars, 2, "2023-06-01")
+	pars = append(pars, 2, "2023-05-31")
 
 	mapMoneyPoint := make(map[int]float64)
 	//研究员姓名查询
@@ -887,7 +887,7 @@ func (this *ContractAllocationController) CompanyContractStatistics() {
 
 	//默认只查询权益 2023-06-01 之后的合同
 	condition += ` AND c.product_id = ?  AND a.start_date > ?   `
-	pars = append(pars, 2, "2023-01-01")
+	pars = append(pars, 2, "2023-05-31")
 
 	//列表页数据
 	listContract, err := cygx.GetCompanyContractListJoinCompany(condition, pars, 0, 1000)

controllers/cygx/user.go

@@ -397,6 +397,7 @@ func (this *UserController) List() {
 		return
 	}
 	var userIds string
+	var userIdArr []int
 	if list != nil {
 		for k, v := range list {
 			if v.RegisterTime != "" {
@@ -426,6 +427,7 @@ func (this *UserController) List() {
 				}
 			}
 			userIds += strconv.Itoa(int(v.UserId)) + ","
+			userIdArr = append(userIdArr, int(v.UserId))
 		}
 		userIds = strings.TrimRight(userIds, ",")
 		splitList, err := cygx.GetCygxCompanyUserListSplit(userIds)
@@ -448,6 +450,8 @@ func (this *UserController) List() {
 			}
 		}
 
+		UserRemindListMap := cygxService.GetCygxUserRemindListMap(userIdArr)
+
 		for k, v := range list {
 			for _, vsplit := range splitList {
 				if vsplit.UserId == v.UserId {
@@ -468,6 +472,7 @@ func (this *UserController) List() {
 			if mapUserRemarks[int(v.UserId)] != "" {
 				list[k].Content = mapUserRemarks[int(v.UserId)]
 			}
+			list[k].IsRemind = UserRemindListMap[int(v.UserId)]
 		}
 		for k := range list {
 			list[k].InteractionNum = list[k].HistoryNum + list[k].CountNum + list[k].IndustryFllowNum + list[k].DepartmentFollowNum + list[k].KeyWordNum + list[k].OnLineNum + list[k].OfficeNum + list[k].ChartNum + list[k].TripNum + list[k].RoadshowVideoNum + list[k].ActivityVideoNum + list[k].ActivityVoiceNum

services/cygx/user_remind.go

@@ -0,0 +1,40 @@
+package cygx
+
+import (
+	"errors"
+	"fmt"
+	"hongze/hz_crm_api/models/cygx"
+	"hongze/hz_crm_api/services/alarm_msg"
+	"hongze/hz_crm_api/utils"
+)
+
+// 根据用户ID获取那些用户设置了互动提醒
+func GetCygxUserRemindListMap(userIds []int) (mapResp map[int]bool) {
+	lenArr := len(userIds)
+	if lenArr == 0 {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err)
+			go alarm_msg.SendAlarmMsg("根据用户ID获取那些用户设置了互动提醒，信息失败，GetCygxUserRemindListMap Err："+err.Error(), 3)
+		}
+	}()
+	var condition string
+	var pars []interface{}
+
+	condition = ` AND  user_id IN (` + utils.GetOrmInReplace(lenArr) + `)`
+	pars = append(pars, userIds)
+	//获取分类名称
+	userRemindList, e := cygx.GetCygxUserRemindList(condition, pars, 0, 0)
+	if e != nil {
+		err = errors.New("GetCygxUserRemindList, Err: " + e.Error())
+		return
+	}
+	mapResp = make(map[int]bool, 0)
+	for _, v := range userRemindList {
+		mapResp[v.UserId] = true
+	}
+	return
+}