Merge branch 'coal_fix_0729' into debug

controllers/commodity_coal.go

@@ -1059,14 +1059,17 @@ func (this *CoalMineDataController) Coastal() {
 	for _, sheet := range req.SheetData {
 		sheetName = sheet.Name
 		//遍历行读取
-		maxCol := sheet.MaxCol
-		for i := 0; i < maxCol; i++ {
+		maxRow := sheet.MaxRow
+		for i := 0; i < maxRow; i++ {
 			if i == 0 {
 				row := sheet.Rows[i]
 				cells := row.Cells
 				for k, cell := range cells {
 					if k > 0 && k < 9 {
 						text := cell.Value
+						if text == "" {
+							continue
+						}
 						groupMap[k] = text
 						var item models.BaseFromCoalmineMapping
 						//合计命名

models/base_from_mysteel_chemical.go

@@ -245,9 +245,8 @@ func (m *BaseFromMysteelChemicalIndex) GetIndexItem(indexCode string) (item *Bas
 
 func (m *BaseFromMysteelChemicalIndex) GetIndexCreate(terminalCode string) (items []*BaseFromMysteelChemicalIndex, err error) {
 	o := orm.NewOrm()
-	endTime := time.Now().Add(-2 * time.Minute).Format(utils.FormatDateTime)
-	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND create_time <= ? AND terminal_code = ? `
-	_, err = o.Raw(sql, endTime, terminalCode).QueryRows(&items)
+	sql := `SELECT * FROM base_from_mysteel_chemical_index WHERE index_name = '' AND terminal_code = ? `
+	_, err = o.Raw(sql, terminalCode).QueryRows(&items)
 	return
 }