Merge remote-tracking branch 'origin/dm' into dm

models/data_manage/base_from_clarksons_index.go

@@ -93,7 +93,8 @@ func GetClarksonsIndexByConditionAndFrequency(condition, frequency string, pars
 	}
 	sql += ` AND frequency=?`
 	sql += ` ORDER BY sort ASC, base_from_clarksons_index_id ASC`
-	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars, frequency).Find(&items).Error
+	pars = append(pars, frequency)
+	err = global.DbMap[utils.DbNameIndex].Raw(sql, pars...).Find(&items).Error
 	return
 }
 

models/data_manage/base_from_mtjh.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"fmt"
+	"gorm.io/gorm"
 	"time"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -51,6 +52,21 @@ type BaseFromMtjhIndexItem struct {
 	ModifyTime          string `description:"修改时间"`
 }
 
+func (obj *BaseFromMtjhIndexItem) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+		if obj.DataTime != "" {
+			obj.DataTime = utils.GormDateStrToDateStr(obj.DataTime)
+		}
+	}
+	return
+}
+
 // 查询指标
 func GetBaseFromMtjhMapping() (items []*BaseFromMtjhMapping, err error) {
 	o := global.DbMap[utils.DbNameMaster]
@@ -121,6 +137,14 @@ type BaseFromMtjhMappingItem struct {
 	Frequency             string `description:"频率"`
 }
 
+func (obj *BaseFromMtjhMappingItem) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+	}
+	return
+}
 func GetMtjhMapping(condition string, pars []interface{}) (items []*BaseFromMtjhMappingItem, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT * FROM base_from_mtjh_mapping WHERE 1=1  `
@@ -234,6 +258,11 @@ func GetMtjhIndexLatestDate(indexCode string) (ModifyTime string, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	sql := ` SELECT modify_time FROM base_from_mtjh_index WHERE index_code=? ORDER BY modify_time DESC limit 1 `
 	err = o.Raw(sql, indexCode).Scan(&ModifyTime).Error
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if ModifyTime != "" {
+			ModifyTime = utils.GormDateStrToDateTimeStr(ModifyTime)
+		}
+	}
 	return
 }
 

models/data_source/base_from_sci99.go

@@ -4,6 +4,7 @@ import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
+	"gorm.io/gorm"
 	"time"
 )
 
@@ -53,6 +54,21 @@ type BaseFromSci99DataItem struct {
 	ModifyTime         string  // 修改时间
 }
 
+func (obj *BaseFromSci99DataItem) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+		if obj.DataTime != "" {
+			obj.DataTime = utils.GormDateStrToDateStr(obj.DataTime)
+		}
+	}
+	return
+}
+
 type BaseFromSci99IndexList struct {
 	BaseFromSciIndexId int                      `orm:"column(base_from_sci_index_id);pk" gorm:"primaryKey"` // 主键，自动递增
 	IndexCode          string                   // 指标编码
@@ -67,6 +83,18 @@ type BaseFromSci99IndexList struct {
 	Paging             *paging.PagingItem       `description:"分页数据" gorm:"-"`
 }
 
+func (obj *BaseFromSci99IndexList) AfterFind(tx *gorm.DB) (err error) {
+	if utils.NeedDateOrTimeFormat(utils.DbDriverName) {
+		if obj.CreateTime != "" {
+			obj.CreateTime = utils.GormDateStrToDateTimeStr(obj.CreateTime)
+		}
+		if obj.ModifyTime != "" {
+			obj.ModifyTime = utils.GormDateStrToDateTimeStr(obj.ModifyTime)
+		}
+	}
+	return
+}
+
 // 添加数据
 func AddBaseFromSci99Index(item *BaseFromSci99Index) (lastId int64, err error) {
 	o := global.DbMap[utils.DbNameIndex]

models/document_manage_model/outside_report_attachment.go

@@ -4,7 +4,9 @@ package document_manage_model
 import (
 	"eta/eta_api/global"
 	"eta/eta_api/utils"
+
 	"github.com/beego/beego/v2/client/orm"
+	"gorm.io/gorm"
 )
 
 type OutsideReportAttachment struct {
@@ -16,6 +18,11 @@ type OutsideReportAttachment struct {
 	FileSize                  int64  `orm:"column(file_size)" description:"附件大小"`
 }
 
+func (o *OutsideReportAttachment) AfterFind(db *gorm.DB) (err error) {
+	o.CreateTime = utils.GormDateStrToDateTimeStr(o.CreateTime)
+	return
+}
+
 // 在 init 函数中注册模型
 func init() {
 	orm.RegisterModel(new(OutsideReportAttachment))

services/report_approve.go

@@ -177,7 +177,7 @@ func SubmitReportApprove(reportType, reportId int, reportTitle string, firstId,
 	flowPars := make([]interface{}, 0)
 	flowPars = append(flowPars, reportType, firstId, secondId, thirdId)
 	flowItem, e := flowOb.GetItemByCondition(flowCond, flowPars, "")
-	if e != nil {
+	if e != nil && !utils.IsErrNoRow(e) {
 		err = fmt.Errorf("ApproveFlow GetItemByCondition err: %s", e.Error())
 		return
 	}