|
|
@@ -97,7 +97,7 @@ func (this *DataSourceController) IcpiData() {
|
|
|
var condition string
|
|
|
var pars []interface{}
|
|
|
|
|
|
- if baseFromIcpiClassifyId >= 0 {
|
|
|
+ if baseFromIcpiClassifyId > 0 {
|
|
|
condition += ` AND base_from_icpi_classify_id=? `
|
|
|
pars = append(pars, baseFromIcpiClassifyId)
|
|
|
}
|
|
|
@@ -216,6 +216,7 @@ func (this *DataSourceController) ExportIcpiDataList() {
|
|
|
secNameRow := sheetNew.AddRow()
|
|
|
indexCodeRow := sheetNew.AddRow()
|
|
|
frequencyRow := sheetNew.AddRow()
|
|
|
+ unitRow := sheetNew.AddRow()
|
|
|
lastModifyDateRow := sheetNew.AddRow()
|
|
|
//获取分类下指标最大数据量
|
|
|
dataMax, err := icpiObj.GetIcpiDataMaxCount(baseFromIcpiClassifyId)
|
|
|
@@ -238,12 +239,13 @@ func (this *DataSourceController) ExportIcpiDataList() {
|
|
|
secNameRow.AddCell().SetValue("指标名称")
|
|
|
indexCodeRow.AddCell().SetValue("指标ID")
|
|
|
frequencyRow.AddCell().SetValue("频率")
|
|
|
+ unitRow.AddCell().SetValue("单位")
|
|
|
lastModifyDateRow.AddCell().SetValue("更新时间")
|
|
|
|
|
|
secNameRow.AddCell().SetValue(sv.IndexName)
|
|
|
indexCodeRow.AddCell().SetValue(sv.IndexCode)
|
|
|
frequencyRow.AddCell().SetValue(sv.Frequency)
|
|
|
-
|
|
|
+ unitRow.AddCell().SetValue(sv.Unit)
|
|
|
lastModifyDateRow.AddCell().SetValue(sv.ModifyTime)
|
|
|
|
|
|
windRow.AddCell()
|
|
|
@@ -251,6 +253,7 @@ func (this *DataSourceController) ExportIcpiDataList() {
|
|
|
secNameRow.AddCell()
|
|
|
indexCodeRow.AddCell()
|
|
|
frequencyRow.AddCell()
|
|
|
+ unitRow.AddCell()
|
|
|
lastModifyDateRow.AddCell()
|
|
|
min := k * 3
|
|
|
sheetNew.SetColWidth(min, min, 15)
|
|
|
@@ -262,6 +265,7 @@ func (this *DataSourceController) ExportIcpiDataList() {
|
|
|
row.AddCell()
|
|
|
row.AddCell()
|
|
|
row.AddCell()
|
|
|
+ row.AddCell()
|
|
|
}
|
|
|
} else {
|
|
|
endRowIndex := 0
|
|
|
@@ -288,6 +292,7 @@ func (this *DataSourceController) ExportIcpiDataList() {
|
|
|
row.AddCell()
|
|
|
row.AddCell()
|
|
|
row.AddCell()
|
|
|
+ row.AddCell()
|
|
|
}
|
|
|
}
|
|
|
}
|
