Merge branch 'feature/gn_edb' into dm

controllers/data_manage/edb_info_calculate.go

@@ -231,6 +231,10 @@ func (this *ChartInfoController) CalculateDetail() {
 		br.ErrMsg = "获取失败，Err:" + err.Error()
 		return
 	}
+	// 日期转换
+	for _, v := range calculateList {
+		v.ConvertToResp()
+	}
 
 	fullEdb := new(data_manage.EdbInfoFullClassify)
 	classifyList, err, errMsg := data.GetFullClassifyByClassifyId(edbInfo.ClassifyId)

controllers/data_manage/supply_analysis/variety_plant.go

@@ -65,6 +65,7 @@ func (this *VarietyController) PlantList() {
 	}
 
 	for k, v := range list {
+		v.ConvertToResp()
 		button := supply_analysis.VarietyPlantButton{}
 		if hasPermission {
 			button.Edit = true

models/data_manage/edb_info_calculate.go

@@ -2,6 +2,7 @@ package data_manage
 
 import (
 	"eta_gn/eta_api/global"
+	"eta_gn/eta_api/utils"
 	"time"
 
 	"github.com/rdlucklib/rdluck_tools/paging"
@@ -344,3 +345,10 @@ type BaseStepCalculateReq struct {
 	DataList   []*EdbInfoSearchData
 	Calculates []FactorEdbSeriesCalculatePars
 }
+
+func (m *EdbInfoCalculateDetail) ConvertToResp() {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+	m.LatestDate = utils.GormDateStrToDateStr(m.LatestDate)
+	return
+}

models/data_manage/supply_analysis/variety_plant.go

@@ -142,3 +142,11 @@ func UpdateEdbInfoSortByNextId(varietyId, prevVarietyId, nowSort int, updateSort
 
 	return
 }
+
+func (m *VarietyPlantItem) ConvertToResp() {
+	m.CreateTime = utils.GormDateStrToDateStr(m.CreateTime)
+	m.ModifyTime = utils.GormDateStrToDateStr(m.ModifyTime)
+	m.MaintenanceDate = utils.GormDateStrToDateStr(m.MaintenanceDate)
+	m.ResumptionDate = utils.GormDateStrToDateStr(m.ResumptionDate)
+	return
+}