no message

controllers/cygx/activity.go

@@ -88,6 +88,7 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 
 	//处理识图建会的会议信息列表 因为活动发布处理的业务逻辑过多，方便后期统一维护这里 根据 list 数据类型自己拼接 活动的 body  查研观向 11.12
 	listImgToText := req.ListImgToText
+
 	if len(listImgToText) > 0 {
 		var errmsg string
 		req, err, errmsg = cygxService.MakeActivityReqText(listImgToText)
@@ -436,7 +437,14 @@ func (this *ActivityCoAntroller) PreserveAndPublish() {
 			item.IsYidongConduct = req.IsYidongConduct
 			item.IsCanOutboundCall = req.IsCanOutboundCall
 			item.IsNeedEmail = isNeedEmail
-			item.SiginupDeadline = siginupDeadline
+
+			if len(listImgToText) > 0 {
+				resultTime := utils.StrTimeToTime(item.ActivityTime)                                       //时间字符串格式转时间格式
+				item.SiginupDeadline = resultTime.AddDate(0, 0, -1).Format(utils.FormatDate) + " 15:30:00" //批量建会报名截止之前默认：活动前一天15:30:00
+			} else {
+				item.SiginupDeadline = siginupDeadline
+			}
+
 			if isResearchPoints == 1 {
 				item.IsResearchPoints = 1
 			}

services/cygx/activity_ocr.go

@@ -51,10 +51,10 @@ func ConvertActivityTitmeYMD(TitmeYMD string) (titmeYMDNew string) {
 // 处理时分PM格式
 func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
 	titmeHMNew = titmeHM
-	var hNum int
+	//var hNum int
 	var amOrPm string
 	if strings.Contains(titmeHM, "PM") {
-		hNum = 12
+		//hNum = 12
 		amOrPm = "PM"
 	} else {
 		amOrPm = "AM"
@@ -67,7 +67,7 @@ func ConvertActivityTitmeHM(titmeHM string) (titmeHMNew string) {
 	}
 	hourNum, _ := strconv.Atoi(sliceHm[0])
 	minute := sliceHm[1]
-	titmeHMNew = strconv.Itoa(hNum+hourNum) + ":" + minute + " " + amOrPm
+	titmeHMNew = strconv.Itoa(hourNum) + ":" + minute + " " + amOrPm
 	return
 }
 
@@ -85,29 +85,38 @@ func MakeActivityReqText(list []*cygx.AliyunOcrTextActivityResp) (req cygx.Activ
 		v.TitmeYMD = strings.Replace(v.TitmeYMD, "日", "", -1)
 		weeknum := utils.StrDateTimeToWeek(v.TitmeYMD + " 00:00:00")
 
-		var condition string
-		var pars []interface{}
-		condition = " AND activity_type_id = 3 AND  activity_time = ? AND temporary_label = ? "
+		havePm := strings.Contains(v.TitmeHM, "PM")
 		var activityTime string
 		activityTime = strings.Replace(v.TitmeHM, " ", "", -1)
 		activityTime = strings.Replace(activityTime, "AM", "", -1)
 		activityTime = strings.Replace(activityTime, "PM", "", -1)
+
 		activityTime = v.TitmeYMD + " " + activityTime + ":00"
-		//fmt.Println(activityTime)
+		resultTime := utils.StrTimeToTime(activityTime)
+		var amOrPm string
+		if havePm {
+			//前端传过来的是 2：00PM 这里转成 14:00 PM
+			resultTime = resultTime.Add(12 * time.Hour)
+			activityTime = resultTime.Format(utils.FormatDateTime)
+			amOrPm = "PM"
+		} else {
+			amOrPm = "AM"
+		}
+		var condition string
+		var pars []interface{}
+		condition = " AND activity_type_id = 3 AND  activity_time = ? AND temporary_label = ? "
 		pars = append(pars, activityTime, company)
 		total, e := cygx.GetActivityCount(condition, pars)
 		if e != nil {
 			err = errors.New("GetActivityCount，Err" + e.Error())
 			return
 		}
-		//fmt.Println(total)
 
-		//return
 		if total > 0 {
 			errMsg = "相同时段已存在对应活动"
 			return
 		}
-		ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{TIME}}", v.TitmeYMD+"("+weeknum+")"+v.TitmeHM, -1)
+		ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{TIME}}", v.TitmeYMD+"("+weeknum+")"+resultTime.Format(utils.FormatTimeHm)+amOrPm, -1)
 		if !utils.CheckStrHaveLetter(company) {
 			ActivityOcrTmp = strings.Replace(ActivityOcrTmp, "{{LANGUAGE}}", "中文", -1)
 		} else {