fix:分配

models/tables/community_question/community_question.go

@@ -24,8 +24,8 @@ type CommunityQuestion struct {
 	ResearchGroupSecondName string    `description:"研究方向二级分组名称"`
 	DistributeAdminId       int       `description:"分配人admin_id"`
 	DistributeTime          time.Time `description:"分配时间"`
-	ChartPermissionId       int       `description:"关联权限ID"`
-	ChartPermissionName     string    `description:"关联权限name"`
+	VarietyTagId            int       `description:"标签ID"`
+	VarietyTagName          string    `description:"标签名称"`
 	IsRead                  int       `description:"用户是否已读 0-未读 1-已读"`
 	ReplierIsRead           int       `description:"回复人是否已读 0-未读 1-已读"`
 	ReplyStatus             int       `description:"状态 1-待分配 2-待回答 3-已回答"`

services/yb/community_question.go

@@ -10,6 +10,8 @@ import (
 	"hongze/hongze_mobile_admin/models/tables/sys_role"
 	"hongze/hongze_mobile_admin/models/tables/sys_role_admin"
 	"hongze/hongze_mobile_admin/models/tables/user_record"
+	"hongze/hongze_mobile_admin/models/tables/variety_classify"
+	"hongze/hongze_mobile_admin/models/tables/variety_tag"
 	"hongze/hongze_mobile_admin/models/tables/wx_user"
 	"hongze/hongze_mobile_admin/services"
 	"hongze/hongze_mobile_admin/services/alarm_msg"
@@ -82,8 +84,6 @@ func GetQuestionList(condition string, pars []interface{}, startSize, pageSize i
 			ResearchGroupSecondId:   v.ResearchGroupSecondId,
 			ResearchGroupFirstName:  v.ResearchGroupFirstName,
 			ResearchGroupSecondName: v.ResearchGroupSecondName,
-			ChartPermissionId:       v.CommunityQuestionId,
-			ChartPermissionName:     v.ChartPermissionName,
 			ReplyStatus:             v.ReplyStatus,
 			MsgSendStatus:           v.MsgSendStatus,
 			NeedRedistribute:        needReset,
@@ -215,13 +215,15 @@ func DistributeQuestion(questionId, adminId, researchGroupFirstId, researchGroup
 		errMsg = "该研究员未关注公众号，无法收到消息通知"
 	}
 	// 分组、品种权限信息
-	firstGroup, e := admin.GetResearchGroupById(researchGroupFirstId)
+	//firstGroup, e := admin.GetResearchGroupById(researchGroupFirstId)
+	firstGroup, e := variety_classify.GetVarietyClassifyById(researchGroupFirstId)
 	if e != nil {
 		errMsg = "分配失败, 一级分组信息有误"
 		err = errors.New("获取一级分组信息失败, Err:" + e.Error())
 		return
 	}
-	secondGroup, e := admin.GetResearchGroupById(researchGroupSecondId)
+	//secondGroup, e := admin.GetResearchGroupById(researchGroupSecondId)
+	secondGroup, e := variety_tag.GetVarietyTagById(researchGroupSecondId)
 	if e != nil {
 		errMsg = "分配失败, 二级分组信息有误"
 		err = errors.New("获取二级分组信息失败, Err:" + e.Error())
@@ -237,8 +239,8 @@ func DistributeQuestion(questionId, adminId, researchGroupFirstId, researchGroup
 	// 更新提问信息
 	updateCols := make([]string, 0)
 	updateCols = append(updateCols, "ReplierUserId", "ReplierOpenid", "ReplierAdminId", "ReplierRealName", "ReplierAvatar", "ResearchGroupFirstId",
-		"ResearchGroupSecondId", "ResearchGroupFirstName", "ResearchGroupSecondName", "DistributeAdminId", "DistributeTime", "ChartPermissionId",
-		"ChartPermissionName", "ReplyStatus", "ReplierIsRead", "MsgSendStatus", "ModifyTime")
+		"ResearchGroupSecondId", "ResearchGroupFirstName", "ResearchGroupSecondName", "DistributeAdminId", "DistributeTime", "VarietyTagId",
+		"VarietyTagName", "ReplyStatus", "ReplierIsRead", "MsgSendStatus", "ModifyTime")
 	item.ReplierUserId = replierUserId
 	item.ReplierOpenid = replierOpenid
 	item.ReplierAdminId = adminId
@@ -246,12 +248,12 @@ func DistributeQuestion(questionId, adminId, researchGroupFirstId, researchGroup
 	item.ReplierAvatar = adminInfo.AdminAvatar
 	item.ResearchGroupFirstId = researchGroupFirstId
 	item.ResearchGroupSecondId = researchGroupSecondId
-	item.ResearchGroupFirstName = firstGroup.ResearchGroupName
-	item.ResearchGroupSecondName = secondGroup.ResearchGroupName
+	item.ResearchGroupFirstName = firstGroup.ClassifyName
+	item.ResearchGroupSecondName = secondGroup.TagName
 	item.DistributeAdminId = distributeId
 	item.DistributeTime = time.Now().Local()
-	item.ChartPermissionId = 0
-	item.ChartPermissionName = ""
+	item.VarietyTagId = secondGroup.VarietyTagId
+	item.VarietyTagName = secondGroup.TagName
 	item.ReplyStatus = 2
 	item.ReplierIsRead = 0
 	item.MsgSendStatus = 0