no message

controllers/activity.go

@@ -1701,19 +1701,21 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 		br.ErrMsg = "请登录，SysUser Is Empty"
 		return
 	}
+
 	uid := user.UserId
 	pageSize, _ := this.GetInt("PageSize")
 	currentIndex, _ := this.GetInt("CurrentIndex")
-	source, _ := this.GetInt("Source")
+	//source, _ := this.GetInt("Source")
 	label := this.GetString("Label")
 	chartPermissionIds := this.GetString("ChartPermissionIds")
 	whichDay := this.GetString("WhichDay")
+	//whichTime := this.GetString("WhichTime")
 	activeState := this.GetString("ActiveState")
 	activityTypeId := this.GetString("ActivityTypeId")
 	keyWord := this.GetString("KeyWord")
 	playBack, _ := this.GetInt("PlayBack")
 	filter, _ := this.GetInt("Filter")
-	typeName := this.GetString("TypeName")
+	isPower, _ := this.GetInt("IsPower")
 	activityId, _ := this.GetInt("ActivityId")             // 仅用于判断【新】标签
 	isExternalLabel, _ := this.GetInt("IsExternalLabel")   //
 	isResearchPoints, _ := this.GetInt("IsResearchPoints") //
@@ -1755,63 +1757,138 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	//userType, permissionStr, err := services.GetUserType(user.CompanyId)
 	var condition string
+	var conditioninit string //初始化搜索条件
 	var pars []interface{}
 	var activityList []*models.ActivityDetail
 	mapDingActivityId := make(map[int]int)
-	//进行中的活动拍在最上面
-	//if keyWord != "" {
-	//	conditionActivity, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, strconv.Itoa(2), label, 0, source, keyWord)
-	//	if err != nil && err.Error() != utils.ErrNoRow() {
-	//		br.Msg = "获取失败"
-	//		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	if source == 1 {
-	//		condition += ` AND art.yidong_activity_id = '' `
-	//	}
-	//	condition += ` AND art.is_limit_people = 1 AND art.publish_status = 1 ` + conditionActivity
-	//	condition += ` ORDER BY art.activity_time ASC   `
-	//	listDing, err := models.GetActivityListAll(condition, pars, uid, startSize, pageSize, playBack)
-	//	if err != nil && err.Error() != utils.ErrNoRow() {
-	//		br.Msg = "获取失败"
-	//		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
-	//		return
-	//	}
-	//	if len(listDing) > 0 {
-	//		for _, v := range listDing {
-	//			activityList = append(activityList, v)
-	//			mapDingActivityId[v.ActivityId] = v.ActivityId
-	//		}
-	//	}
-	//	return
-	//	fmt.Println("len", len(listDing))
-	//}
-	//condition = " AND art.is_limit_people = 1 AND art.publish_status = 1  "
+
+	//主题
+	if label != "" {
+		conditioninit += ` AND art.label  LIKE "%` + label + `%" `
+	}
+	//行业名称
+	if len(chartPermissionIds) > 0 {
+		conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+	}
+	//哪一天
+	if whichDay != "" {
+		var startDate string
+		var endDate string
+		if whichDay == "1" {
+			startDate = time.Now().Format(utils.FormatDate)
+			endDate = startDate
+		} else if whichDay == "2" {
+			startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
+			endDate = startDate
+		} else if whichDay == "3" {
+			startDate = utils.GetNowWeekMonday().Format(utils.FormatDate)
+			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
+		} else if whichDay == "4" {
+			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
+			endDate = utils.GetLastWeekSunday().Format(utils.FormatDate)
+		} else if whichDay == "5" {
+			startDate = utils.GetNowMonthFirstDay().Format(utils.FormatDate)
+			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
+		} else if whichDay == "6" {
+			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
+			endDate = utils.GetLastMonthLastDay().Format(utils.FormatDate)
+		} else if whichDay == "1,2" {
+			startDate = time.Now().Format(utils.FormatDate)
+			endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
+		} else if whichDay == "3,4" {
+			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
+			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
+		} else if whichDay == "5,6" {
+			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
+			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
+		} else {
+			startDate = time.Now().Format(utils.FormatDate)
+			endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
+		}
+		conditioninit += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
+		conditioninit += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
+	}
+
+	//活动状态搜索
+	if activeState != "" {
+		// 默认查看未开始跟进行中
+		if activeState == "1" {
+			conditioninit += ` AND art.active_state  IN (1,2)`
+		} else {
+			conditioninit += ` AND art.active_state  IN (` + activeState + `)`
+		}
+	} else {
+		conditioninit += ` AND art.active_state  IN (1,2)`
+	}
+
+	// 如果是分析师电话会，那么可以连同C类一起查看
+	if activityTypeId != "" {
+		if activityTypeId == strconv.Itoa(utils.ANALYST_TELL_ACTIVITY_TYPE_ID) {
+			conditioninit += `  AND art.activity_type_id IN (` + activityTypeId + "," + strconv.Itoa(utils.C_CLASS_ACTIVITY_TYPE_ID) + `)`
+		} else {
+			conditioninit += `  AND art.activity_type_id IN (` + activityTypeId + `)`
+		}
+	}
+
+	//关键词搜索
+	if keyWord != "" {
+		conditioninit += ` AND (art.label   REGEXP '` + keyWord + `' OR art.activity_name  REGEXP '` + keyWord + `' ) `
+	}
+
+	//回放
+	if playBack == 1 {
+		//获取所有带回放的活动ID
+		playBackActivityIds, err := services.GetActivityPlayBackActivityIds()
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		conditioninit += ` AND art.activity_id IN ( ` + playBackActivityIds + `) `
+	}
+
+	//音频视频  1:视频 2:音频
+	if filter > 0 {
+		videoOrVoiceActivityIds, err := services.GetActivityVideoOrVoiceActivityIds(filter)
+		if err != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = "获取失败，Err:" + err.Error()
+			return
+		}
+		conditioninit += ` AND art.activity_id IN ( ` + videoOrVoiceActivityIds + `) `
+	}
+	//是否为外部资源
+	if isExternalLabel == 1 {
+		conditioninit += ` AND art.is_external_label = 1 `
+	}
+	if isResearchPoints == 1 {
+		conditioninit += ` AND art.is_research_points = 1 `
+	}
+
 	//活动可见限制
