Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

models/data_manage/chart_edb_mapping.go

@@ -173,6 +173,9 @@ func GetEtaEdbChartEdbMapping(chartInfoId int) (item *ChartEdbInfoMapping, err e
 			 INNER JOIN edb_info AS b ON a.edb_info_id=b.edb_info_id
 			 WHERE a.chart_info_id=? AND a.source = ?
              ORDER BY chart_edb_mapping_id ASC `
+	if item != nil {
+		item.ConvertTimeStr()
+	}
 	err = o.Raw(sql, chartInfoId, utils.CHART_SOURCE_DEFAULT).First(&item).Error
 	return
 }

models/data_manage/chart_info.go

@@ -750,6 +750,24 @@ type ChartEdbInfoMapping struct {
 	UniqueFlag          string      `description:"唯一标识(与唯一编码不是一个东西)"`
 }
 
+func (m *ChartEdbInfoMapping) AfterFind(db *gorm.DB) (err error) {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+	m.LatestDate = utils.GormDateStrToDateStr(m.LatestDate)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.MoveLatestDate = utils.GormDateStrToDateStr(m.MoveLatestDate)
+	return
+}
+
+func (m *ChartEdbInfoMapping) ConvertTimeStr() {
+	m.StartDate = utils.GormDateStrToDateStr(m.StartDate)
+	m.EndDate = utils.GormDateStrToDateStr(m.EndDate)
+	m.LatestDate = utils.GormDateStrToDateStr(m.LatestDate)
+	m.ModifyTime = utils.GormDateStrToDateTimeStr(m.ModifyTime)
+	m.MoveLatestDate = utils.GormDateStrToDateStr(m.MoveLatestDate)
+	return
+}
+
 type QuarterData struct {
 	Year                 int
 	DataList             []*EdbDataList `gorm:"-"`

models/data_manage/my_chart.go

@@ -460,11 +460,17 @@ func GetMyChartListByAdminId(adminId int) (item []*MyChartView, err error) {
 	o := global.DbMap[utils.DbNameIndex]
 	//sql := ` SELECT * FROM my_chart WHERE 1=1 AND admin_id=? `
 
-	sql := ` SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
+	//sql := ` SELECT a.*,GROUP_CONCAT(c.my_chart_classify_id SEPARATOR ',') AS my_chart_classify_id FROM my_chart AS a
+	//		LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
+	//		LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
+	//		WHERE 1=1 AND a.admin_id=?
+	//		GROUP BY a.chart_info_id `
+
+	sql := fmt.Sprintf(` SELECT a.*, %s AS my_chart_classify_id FROM my_chart AS a
 			LEFT JOIN  my_chart_classify_mapping AS b ON a.my_chart_id=b.my_chart_id AND a.admin_id=b.admin_id
 			LEFT JOIN my_chart_classify AS c ON b.my_chart_classify_id=c.my_chart_classify_id AND b.admin_id=c.admin_id
 			WHERE 1=1 AND a.admin_id=?
-			GROUP BY a.chart_info_id `
+			GROUP BY a.chart_info_id `, utils.GroupUnitFunc(utils.DbDriverName, "c.my_chart_classify_id", ",", ""))
 	err = o.Raw(sql, adminId).Find(&item).Error
 	return
 }