浏览代码

研报时间格式修改

xyxie 2 月之前
父节点
当前提交
203a6624ba
共有 2 个文件被更改,包括 22 次插入22 次删除
  1. 6 6
      models/document_manage_model/outside_report.go
  2. 16 16
      models/report.go

+ 6 - 6
models/document_manage_model/outside_report.go

@@ -29,9 +29,9 @@ type OutsideReport struct {
 // @Description: 转成需要输出的格式
 // @receiver m
 func (m *OutsideReport) AfterFind(db *gorm.DB) (err error) {
-	m.ReportUpdateTime = utils.GormDateStrToDateStr(m.ReportUpdateTime)
-	m.ModifyTime = utils.GormDateStrToDateStr(m.ModifyTime)
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
+	m.ReportUpdateTime = utils.GormDateStrToDateTimeStr(m.ReportUpdateTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
 
 	return
 }
@@ -40,9 +40,9 @@ func (m *OutsideReport) AfterFind(db *gorm.DB) (err error) {
 // @Description: 转成需要输出的格式
 // @receiver m
 func (m *OutsideReport) ConvertTimeStr() {
-	m.ReportUpdateTime = utils.GormDateStrToDateStr(m.ReportUpdateTime)
-	m.ModifyTime = utils.GormDateStrToDateStr(m.ModifyTime)
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
+	m.ReportUpdateTime = utils.GormDateStrToDateTimeStr(m.ReportUpdateTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
 
 	return
 }

+ 16 - 16
models/report.go

@@ -93,7 +93,7 @@ type Report struct {
 }
 
 func (m *Report) AfterFind(db *gorm.DB) (err error) {
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
 	return
 }
 
@@ -101,7 +101,7 @@ func (m *Report) AfterFind(db *gorm.DB) (err error) {
 // @Description: 转成需要输出的格式
 // @receiver m
 func (m *Report) ConvertTimeStr() {
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
 	return
 }
 
@@ -167,12 +167,12 @@ type ReportList struct {
 	InheritReportId     int       `description:"待继承的报告ID"`
 }
 func (m *ReportList) AfterFind(db *gorm.DB) (err error) {
-	m.ModifyTime = utils.GormDateStrToDateStr(m.ModifyTime)
-	m.PublishTime = utils.GormDateStrToDateStr(m.PublishTime)
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
-	m.ApproveTime = utils.GormDateStrToDateStr(m.ApproveTime)
-	m.MsgSendTime = utils.GormDateStrToDateStr(m.MsgSendTime)
-	m.PrePublishTime = utils.GormDateStrToDateStr(m.PrePublishTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.PublishTime = utils.GormDateStrToDateTimeStr(m.PublishTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
+	m.ApproveTime = utils.GormDateStrToDateTimeStr(m.ApproveTime)
+	m.MsgSendTime = utils.GormDateStrToDateTimeStr(m.MsgSendTime)
+	m.PrePublishTime = utils.GormDateStrToDateTimeStr(m.PrePublishTime)
 	return
 }
 type ReportListResp struct {
@@ -443,18 +443,18 @@ type ReportDetail struct {
 }
 
 func (m *ReportDetail) AfterFind(db *gorm.DB) (err error) {
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
-	m.ModifyTime = utils.GormDateStrToDateStr(m.ModifyTime)
-	m.PublishTime = utils.GormDateStrToDateStr(m.PublishTime)
-	m.PrePublishTime = utils.GormDateStrToDateStr(m.PrePublishTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.PublishTime = utils.GormDateStrToDateTimeStr(m.PublishTime)
+	m.PrePublishTime = utils.GormDateStrToDateTimeStr(m.PrePublishTime)
 
 	return
 }
 func (m *ReportDetail) ConvertTimeStr() {
-	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
-	m.ModifyTime = utils.GormDateStrToDateStr(m.ModifyTime)
-	m.PublishTime = utils.GormDateStrToDateStr(m.PublishTime)
-	m.PrePublishTime = utils.GormDateStrToDateStr(m.PrePublishTime)
+	m.CreateTime = utils.GormDateStrToDateTimeStr(m.CreateTime)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.PublishTime = utils.GormDateStrToDateTimeStr(m.PublishTime)
+	m.PrePublishTime = utils.GormDateStrToDateTimeStr(m.PrePublishTime)
 
 	return
 }