Merge branch 'master_nsh' into debug

controllers/fe_calendar/fe_calendar_ai_article.go

@@ -252,7 +252,7 @@ func (this *FeCalendarAiArticleController) Save() {
 		article.ChartPermissionName = permissionItem.PermissionName
 		article.EdbCode = edbInfo.EdbCode
 		article.EdbInfoId = edbInfo.EdbInfoId
-		article.MatterDate = req.MatterDate
+		article.MatterDate = matterDateTime
 		article.MatterMonth = matterDateTime.Format("2006-01")
 		article.SysUserId = sysUser.AdminId
 		article.SysUserName = sysUser.RealName
@@ -278,7 +278,7 @@ func (this *FeCalendarAiArticleController) Save() {
 			br.Msg = "指标不匹配"
 			return
 		}
-		if articleOb.MatterDate != req.MatterDate {
+		if articleOb.MatterDate.Format(utils.FormatDate) != req.MatterDate {
 			br.Msg = "日期不匹配"
 			return
 		}

models/fe_calendar/fe_calendar_ai_article.go

@@ -12,7 +12,7 @@ type FeCalendarAiArticle struct {
 	ChartPermissionId     int       `gorm:"column:chart_permission_id"`                                 // 品种ID
 	ChartPermissionName   string    `gorm:"column:chart_permission_name"`                                   // 品种名称
 	MatterMonth           string    `gorm:"column:matter_month"`                                               // 事项年月：格式2006-01
-	MatterDate           string `gorm:"column:matter_date"`                                                // 事项日期
+	MatterDate           time.Time `gorm:"column:matter_date"`                                                // 事项日期
 	Title                string    `gorm:"column:title"`                                                                   // 标题
 	EdbInfoId           int       `gorm:"column:edb_info_id"`                                                       // 指标ID
 	EdbCode             string    `gorm:"column:edb_code"`                                                             // 指标编码