Merge branch 'crm/crm_17.0_ficc' of http://8.136.199.33:3000/hongze/hz_crm_api into debug

controllers/roadshow/activity.go

@@ -5,8 +5,8 @@ import (
 	"github.com/rdlucklib/rdluck_tools/paging"
 	"hongze/hz_crm_api/controllers"
 	"hongze/hz_crm_api/models"
-	"hongze/hz_crm_api/models/cygx"
 	"hongze/hz_crm_api/models/roadshow"
+	"hongze/hz_crm_api/models/system"
 	"hongze/hz_crm_api/utils"
 	"strconv"
 	"strings"
@@ -59,13 +59,13 @@ func (this *ActivityController) Add() {
 		return
 	}
 
-	if len(req.SellerList) <= 0 {
+	if len(req.SellerId) <= 0 {
 		br.Msg = "请选择销售！"
 		return
 	}
 
-	researcherMap := make(map[int]string)
-	var checkIsAdd []string
+	//researcherMap := make(map[int]string)
+	//var checkIsAdd []string
 
 	//if req.EnglishCompany == 1 {
 	//	englishCompany, err := models.GetEnglishCompanyById(req.CompanyId)
@@ -76,101 +76,89 @@ func (this *ActivityController) Add() {
 	//	}
 	//}
 
-	//获取所有自定义的权益研究员
-	sysUserList, err := cygx.GetAskEmailListResearcher()
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败,GetAskEmailList Err: " + err.Error()
+	//var tipMsg string
+	//for _, v := range req.SellerList {
+	//	if req.SellerId <= 0 {
+	//		br.Msg = "请选择销售！"
+	//		return
+	//	}
+	if req.SellerName == "" {
+		br.Msg = "请选择销售！"
 		return
 	}
-	raiAskadminMap := make(map[int]bool, 0)
-	for _, v := range sysUserList {
-		raiAskadminMap[v.AdminId] = true
+	if req.StartDate == "" {
+		br.Msg = "请选择开始日期！"
+		return
+	}
+	if req.EndDate == "" {
+		br.Msg = "请选择结束日期！"
+		return
+	}
+	if req.StartTime == "" {
+		br.Msg = "请选择开始时间！"
+		return
+	}
+	if req.EndTime == "" {
+		br.Msg = "请选择结束时间！"
+		return
+	}
+	if req.StartWeek == "" {
+		br.Msg = "请选择周！"
+		return
 	}
 
-	//var tipMsg string
-	for _, v := range req.SellerList {
-		if v.SellerId <= 0 {
-			br.Msg = "请选择销售！"
-			return
-		}
-		if v.SellerName == "" {
-			br.Msg = "请选择销售！"
-			return
-		}
-		if v.StartDate == "" {
-			br.Msg = "请选择开始日期！"
-			return
-		}
-		if v.EndDate == "" {
-			br.Msg = "请选择结束日期！"
-			return
-		}
-		if v.StartTime == "" {
-			br.Msg = "请选择开始时间！"
-			return
-		}
-		if v.EndTime == "" {
-			br.Msg = "请选择结束时间！"
-			return
-		}
-		if v.StartWeek == "" {
-			br.Msg = "请选择周！"
-			return
-		}
-
-		if v.EndWeek == "" {
-			br.Msg = "请选择周！"
-			return
-		}
-
-		startDateTime := v.StartDate + " " + v.StartTime
-		endDateTime := v.EndDate + " " + v.EndTime
-
-		startP, _ := time.ParseInLocation(utils.FormatDateTime, startDateTime, time.Local)
-		endP, _ := time.ParseInLocation(utils.FormatDateTime, endDateTime, time.Local)
-
-		if startP.Before(time.Now()) || startP.Equal(time.Now()) {
-			br.Msg = "活动开始时间不能小于当前时间！"
-			return
-		}
+	if req.EndWeek == "" {
+		br.Msg = "请选择周！"
+		return
+	}
 
-		if endP.Before(time.Now()) || endP.Equal(time.Now()) {
-			br.Msg = "活动结束时间不能小于当前时间！"
-			return
-		}
+	//startDateTime := req.StartDate + " " + req.StartTime
+	//endDateTime := req.EndDate + " " + req.EndTime
 
-		if startP.After(endP) || startP.Equal(endP) {
-			br.Msg = "活动开始时间应小于结束时间！"
-			return
-		}
+	//startP, _ := time.ParseInLocation(utils.FormatDateTime, startDateTime, time.Local)
+	//endP, _ := time.ParseInLocation(utils.FormatDateTime, endDateTime, time.Local)
+	//
+	//if startP.Before(time.Now()) || startP.Equal(time.Now()) {
+	//	br.Msg = "活动开始时间不能小于当前时间！"
+	//	return
+	//}
+	//
+	//if endP.Before(time.Now()) || endP.Equal(time.Now()) {
+	//	br.Msg = "活动结束时间不能小于当前时间！"
+	//	return
+	//}
+	//
+	//if startP.After(endP) || startP.Equal(endP) {
+	//	br.Msg = "活动开始时间应小于结束时间！"
+	//	return
+	//}
 
-		if realName, ok := researcherMap[v.SellerId]; ok {
-			br.Msg = "销售：" + realName + " 被重复选择"
-			return
-		}
-		researcherMap[v.SellerId] = v.SellerName
+	//if realName, ok := researcherMap[v.SellerId]; ok {
+	//	br.Msg = "销售：" + realName + " 被重复选择"
+	//	return
+	//}
+	//researcherMap[v.SellerId] = v.SellerName
 
-		//校验活动时间冲突
-		//{
-		//	calendarCount, err := roadshowService.CheckCalendar(startDateTime, endDateTime, "1,2", v.ResearcherId, 0)
-		//	if err != nil {
-		//		br.Msg = "时间冲突检测失败！"
-		//		br.ErrMsg = "时间冲突检测失败-CheckCalendar！Err:" + err.Error()
-		//		return
-		//	}
-		//	if calendarCount > 0 {
-		//		checkIsAdd = append(checkIsAdd, v.ResearcherName)
-		//	}
-		//}
-	}
+	//校验活动时间冲突
+	//{
+	//	calendarCount, err := roadshowService.CheckCalendar(startDateTime, endDateTime, "1,2", v.ResearcherId, 0)
+	//	if err != nil {
+	//		br.Msg = "时间冲突检测失败！"
+	//		br.ErrMsg = "时间冲突检测失败-CheckCalendar！Err:" + err.Error()
+	//		return
+	//	}
+	//	if calendarCount > 0 {
+	//		checkIsAdd = append(checkIsAdd, v.ResearcherName)
+	//	}
+	//}
+	//}
 
-	if len(checkIsAdd) > 0 {
-		br.Msg = strings.Join(checkIsAdd, ",") + " 时间已被占用！"
-		br.ErrMsg = "时间冲突检测失败-CheckMattersCount！"
-		br.IsSendEmail = false
-		return
-	}
+	//if len(checkIsAdd) > 0 {
+	//	br.Msg = strings.Join(checkIsAdd, ",") + " 时间已被占用！"
+	//	br.ErrMsg = "时间冲突检测失败-CheckMattersCount！"
+	//	br.IsSendEmail = false
+	//	return
+	//}
 
 	rsActivity := new(roadshow.RsActivity)
 	rsActivity.SysUserId = sysUser.AdminId
@@ -189,18 +177,19 @@ func (this *ActivityController) Add() {
 		br.ErrMsg = "保存日历活动信息失败！Err:" + err.Error()
 		return
 	}
+	sellerList, err := system.GetSysAdminByIds(req.SellerId)
 	//if researcherId != 99 {
-	for _, v := range req.SellerList {
+	for _, v := range sellerList {
 		researcher := new(roadshow.RsActivitySeller)
 		researcher.RsActivityId = int(rsActivityId)
-		researcher.SellerId = v.SellerId
-		researcher.SellerName = v.SellerName
-		researcher.StartDate = v.StartDate
-		researcher.EndDate = v.EndDate
-		researcher.StartTime = v.StartTime
-		researcher.EndTime = v.EndTime
-		researcher.StartWeek = v.StartWeek
-		researcher.EndWeek = v.EndWeek
+		researcher.SellerId = v.AdminId
+		researcher.SellerName = v.RealName
+		researcher.StartDate = req.StartDate
+		researcher.EndDate = req.EndDate
+		researcher.StartTime = req.StartTime
+		researcher.EndTime = req.EndTime
+		researcher.StartWeek = req.StartWeek
+		researcher.EndWeek = req.EndWeek
 		researcher.CreateTime = time.Now()
 		researcher.ModifyTime = time.Now()
 		researcher.Status = 2

models/roadshow/activity.go

@@ -16,8 +16,16 @@ type AddActivitySellerReq struct {
 	Theme            string `description:"会议主题"`
 	CooperationName  string `description:"合作方名称"`
 	ActivityCategory string `description:"活动类别"`
-	SellerList       []*ActivitySellerReq
-	EnglishCompany   int `description:"是否为英文客户"`
+	//SellerList       []*ActivitySellerReq
+	EnglishCompany int    `description:"是否为英文客户"`
+	SellerId       string `description:"销售id，多个用 ,隔开"`
+	SellerName     string `description:"销售名称"`
+	StartDate      string `description:"开始日期"`
+	EndDate        string `description:"结束日期"`
+	StartTime      string `description:"开始时间"`
+	EndTime        string `description:"结束时间"`
+	StartWeek      string `description:"开始日期对应周"`
+	EndWeek        string `description:"结束日期对应周"`
 }
 
 type RsActivityIdReq struct {