|
@@ -215,7 +215,7 @@ func GetYiDongActivity() (err error) {
|
|
|
mapOldYiDongBody := make(map[string]string)
|
|
|
for _, v := range OldActYIdongList {
|
|
|
mapOldYiDong[v.YidongActivityId] = v.YidongActivityId
|
|
|
- mapOldYiDongBody[v.YidongActivityId] = fmt.Sprint(v.ActivityName, v.Label, v.ChartPermissionId, v.ActivityTime, v.DistinguishedGuest)
|
|
|
+ mapOldYiDongBody[v.YidongActivityId] = fmt.Sprint(v.ActivityName, v.Label, v.ChartPermissionId, v.ActivityTime, v.YidongActivityEndTime, v.DistinguishedGuest)
|
|
|
}
|
|
|
fmt.Println(mapOldYiDongBody)
|
|
|
var itemsAdd []*models.CygxActivity
|
|
@@ -233,6 +233,7 @@ func GetYiDongActivity() (err error) {
|
|
|
item.ChartPermissionName = GetActivityTypeNameWithYiDong(v.IndustrySwName)
|
|
|
item.ChartPermissionNames = GetActivityTypeNameWithYiDong(v.IndustrySwName)
|
|
|
item.ActivityTime = v.Start
|
|
|
+ item.YidongActivityEndTime = v.End
|
|
|
item.ActivityTimeText = GetActivityTextTime(v.Start)
|
|
|
item.YidongActivityUrl = v.URL
|
|
|
fmt.Println(item.ActivityTimeText)
|
|
@@ -255,19 +256,24 @@ func GetYiDongActivity() (err error) {
|
|
|
}
|
|
|
} else {
|
|
|
//如果内容主体有做变更,就修改内容
|
|
|
- if mapOldYiDongBody[v.ID] != fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.DistinguishedGuest) {
|
|
|
+ if mapOldYiDongBody[v.ID] != fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.YidongActivityEndTime, item.DistinguishedGuest) {
|
|
|
+ fmt.Println("修改")
|
|
|
+ fmt.Println(mapOldYiDongBody[v.ID])
|
|
|
+ fmt.Println(fmt.Sprint(item.ActivityName, item.Label, item.ChartPermissionId, item.ActivityTime, item.DistinguishedGuest))
|
|
|
updateParams := make(map[string]interface{})
|
|
|
updateParams["ActivityName"] = item.ActivityName
|
|
|
updateParams["Label"] = item.Label
|
|
|
updateParams["TemporaryLabel"] = item.TemporaryLabel
|
|
|
+ updateParams["DistinguishedGuest"] = item.DistinguishedGuest
|
|
|
updateParams["ChartPermissionId"] = item.ChartPermissionId
|
|
|
updateParams["ChartPermissionName"] = item.ChartPermissionName
|
|
|
updateParams["ChartPermissionNames"] = item.ChartPermissionNames
|
|
|
updateParams["ActivityTime"] = item.ActivityTime
|
|
|
+ updateParams["YidongActivityEndTime"] = item.YidongActivityEndTime
|
|
|
updateParams["ActivityTimeText"] = item.ActivityTimeText
|
|
|
updateParams["YidongActivityUrl"] = item.YidongActivityUrl
|
|
|
- whereParam := map[string]interface{}{"chart_id": item.YidongActivityId}
|
|
|
- err = models.UpdateByExpr(models.CygxChart{}, whereParam, updateParams)
|
|
|
+ whereParam := map[string]interface{}{"yidong_activity_id": item.YidongActivityId}
|
|
|
+ err = models.UpdateByExpr(models.CygxActivity{}, whereParam, updateParams)
|
|
|
if err != nil {
|
|
|
return err
|
|
|
}
|