手工数据录入优化-最新日期-excel导出

controllers/data_manage/manual_edb.go

@@ -102,8 +102,13 @@ func (c *ManualEdbController) EdbDetail() {
 			br.ErrMsg = "获取明细数据失败,err:" + err.Error()
 			return
 		}
+		// 获取下期时间
+		dataNextDateTime, err := fillDataNextDateTime(dataList)
+		if err != nil {
+			return
+		}
 
-		manualEdbInfo.DataList = dataList
+		manualEdbInfo.NextDataTimeList = dataNextDateTime
 	}
 
 	resp := models.TargetDetailResp{
@@ -117,6 +122,53 @@ func (c *ManualEdbController) EdbDetail() {
 	br.Data = resp
 }
 
+// 封装指标数据下期时间
+func fillDataNextDateTime(list []*models.Edbdata) ([]*models.EdbDataNextDateTime, error) {
+	var nextDataDateTimeList []*models.EdbDataNextDateTime
+	var indexCodes []string
+	for _, item := range list {
+		indexCodes = append(indexCodes, item.TradeCode)
+	}
+	edbinfoList, err := models.GetEdbinfoListByCodeListByCodeIdList(indexCodes)
+	if err != nil {
+		return nil, err
+	}
+	edbinfoMap := make(map[string]*models.Edbinfo)
+	for _, item := range edbinfoList {
+		edbinfoMap[item.TradeCode] = item
+	}
+
+	for _, item := range list {
+		nextDataDateTime := &models.EdbDataNextDateTime{
+			TradeCode:  item.TradeCode,
+			Dt:         item.Dt,
+			Close:      item.Close,
+			ModifyTime: item.ModifyTime,
+		}
+
+		date := utils.StrDateToDate(item.Dt)
+		frequency := edbinfoMap[item.TradeCode].Frequency
+		switch frequency {
+		case "日度":
+			nextDataDateTime.NextDateTime = date.AddDate(0, 0, 1).Format(utils.FormatDate)
+		case "周度":
+			nextDataDateTime.NextDateTime = date.AddDate(0, 0, 7).Format(utils.FormatDate)
+		case "旬度":
+			nextDataDateTime.NextDateTime = date.AddDate(0, 0, 10).Format(utils.FormatDate)
+		case "月度":
+			nextDataDateTime.NextDateTime = date.AddDate(0, 1, 0).Format(utils.FormatDate)
+		case "季度":
+			nextDataDateTime.NextDateTime = date.AddDate(0, 3, 0).Format(utils.FormatDate)
+		case "半年度":
+			nextDataDateTime.NextDateTime = date.AddDate(0, 6, 0).Format(utils.FormatDate)
+		case "年度":
+			nextDataDateTime.NextDateTime = date.AddDate(1, 0, 0).Format(utils.FormatDate)
+		}
+		nextDataDateTimeList = append(nextDataDateTimeList, nextDataDateTime)
+	}
+	return nextDataDateTimeList, nil
+}
+
 // ClassifyEdbList
 // @Title 分类指标列表
 // @Description 指标列表
@@ -413,6 +465,8 @@ func (c *ManualEdbController) EdbList() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	// 获取预测时间
+	fillNextDateTime(list)
 
 	resp := models.EdbListResp{
 		List:   list,
@@ -424,6 +478,29 @@ func (c *ManualEdbController) EdbList() {
 	br.Data = resp
 }
 
+// 封装指标列表下期时间
+func fillNextDateTime(list []*models.EdbInfoListItem) {
+	for _, item := range list {
+		date := utils.StrDateToDate(item.EndDate)
+		switch item.Frequency {
+		case "日度":
+			item.NextDateTime = date.AddDate(0, 0, 1).Format(utils.FormatDate)
+		case "周度":
+			item.NextDateTime = date.AddDate(0, 0, 7).Format(utils.FormatDate)
+		case "旬度":
+			item.NextDateTime = date.AddDate(0, 0, 10).Format(utils.FormatDate)
+		case "月度":
+			item.NextDateTime = date.AddDate(0, 1, 0).Format(utils.FormatDate)
+		case "季度":
+			item.NextDateTime = date.AddDate(0, 3, 0).Format(utils.FormatDate)
+		case "半年度":
+			item.NextDateTime = date.AddDate(0, 6, 0).Format(utils.FormatDate)
+		case "年度":
+			item.NextDateTime = date.AddDate(1, 0, 0).Format(utils.FormatDate)
+		}
+	}
+}
+
 // EditExcelData
 // @Title 根据excel的样式去编辑指标
 // @Description 根据excel的样式去编辑指标
@@ -1445,7 +1522,7 @@ func (c *ManualEdbController) ImportData() {
 		defer os.Remove(path)
 	}
 
-	successCount, failCount, err, errMsg := data.ImportManualData(path, sysUser)
+	successCount, failCount, indexCount, err, errMsg := data.ImportManualData(path, sysUser)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()
@@ -1455,6 +1532,7 @@ func (c *ManualEdbController) ImportData() {
 	resp := models.EdbdataImportResp{
 		SuccessCount: successCount,
 		FailCount:    failCount,
+		IndexCount:   indexCount,
 	}
 	if failCount > 0 {
 		if successCount == 0 {

models/manual_edb.go

@@ -86,6 +86,7 @@ type EdbInfoListItem struct {
 	StartDate    string  `description:"数据开始日期"`
 	EndDate      string  `description:"数据结束日期"`
 	LatestValue  float64 `description:"指标最新值"`
+	NextDateTime string  `description:"下期时间"`
 }
 
 // EdbListResp 指标数据结构体

models/target.go

@@ -72,6 +72,15 @@ type Edbdata struct {
 	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
 }
 
+type EdbDataNextDateTime struct {
+	TradeCode  string    `orm:"column(TRADE_CODE);pk" description:"指标编码"`
+	Dt         string    `orm:"column(DT)" description:"日期"`
+	Close      string    `orm:"column(CLOSE)" description:"值"`
+	ModifyTime time.Time `orm:"column(modify_time)" description:"修改时间"`
+
+	NextDateTime string `description:"下期日期"`
+}
+
 func GetDataInfo(tradeCode, creteDate string) (item *Edbdata, err error) {
 	sql := " SELECT * FROM edbdata WHERE TRADE_CODE=? AND DT=? "
 	o := orm.NewOrmUsingDB("edb")
@@ -532,6 +541,7 @@ type EdbdataImportResp struct {
 	Msg          string
 	SuccessCount int
 	FailCount    int
+	IndexCount   int `description:"指标数"`
 }
 
 func GetFailList(sysUserId int) (items []*EdbdataImportFail, err error) {
@@ -1264,26 +1274,27 @@ func GetLzFrequency(productName string) (items []*int, err error) {
 
 // EdbInfoItem
 type EdbInfoItem struct {
-	TradeCode    string     `orm:"column(TRADE_CODE);pk" description:"指标code"`
-	SecName      string     `orm:"column(SEC_NAME);" description:"指标名称"`
-	Unit         string     `orm:"column(UNIT);" description:"单位"`
-	Remark       string     `orm:"column(REMARK);" description:"备注"`
-	Frequency    string     `description:"频度"`
-	ClassifyId   int        `description:"分类id"`
-	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:"状态：未完成/完成"`
-	IsJoinEdb    int8       `description:"指标库是否已添加：0-否；1-是"`
-	StartDate    string     `description:"数据开始日期"`
-	EndDate      string     `description:"数据结束日期"`
-	LatestValue  float64    `description:"指标最新值"`
-	DataList     []*Edbdata `description:"指标数据列表"`
+	TradeCode        string                 `orm:"column(TRADE_CODE);pk" description:"指标code"`
+	SecName          string                 `orm:"column(SEC_NAME);" description:"指标名称"`
+	Unit             string                 `orm:"column(UNIT);" description:"单位"`
+	Remark           string                 `orm:"column(REMARK);" description:"备注"`
+	Frequency        string                 `description:"频度"`
+	ClassifyId       int                    `description:"分类id"`
+	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:"状态：未完成/完成"`
+	IsJoinEdb        int8                   `description:"指标库是否已添加：0-否；1-是"`
+	StartDate        string                 `description:"数据开始日期"`
+	EndDate          string                 `description:"数据结束日期"`
+	LatestValue      float64                `description:"指标最新值"`
+	DataList         []*Edbdata             `description:"指标数据列表"`
+	NextDataTimeList []*EdbDataNextDateTime `description:"下期数据时间列表"`
 }
 
 // GetTargetItemList 获取指标列表数据

services/data/manual.go

@@ -226,7 +226,7 @@ func ManualIndexSource2Edb(req ManualIndexSource2EdbReq, lang string) (edb *data
 // @return failCount int
 // @return err error
 // @return errMsg string
-func ImportManualData(path string, sysUser *system.Admin) (successCount, failCount int, err error, errMsg string) {
+func ImportManualData(path string, sysUser *system.Admin) (successCount, failCount int, indexCount int, err error, errMsg string) {
 	// 错误信息
 	errMsgList := make([]string, 0)
 	// 操作记录
@@ -511,6 +511,9 @@ func ImportManualData(path string, sysUser *system.Admin) (successCount, failCou
 				failDataList = append(failDataList, failItem)
 				continue
 			}
+			// 新增指标记录数
+			indexCount++
+
 			tmpTarget, tmpErr := models.GetTargetBySecName(v.IndexName)
 			target = tmpTarget
 			targetMap[v.IndexName] = target
@@ -540,6 +543,35 @@ func ImportManualData(path string, sysUser *system.Admin) (successCount, failCou
 
 		//更新指标信息
 		{
+			if v.Frequency == "" {
+				failItem := &models.EdbdataImportFail{
+					ClassifyName: v.ClassName,
+					CreateDate:   tmpDate,
+					SecName:      v.IndexName,
+					Close:        tmpValue,
+					Remark:       "更新指标失败，频度字段为空",
+					SysUserId:    fmt.Sprint(sysUser.AdminId),
+					Frequency:    v.Frequency,
+					Unit:         v.Unit,
+				}
+				failDataList = append(failDataList, failItem)
+				continue
+			}
+			if v.Unit == "" {
+				failItem := &models.EdbdataImportFail{
+					ClassifyName: v.ClassName,
+					CreateDate:   tmpDate,
+					SecName:      v.IndexName,
+					Close:        tmpValue,
+					Remark:       "更新指标失败，单位字段为空",
+					SysUserId:    fmt.Sprint(sysUser.AdminId),
+					Frequency:    v.Frequency,
+					Unit:         v.Unit,
+				}
+				failDataList = append(failDataList, failItem)
+				continue
+			}
+
 			updateCols := make([]string, 0)
 			//更新指标分类
 			if target.ClassifyId <= 0 && classify.ClassifyId > 0 {