Merge branch 'eta/2.0.0' into debug

# Conflicts:
#	models/target.go

controllers/manual_edb.go

@@ -3,6 +3,7 @@ package controllers
 import (
 	"eta/eta_api/models"
 	"eta/eta_api/models/data_manage"
+	"eta/eta_api/models/system"
 	"eta/eta_api/utils"
 	"github.com/rdlucklib/rdluck_tools/paging"
 )
@@ -78,6 +79,12 @@ func (this *TargetController) EdbDetail() {
 		}
 	}
 
+	// 录入的用户名称
+	adminInfo, err := system.GetSysAdminById(manualEdbInfo.UserId)
+	if err == nil {
+		manualEdbInfo.UserName = adminInfo.RealName
+	}
+
 	dataList, err := models.GetEdbDataListByCode(manualEdbInfo.TradeCode)
 	if err != nil {
 		br.Msg = "获取明细数据失败"
@@ -373,7 +380,7 @@ func (this *TargetController) EdbList() {
 			var edbCondition string
 			var edbPars []interface{}
 			edbCondition = ` AND source = ? AND edb_code in (` + utils.GetOrmInReplace(listNum) + `) `
-			edbPars = append(pars, utils.DATA_SOURCE_MANUAL, tradeCodeList)
+			edbPars = append(edbPars, utils.DATA_SOURCE_MANUAL, tradeCodeList)
 
 			edbInfoList, err := data_manage.GetEdbInfoListByCond(edbCondition, edbPars)
 			if err != nil {

models/target.go

@@ -194,6 +194,7 @@ type Edbinfo struct {
 	NoticeTime   string `orm:"column(notice_time)" description:"通知时间"`
 	Mobile       string `orm:"column(mobile)" description:"录入者手机号"`
 	Sort         int    `orm:"column(sort)" description:"排序"`
+	ModifyTime   string `description:"最近一次更新时间"`
 }
 
 func DeleteEdbinfoByTraceCodeList(tradeCodeList []string) (err error) {
@@ -1294,9 +1295,11 @@ type EdbInfoItem struct {
 	ClassifyName string     `description:"分类名称"`
 	CreateDate   string     `description:"创建时间"`
 	UserId       int        `description:"录入用户id"`
+	UserName     string     `description:"录入用户名称"`
 	NoticeTime   string     `description:"通知时间"`
 	Mobile       string     `description:"录入者手机号"`
 	ModifyDate   string     `description:"待更新日期"`
+	ModifyTime   string     `description:"最近一次更新时间"`
 	Status       string     `description:"状态：未完成/完成"`
 	Sort         int        `description:"排序"`
 	DataList     []*Edbdata `description:"指标数据列表"`