|
|
@@ -21,7 +21,8 @@ func FileCoalInland() () {
|
|
|
//go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "RefreshDataFromCoalInland ErrMsg:"+err.Error(), utils.EmailSendToUsers)
|
|
|
}
|
|
|
}()
|
|
|
- path := "/home/code/python/coal_mail/emailFile/内陆17省动力煤终端用户供耗存%s.xlsx"
|
|
|
+ path := "/Users/xi/Desktop/内陆17省动力煤终端用户供耗存%s.xlsx"
|
|
|
+ //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)
|
|
|
@@ -173,7 +174,9 @@ func FileCoalInland() () {
|
|
|
dataTime = t.Format(utils.FormatDate)
|
|
|
} else {
|
|
|
text := cell.String()
|
|
|
- dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
|
|
|
+ t, _ := time.ParseInLocation("01-02-06", text, time.Local)
|
|
|
+ dataTime = t.Format(utils.FormatDate)
|
|
|
+ //dataTime = ExcelDateToDate(text).Format(utils.FormatDate)
|
|
|
}
|
|
|
}
|
|
|
if k > 0 {
|
ziwen