-	conditionActivityAll, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 3)
+	//conditionActivityAll, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 3)
+	conditionActivity, err := services.ActivityConditioninitSql(user, conditioninit, isPower)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()
 		return
 	}
-	if source == 1 {
-		condition += ` AND art.yidong_activity_id = '' `
-	}
-	var conditionCount string
-	conditionCount = condition + conditionActivityAll
-	total, err := models.GetActivityCount(conditionCount, playBack, pars, filter)
+	condition += `  AND art.publish_status = 1 ` + conditionActivity
+	//var conditionCount string
+	//conditionCount = condition + conditionActivityAll
+	total, err := models.GetActivityCount(condition, playBack, pars, filter)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
 	//搜索关键词初始化
-	conditionActivityKey, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 1)
-	if err != nil && err.Error() != utils.ErrNoRow() {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
+	//conditionActivityKey, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 1)
+	//if err != nil && err.Error() != utils.ErrNoRow() {
+	//	br.Msg = "获取失败"
+	//	br.ErrMsg = "获取失败，Err:" + err.Error()
+	//	return
+	//}
 	var conditionOrder string
 	if activeState == "2" || activeState == "3" {
 		conditionOrder = ` ORDER BY art.activity_time DESC  `
@@ -1827,52 +1904,53 @@ func (this *ActivityCoAntroller) ActivityListNew() {
 	if activeState == "1" {
 		conditionOrder = ` ORDER BY art.activity_time ASC  `
 	}
-	conditionActivityKey += condition + conditionOrder
+	//conditionActivityKey += condition + conditionOrder
+	condition += conditionOrder
 	//fmt.Println(conditionOrder)
 
-	list, errList := models.GetActivityListNew(conditionActivityKey, pars, uid, startSize, pageSize, playBack, filter, typeName)
+	list, errList := models.GetActivityListNew(condition, pars, uid, startSize, pageSize, playBack, filter, "")
 	if errList != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + errList.Error()
 		return
 	}
-	if keyWord != "" {
-		keyWordArr, err := services.GetIndustryMapNameSliceV3(keyWord)
-		if err != nil {
-			br.Msg = "获取失败"
-			br.ErrMsg = "获取分词失败,GetIndustryMapNameSliceV3 Err: " + err.Error()
-			return
-		}
-		keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
-
-		startSizeIk := utils.StartIndex(currentIndex, pageSize)
-		startSizeIk = startSizeIk - total
-		if startSizeIk < 0 {
-			startSizeIk = 0
-		}
-		var pageSizeIk int
-		pageSizeIk = pageSize - len(list)
-		if pageSizeIk > 0 {
-			//搜索关键词联想
-			conditionActivityIk, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 2)
-			if err != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取失败，Err:" + err.Error()
-				return
-			}
-			conditionActivityIk += condition + conditionOrder
-			listIk, errList := models.GetActivityListNew(conditionActivityIk, pars, uid, startSizeIk, pageSizeIk, playBack, filter, typeName)
-			if errList != nil {
-				br.Msg = "获取失败"
-				br.ErrMsg = "获取失败，Err:" + errList.Error()
-				return
-			}
-
-			for _, item := range listIk {
-				list = append(list, item)
-			}
-		}
-	}
+	//if keyWord != "" {
+	//	keyWordArr, err := services.GetIndustryMapNameSliceV3(keyWord)
+	//	if err != nil {
+	//		br.Msg = "获取失败"
+	//		br.ErrMsg = "获取分词失败,GetIndustryMapNameSliceV3 Err: " + err.Error()
+	//		return
+	//	}
+	//	keyWordArr = services.RemoveDuplicatesAndEmpty(keyWordArr)
+	//
+	//	startSizeIk := utils.StartIndex(currentIndex, pageSize)
+	//	startSizeIk = startSizeIk - total
+	//	if startSizeIk < 0 {
+	//		startSizeIk = 0
+	//	}
+	//	var pageSizeIk int
+	//	pageSizeIk = pageSize - len(list)
+	//	if pageSizeIk > 0 {
+	//		//搜索关键词联想
+	//		conditionActivityIk, err := services.GetActivityonditionList(user, activityTypeId, chartPermissionIds, whichDay, activeState, label, 0, source, keyWord, playBack, 2)
+	//		if err != nil {
+	//			br.Msg = "获取失败"
+	//			br.ErrMsg = "获取失败，Err:" + err.Error()
+	//			return
+	//		}
+	//		conditionActivityIk += condition + conditionOrder
+	//		listIk, errList := models.GetActivityListNew(conditionActivityIk, pars, uid, startSizeIk, pageSizeIk, playBack, filter, typeName)
+	//		if errList != nil {
+	//			br.Msg = "获取失败"
+	//			br.ErrMsg = "获取失败，Err:" + errList.Error()
+	//			return
+	//		}
+	//
+	//		for _, item := range listIk {
+	//			list = append(list, item)
+	//		}
+	//	}
+	//}
 
 	var isShow bool
 	isShow = services.GetShowSustainable()
