From fec5d416b0c8fb8f3d96b3cc6ae2c36426da52c5 Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 26 Jul 2024 17:22:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=A8=E6=9C=88=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exceldeal/exceldeal.go | 43 ++++++++++++++++++++++++++++++----------- standby.xlsx | Bin 12296 -> 12310 bytes 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/exceldeal/exceldeal.go b/exceldeal/exceldeal.go index 6f7d935..0aa2d9d 100644 --- a/exceldeal/exceldeal.go +++ b/exceldeal/exceldeal.go @@ -9,10 +9,6 @@ import ( "time" ) -var nowMouth = time.Now().Month().String() -var nowDay = time.Now().Day() -var M = dateToChinese(nowMouth) - func JsonDeal(file string, remindList []string, closeList []string) (r, c []string) { emailJson, err := os.ReadFile(file) if err != nil { @@ -54,7 +50,11 @@ func GetSheetName(file string) (remindList, closeList []string, err error) { //遍历所有工作表的A2格 sheets := f.GetSheetMap() var sheetName string - for _, s := range sheets { + var bSheet string //上月sheet + var nowMouth = time.Now().Month().String() + var nowDay = time.Now().Day() + var M = dateToChinese(nowMouth) + for key, s := range sheets { //// 读取A2单元格的值 a2value, err := f.GetCellValue(s, "A2") if err != nil { @@ -63,21 +63,42 @@ func GetSheetName(file string) (remindList, closeList []string, err error) { } //检查月份是否与当前月份相等 //如果与当前时间的月份相等则记录工作表名称 - if a2value == M { + if a2value == M && key != 0 { sheetName = s + bSheet = sheets[key-1] + } else if a2value == M && key == 0 { + sheetName = s + bSheet = "" } } rows, _ := f.GetRows(sheetName) for i, row := range rows { log.Printf("按行读取excel中的值:索引:%v,行值:%v\n", i, row) - if i == nowDay { + if i == nowDay && nowDay == 1 { + nowRow := cleanSlice(row) + remindList = append(remindList, nowRow[3], nowRow[4]) + log.Println("第一分支判断提醒列表:", remindList) + if len(bSheet) != 0 { + brows, _ := f.GetRows(bSheet) + bMRow := brows[len(brows)-1] //上月最后一天 + closeList = append(closeList, cleanSlice(bMRow)[2], cleanSlice(bMRow)[3]) + } else if len(bSheet) == 0 { + log.Println("没有上个月的excel或者上个月excel的未按顺序排列") + closeList = append(closeList, "", "") + } + + } else if i == nowDay && nowDay == 2 { nowRow := cleanSlice(row) remindList = append(remindList, nowRow[2], nowRow[3]) - - } else if i == nowDay-1 { - yesterdayRow := cleanSlice(row) - closeList = append(closeList, yesterdayRow[2], yesterdayRow[3]) + log.Println("第二分支判断提醒列表:", remindList) + closeList = append(closeList, cleanSlice(rows[nowDay-1])[3], cleanSlice(rows[nowDay-1])[4]) + } else if i == nowDay && nowDay != 1 && nowDay != 2 { + nowRow := cleanSlice(row) + remindList = append(remindList, nowRow[2], nowRow[3]) + log.Println("第三分支判断提醒列表:", remindList) + closeList = append(closeList, cleanSlice(rows[nowDay-1])[2], cleanSlice(rows[nowDay-1])[3]) } + } return remindList, closeList, nil diff --git a/standby.xlsx b/standby.xlsx index 70d7257b923c758e03454e7c0745e44c951fadb2..ebdac5d038858936e23f92146fd983d669e82c70 100644 GIT binary patch delta 3846 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 delta 3340 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 Q*$6(;E`pEMLGDQOU(sVTa{vGU