|
|
@@ -155,11 +155,7 @@ func HandleInsertRaiReport(raiReportId int) (err error) {
|
|
|
reportInfo.State = state
|
|
|
reportInfo.Content = html.EscapeString(articleResult.Content.Body)
|
|
|
reportInfo.ContentSub = html.EscapeString(contentSub)
|
|
|
-<<<<<<< HEAD
|
|
|
- //updateTime, _ := time.ParseInLocation(utils.FormatDate, articleResult.UpdateDate, time.Local)
|
|
|
-=======
|
|
|
//updateTime, _ := time.ParseInLocation(utils.FormatDateTime, articleResult.UpdateDate, time.Local)
|
|
|
->>>>>>> feature/yb11.1_rai_report
|
|
|
reportInfo.ModifyTime = articleResult.UpdateDate
|
|
|
|
|
|
// 报告更新
|
|
|
@@ -221,11 +217,7 @@ func HandleInsertRaiReport(raiReportId int) (err error) {
|
|
|
item.Stage = 0
|
|
|
item.ContentSub = html.EscapeString(contentSub)
|
|
|
item.CreateTime = time.Now().Format(utils.FormatDateTime)
|
|
|
-<<<<<<< HEAD
|
|
|
- //updateTime, _ := time.ParseInLocation(utils.FormatDate, articleResult.UpdateDate, time.Local)
|
|
|
-=======
|
|
|
//updateTime, _ := time.ParseInLocation(utils.FormatDateTime, articleResult.UpdateDate, time.Local)
|
|
|
->>>>>>> feature/yb11.1_rai_report
|
|
|
item.ModifyTime = articleResult.UpdateDate
|
|
|
item.ReportVersion = 2
|
|
|
item.AdminId = 0
|