@@ -2174,6 +2252,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	if chartPermissionIds != "" {
 		chartPermissionIds += ",1"
 	}
+
 	userType, _, err := services.GetUserType(user.CompanyId)
 	if err != nil {
 		br.Msg = "获取失败"
@@ -2183,6 +2262,7 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	var startSize int
 	pageSize = 1000
 	var sortTime string
+	var conditioninit string
 	var pars []interface{}
 	//活动可见限制
 
@@ -2208,16 +2288,73 @@ func (this *ActivityCoAntroller) LabelTypeListV5() {
 	permissionNameStr = strings.Replace(permissionNameStr, "(主观)", "", -1)
 	permissionNameStr = strings.Replace(permissionNameStr, "(客观)", "", -1)
 	permissionNameStr = strings.TrimRight(permissionNameStr, ",")
+	//
+	//// 查研观向7.4-始终查询宏观的权限(无论是否有权限)
+	//if permissionNameStr == `` {
+	//	permissionNameStr = `'宏观'`
+	//} else {
+	//	permissionNameStr += `, '宏观'`
+	//}
 
-	// 查研观向7.4-始终查询宏观的权限(无论是否有权限)
-	if permissionNameStr == `` {
-		permissionNameStr = `'宏观'`
+	//行业名称
+	if len(chartPermissionIds) > 0 {
+		conditioninit += ` AND art.chart_permission_id  IN (` + chartPermissionIds + `)`
+	}
+	//哪一天
+	if whichDay != "" {
+		var startDate string
+		var endDate string
+		if whichDay == "1" {
+			startDate = time.Now().Format(utils.FormatDate)
+			endDate = startDate
+		} else if whichDay == "2" {
+			startDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
+			endDate = startDate
+		} else if whichDay == "3" {
+			startDate = utils.GetNowWeekMonday().Format(utils.FormatDate)
+			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
+		} else if whichDay == "4" {
+			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
+			endDate = utils.GetLastWeekSunday().Format(utils.FormatDate)
+		} else if whichDay == "5" {
+			startDate = utils.GetNowMonthFirstDay().Format(utils.FormatDate)
+			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
+		} else if whichDay == "6" {
+			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
+			endDate = utils.GetLastMonthLastDay().Format(utils.FormatDate)
+		} else if whichDay == "1,2" {
+			startDate = time.Now().Format(utils.FormatDate)
+			endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
+		} else if whichDay == "3,4" {
+			startDate = utils.GetLastWeekMonday().Format(utils.FormatDate)
+			endDate = utils.GetNowWeekSunday().Format(utils.FormatDate)
+		} else if whichDay == "5,6" {
+			startDate = utils.GetLastMonthFirstDay().Format(utils.FormatDate)
+			endDate = utils.GetNowMonthLastDay().Format(utils.FormatDate)
+		} else {
+			startDate = time.Now().Format(utils.FormatDate)
+			endDate = time.Now().AddDate(0, 0, +1).Format(utils.FormatDate)
+		}
+		conditioninit += ` AND art.activity_time >= ` + "'" + startDate + " 00:00:00'"
+		conditioninit += ` AND art.activity_time <= ` + "'" + endDate + " 23:59:59'"
+	}
+
+	//活动状态搜索
+	if activeState != "" {
+		// 默认查看未开始跟进行中
+		if activeState == "1" {
+			conditioninit += ` AND art.active_state  IN (1,2)`
+		} else {
+			conditioninit += ` AND art.active_state  IN (` + activeState + `)`
+		}
 	} else {
-		permissionNameStr += `, '宏观'`
+		conditioninit += ` AND art.active_state  IN (1,2)`
 	}
 
 	var condition string
-	conditionActivity, err := services.GetActivityonditionList(user, "", chartPermissionIds, whichDay, activeState, "", isPower, 0, "", 0, 1)
+	//conditionActivity, err := services.GetActivityonditionList(user, "", chartPermissionIds, whichDay, activeState, "", isPower, 0, "", 0, 1)
+
+	conditionActivity, err := services.ActivityConditioninitSql(user, conditioninit, isPower)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取活动权限数据失败，Err:" + err.Error()

models/activity_video.go

@@ -34,8 +34,8 @@ type CygxActivityVideoReq struct {
 	VideoUrl      string `description:"视频地址"`
 }
 
-//string `orm:"column(label)";description:"主题"`
-//活动详情
+// string `orm:"column(label)";description:"主题"`
+// 活动详情
 type CygxActivityVideoListResp struct {
 	ActivityId    int    `description:"活动ID 等于0新增活动，大于0修改活动"`
 	Id            int    `orm:"column(video_id)";description:"视频id"`
@@ -49,7 +49,7 @@ type CygxActivityVideoListRep struct {
 	List   []*CygxActivityVideoListResp
 }
 
-//列表
+// 列表
 func GetActivityVideoListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*,v.video_id,v.video_name,v.video_url,video_duration FROM cygx_activity as art  INNER JOIN cygx_activity_video AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
@@ -82,7 +82,7 @@ func GetCygxActivityVideoById(activityId int) (item *CygxActivityVideo, err erro
 	return
 }
 
-//列表
+// 列表
 func GetActivityVideoList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -97,3 +97,14 @@ FROM
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+// 获取所有活动视频ID
+func GetActivityVideoActivityIds() (activityIds string, err error) {
+	sql := `SELECT
+				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
+			FROM
+				cygx_activity_video AS a `
+	o := orm.NewOrm()
+	err = o.Raw(sql).QueryRow(&activityIds)
+	return
+}

models/activity_voice.go

@@ -79,7 +79,7 @@ func GetCygxActivityVoiceById(videoId int) (item *CygxActivityVoice, err error)
 	return
 }
 
-//列表
+// 列表
 func GetActivityVoiceListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVideoListResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT art.*  FROM cygx_activity as art  INNER JOIN cygx_activity_voice AS v ON v.activity_id = art.activity_id   WHERE 1= 1  `
@@ -98,7 +98,7 @@ func GetCygxActivityVoiceByActivityId(activityId int) (item *CygxActivityVoice,
 	return
 }
 
-//列表
+// 列表
 func GetActivityVoiceList(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityVoiceResp, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT
@@ -113,3 +113,14 @@ FROM
 	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
 	return
 }
+
+// 获取所有活动音频ID
+func GetActivityVoiceActivityIds() (activityIds string, err error) {
+	sql := `SELECT
+				GROUP_CONCAT( DISTINCT a.activity_id SEPARATOR ',' ) AS activityids 
+			FROM
+				cygx_activity_voice AS a `
+	o := orm.NewOrm()
+	err = o.Raw(sql).QueryRow(&activityIds)
+	return
+}

services/activity_video.go

@@ -0,0 +1,73 @@
+package services
+
+import (
+	"errors"
+	"hongze/hongze_cygx/models"
+	"hongze/hongze_cygx/utils"
+)
+
+// GetActivityPlayBackActivityIds 获取带有回放的所有的活动ID
+func GetActivityPlayBackActivityIds() (activityIds string, err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("GetActivityPlayBackActivityIds，获取带有回放的所有的活动ID失败"+err.Error(), 2)
+		}
+	}()
+	//获取所有活动视频ID
+	vidoeActivityIds, e := models.GetActivityVideoActivityIds()
+	if e != nil {
+		err = errors.New("GetActivityVideoActivityIds, Err: " + e.Error())
+		return
+	}
+	//如果没有就赋值为0，避免空查询报错
+	if vidoeActivityIds == "" {
+		vidoeActivityIds = "0"
+	}
+
+	//获取所有活动视频ID
+	voiceActivityIds, e := models.GetActivityVoiceActivityIds()
+	if e != nil {
+		err = errors.New("GetActivityVoiceActivityIds, Err: " + e.Error())
+		return
+	}
+	if voiceActivityIds == "" {
+		voiceActivityIds = "0"
+	}
+	activityIds = vidoeActivityIds + "," + voiceActivityIds
+	return
+}
+
+// GetActivityVideoOrVoiceActivityIds 获取音频或者视频的活动ID
+func GetActivityVideoOrVoiceActivityIds(filter int) (activityIds string, err error) {
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("GetActivityPlayBackActivityIds，获取带有回放的所有的活动ID失败"+err.Error(), 2)
+		}
+	}()
+
+	if filter == 1 {
+		//获取所有活动视频ID
+		vidoeActivityIds, e := models.GetActivityVideoActivityIds()
+		if e != nil {
+			err = errors.New("GetActivityVideoActivityIds, Err: " + e.Error())
+			return
+		}
+		//如果没有就赋值为0，避免空查询报错
+		if vidoeActivityIds == "" {
+			vidoeActivityIds = "0"
+		}
+		activityIds = vidoeActivityIds
+	} else {
+		//获取所有活动视频ID
+		voiceActivityIds, e := models.GetActivityVoiceActivityIds()
+		if e != nil {
+			err = errors.New("GetActivityVoiceActivityIds, Err: " + e.Error())
+			return
+		}
+		if voiceActivityIds == "" {
+			voiceActivityIds = "0"
+		}
+		activityIds = voiceActivityIds
+	}
+	return
+}