|
@@ -727,7 +727,7 @@ func GetLzProductPriceData() (err error) {
|
|
|
}
|
|
|
username := "hzmd"
|
|
|
password := "HZMD2020"
|
|
|
- startDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
|
|
|
+ startDate := time.Now().AddDate(0, 0, -1).Format(utils.FormatDate)
|
|
|
endDate := time.Now().AddDate(0, 0, 0).Format(utils.FormatDate)
|
|
|
for k, v := range priceInfoList {
|
|
|
fmt.Println(k, v)
|
|
@@ -826,6 +826,8 @@ func LzPriceExportExcel() {
|
|
|
frequencyRow := sheetNew.AddRow()
|
|
|
unitRow := sheetNew.AddRow()
|
|
|
lastModifyDateRow := sheetNew.AddRow()
|
|
|
+ marketRow := sheetNew.AddRow()
|
|
|
+ manufactureRow := sheetNew.AddRow()
|
|
|
titleRow := sheetNew.AddRow()
|
|
|
//获取分类下指标最大数据量
|
|
|
dataMax, err := models.GetLongzhongPriceDataMaxCount(v.ProductName)
|
|
@@ -841,11 +843,15 @@ func LzPriceExportExcel() {
|
|
|
frequencyRow.AddCell().SetValue("价格类型")
|
|
|
unitRow.AddCell().SetValue("单位")
|
|
|
lastModifyDateRow.AddCell().SetValue("地区")
|
|
|
+ marketRow.AddCell().SetValue("市场名称")
|
|
|
+ manufactureRow.AddCell().SetValue("厂家名称")
|
|
|
|
|
|
secNameRow.AddCell().SetValue(sv.InfoTypeRemark)
|
|
|
frequencyRow.AddCell().SetValue(sv.PriceType)
|
|
|
unitRow.AddCell().SetValue(sv.Unit)
|
|
|
lastModifyDateRow.AddCell().SetValue(sv.AreaName)
|
|
|
+ marketRow.AddCell().SetValue(sv.MarketName)
|
|
|
+ manufactureRow.AddCell().SetValue(sv.ManufactureName)
|
|
|
|
|
|
windRow.AddCell()
|
|
|
windRow.AddCell()
|
|
@@ -856,14 +862,23 @@ func LzPriceExportExcel() {
|
|
|
frequencyRow.AddCell()
|
|
|
unitRow.AddCell()
|
|
|
lastModifyDateRow.AddCell()
|
|
|
+ marketRow.AddCell()
|
|
|
+ manufactureRow.AddCell()
|
|
|
+
|
|
|
secNameRow.AddCell()
|
|
|
frequencyRow.AddCell()
|
|
|
unitRow.AddCell()
|
|
|
lastModifyDateRow.AddCell()
|
|
|
+ marketRow.AddCell()
|
|
|
+ manufactureRow.AddCell()
|
|
|
+
|
|
|
secNameRow.AddCell()
|
|
|
frequencyRow.AddCell()
|
|
|
unitRow.AddCell()
|
|
|
lastModifyDateRow.AddCell()
|
|
|
+ marketRow.AddCell()
|
|
|
+ manufactureRow.AddCell()
|
|
|
+
|
|
|
titleRow.AddCell().SetValue("价格日期")
|
|
|
titleRow.AddCell().SetValue("价格")
|
|
|
titleRow.AddCell().SetValue("低端价格")
|
|
@@ -878,7 +893,7 @@ func LzPriceExportExcel() {
|
|
|
|
|
|
if len(dataList) <= 0 {
|
|
|
for n := 0; n < dataMax; n++ {
|
|
|
- rowIndex := 6 + n
|
|
|
+ rowIndex := 8 + n
|
|
|
row, err := sheetNew.Row(rowIndex)
|
|
|
if err != nil {
|
|
|
fmt.Println("add row err:" + err.Error())
|
|
@@ -893,7 +908,7 @@ func LzPriceExportExcel() {
|
|
|
} else {
|
|
|
endRowIndex := 0
|
|
|
for rk, dv := range dataList {
|
|
|
- rowIndex := 6 + rk
|
|
|
+ rowIndex := 8 + rk
|
|
|
row, err := sheetNew.Row(rowIndex)
|
|
|
if err != nil {
|
|
|
fmt.Println("add row err:" + err.Error())
|