修改装置检修日期

controllers/data_manage/supply_analysis/variety.go

@@ -65,7 +65,7 @@ func (this *VarietyController) List() {
 
 	varietyObj := supply_analysis.Variety{}
 	var total int
-	var list []*supply_analysis.VarietyItem
+	var list []*supply_analysis.VarietyItemOrm
 	var err error
 	if isSuperAdmin || !isAnalyse {
 		total, list, err = varietyObj.GetListBySuperAdminPage(condition, pars, startSize, pageSize)
@@ -82,7 +82,11 @@ func (this *VarietyController) List() {
 		return
 	}
 
-	for k, v := range list {
+	listView := make([]*supply_analysis.VarietyItem, 0)
+	for _, v := range list {
+
+		item := new(supply_analysis.VarietyItem)
+
 		button := supply_analysis.VarietyButton{}
 		if isSuperAdmin {
 			button.Edit = true
@@ -97,14 +101,25 @@ func (this *VarietyController) List() {
 			}
 		}
 
-		v.Button = button
-		list[k] = v
+		//v.Button = button
+		//list[k] = v
+
+		item.VarietyId = v.VarietyId
+		item.VarietyName = v.VarietyName
+		item.ProductionDay = v.ProductionDay
+		item.LastUpdateSysUserId = v.LastUpdateSysUserId
+		item.LastUpdateSysUserRealName = v.LastUpdateSysUserRealName
+		item.PermissionUserId = v.PermissionUserId
+		item.ModifyTime = v.CreateTime.Format(utils.FormatDateTime)
+		item.CreateTime = v.ModifyTime.Format(utils.FormatDateTime)
+		item.Button = button
+		listView = append(listView, item)
 	}
 
 	resp := response.VarietyListResp{
 		AddButton: isSuperAdmin,
 		Paging:    paging.GetPaging(currentIndex, pageSize, total),
-		List:      list,
+		List:      listView,
 	}
 
 	br.Ret = 200

controllers/data_manage/supply_analysis/variety_edb.go

@@ -63,8 +63,7 @@ func (this *VarietyController) EdbList() {
 		return
 	}
 
-	var list []*supply_analysis.VarietyEdbInfoItem
-	list, err = supply_analysis.GetAllVarietyEdbInfoByVarietyId(varietyId)
+	list, err := supply_analysis.GetAllVarietyEdbInfoByVarietyId(varietyId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()
@@ -89,7 +88,9 @@ func (this *VarietyController) EdbList() {
 			edbInfoAndClassifyMap[v.EdbInfoId] = v
 		}
 	}
-	for k, v := range list {
+
+	var listView []*supply_analysis.VarietyEdbInfoItem
+	for _, v := range list {
 		button := supply_analysis.VarietyEdbInfoButton{
 			Copy: true,
 			Show: true,
@@ -125,12 +126,30 @@ func (this *VarietyController) EdbList() {
 			}
 		}
 
-		v.Button = button
-		list[k] = v
+		//v.Button = button
+		//list[k] = v
+		item := new(supply_analysis.VarietyEdbInfoItem)
+		item.VarietyEdbId = v.VarietyEdbId
+		item.VarietyId = v.VarietyId
+		item.EdbName = v.EdbName
+		item.Frequency = v.Frequency
+		item.StartDate = v.StartDate.Format(utils.FormatDate)
+		item.EndDate = v.EndDate.Format(utils.FormatDate)
+		item.LatestValue = v.LatestValue
+		item.EdbInfoId = v.EdbInfoId
+		item.UniqueCode = v.UniqueCode
+		item.EdbCode = v.EdbCode
+		item.ClassifyId = v.ClassifyId
+		item.ClassifyName = v.ClassifyName
+		item.Source = v.Source
+		item.ModifyTime = v.ModifyTime.Format(utils.FormatDateTime)
+		item.CreateTime = v.CreateTime.Format(utils.FormatDateTime)
+		item.Button = button
+		listView = append(listView, item)
 	}
 
 	resp := response.VarietyEdbListResp{
-		List: list,
+		List: listView,
 	}
 
 	br.Ret = 200
@@ -347,8 +366,8 @@ func (this *VarietyController) EdbDataExport() {
 		return
 	}
 
-	var list []*supply_analysis.VarietyEdbInfoItem
-	list, err = supply_analysis.GetAllVarietyEdbInfoByVarietyId(varietyId)
+	//var listView []*supply_analysis.VarietyEdbInfoItem
+	list, err := supply_analysis.GetAllVarietyEdbInfoByVarietyId(varietyId)
 	if err != nil && err.Error() != utils.ErrNoRow() {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取数据失败，Err:" + err.Error()

models/data_manage/supply_analysis/variety.go

@@ -135,6 +135,19 @@ type VarietyItem struct {
 	Button                    VarietyButton `description:"操作按钮权限"`
 }
 
+// VarietyItem 列表页返回的数据结构
+type VarietyItemOrm struct {
+	VarietyId                 int           `orm:"column(variety_id);pk"`
+	VarietyName               string        `description:"品种名称"`
+	ProductionDay             int           `description:"生产天数"`
+	LastUpdateSysUserId       int           `description:"最后更新人id"`
+	LastUpdateSysUserRealName string        `description:"最后更新人名称"`
+	PermissionUserId          string        `description:"有操作权限的用户id"`
+	ModifyTime                time.Time     `description:"修改时间"`
+	CreateTime                time.Time     `description:"创建时间"`
+	Button                    VarietyButton `description:"操作按钮权限"`
+}
+
 type VarietyButton struct {
 	Edit    bool `description:"操作权限"`
 	Delete  bool `description:"删除权限"`
@@ -142,7 +155,7 @@ type VarietyButton struct {
 }
 
 // GetListBySuperAdminPage 不区分是否有分析权限的获取分页数据
-func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
+func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItemOrm, err error) {
 	o := orm.NewOrmUsingDB("data")
 	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
 				LEFT JOIN variety_admin_permission b on a.variety_id=b.variety_id 
@@ -165,7 +178,7 @@ func (item Variety) GetListBySuperAdminPage(condition string, pars []interface{}
 }
 
 // GetListByPage 获取分页数据
-func (item Variety) GetListByPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItem, err error) {
+func (item Variety) GetListByPage(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*VarietyItemOrm, err error) {
 	o := orm.NewOrmUsingDB("data")
 	baseSql := ` FROM ( SELECT a.*, GROUP_CONCAT(DISTINCT b.sys_user_id ORDER BY b.sys_user_id ASC SEPARATOR ',') AS permission_user_id FROM variety a 
 				JOIN variety_admin_permission b on a.variety_id=b.variety_id 

models/data_manage/supply_analysis/variety_edb_info.go

@@ -80,6 +80,26 @@ type VarietyEdbInfoItem struct {
 	Button       VarietyEdbInfoButton `description:"操作按钮权限"`
 }
 
+// VarietyEdbInfoItem 品种指标表（展示使用）
+type VarietyEdbInfoItemOrm struct {
+	VarietyEdbId int                  `orm:"column(variety_edb_id);pk"`
+	VarietyId    int                  `description:"品种id"`
+	EdbName      string               `description:"品种指标名称"`
+	Frequency    string               `description:"频度"`
+	StartDate    time.Time            `description:"开始日期"`
+	EndDate      time.Time            `description:"结束日期"`
+	LatestValue  float64              `description:"最新值"`
+	EdbInfoId    int                  `description:"指标id"`
+	UniqueCode   string               `description:"唯一code"`
+	EdbCode      string               `description:"品种编码"`
+	ClassifyId   int                  `description:"上级分类id"`
+	ClassifyName string               `description:"分类名称"`
+	Source       int                  `description:"来源，1：影响周度产量；2：周度产量变动；3：影响月度产量；4：月度产量变动" json:"-"`
+	ModifyTime   time.Time            `description:"最近一次更新时间"`
+	CreateTime   time.Time            `description:"添加时间"`
+	Button       VarietyEdbInfoButton `description:"操作按钮权限"`
+}
+
 type VarietyEdbInfoButton struct {
 	Copy bool `description:"复制数据权限"`
 	Show bool `description:"查看数据权限"`
@@ -87,7 +107,7 @@ type VarietyEdbInfoButton struct {
 }
 
 // GetAllVarietyEdbInfoByVarietyId 根据品种id获取所有的指标
-func GetAllVarietyEdbInfoByVarietyId(varietyId int) (items []*VarietyEdbInfoItem, err error) {
+func GetAllVarietyEdbInfoByVarietyId(varietyId int) (items []*VarietyEdbInfoItemOrm, err error) {
 	o := orm.NewOrmUsingDB("data")
 	sql := `SELECT * FROM variety_edb_info AS a WHERE a.variety_id = ? ORDER BY a.variety_edb_id ASC `
 	_, err = o.Raw(sql, varietyId).QueryRows(&items)