瀏覽代碼

inland fix

ziwen 2 年之前
父節點
當前提交
ad77b9aedc
共有 1 個文件被更改,包括 33 次插入38 次删除
  1. 33 38
      services/commodity_coal_inland.go

+ 33 - 38
services/commodity_coal_inland.go

@@ -22,32 +22,32 @@ func FileCoalInland() () {
 		}
 	}()
 	path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存%s.xlsx"
-	//for i := 0;i < 7;i++{
-	//	npath := fmt.Sprintf(path,time.Now().AddDate(0,0,-i).Format(utils.FormatDateUnSpace))
-	//	fmt.Println(npath)
-	//	exist,err := PathExists(npath)
-	//	if err != nil {
-	//		fmt.Println(err)
-	//		return
-	//	}
-	//	if exist{
-	//		path = npath
-	//		break
-	//	}
-	//	if i < 3 && !exist{
-	//		npath := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
-	//		fmt.Println(npath)
-	//		exist,err := PathExists(npath)
-	//		if err != nil {
-	//			fmt.Println(err)
-	//			return
-	//		}
-	//		if exist{
-	//			path = npath
-	//			break
-	//		}
-	//	}
-	//}
+	for i := 0;i < 7;i++{
+		npath := fmt.Sprintf(path,time.Now().AddDate(0,0,-i).Format(utils.FormatDateUnSpace))
+		fmt.Println(npath)
+		exist,err := PathExists(npath)
+		if err != nil {
+			fmt.Println(err)
+			return
+		}
+		if exist{
+			path = npath
+			break
+		}
+		if i < 3 && !exist{
+			npath := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存.xlsx"
+			fmt.Println(npath)
+			exist,err := PathExists(npath)
+			if err != nil {
+				fmt.Println(err)
+				return
+			}
+			if exist{
+				path = npath
+				break
+			}
+		}
+	}
 	exist,err := PathExists(path)
 	if err != nil {
 		fmt.Println(err)
@@ -62,20 +62,15 @@ func FileCoalInland() () {
 		return
 	}
 	var xlFile *xlsx.File
-	xlFile, err = xlsx.OpenFile(path)
-	if err != nil {
-		fmt.Println("OpenFile err:",err)
+	if exist {
+		xlFile, err = xlsx.OpenFile(path)
+		if err != nil {
+			fmt.Println("OpenFile err:",err)
+			return
+		}
+	}else {
 		return
 	}
-	//if exist {
-	//	xlFile, err = xlsx.OpenFile(path)
-	//	if err != nil {
-	//		fmt.Println("OpenFile err:",err)
-	//		return
-	//	}
-	//}else {
-	//	return
-	//}
 
 	var mappingItems []*models.BaseFromCoalmineMapping
 	var indexItems []*models.BaseFromCoalmineInlandIndex