|
|
@@ -340,7 +340,7 @@ func TimeProcessing(hour interface{}, duration int) time.Time {
|
|
|
return t
|
|
|
}
|
|
|
|
|
|
-//cycleunit(1:年 2:月 3:季度)
|
|
|
+//cycleunit(1:年 2:月 3:季)
|
|
|
//cyclecount 数字长度
|
|
|
func checkReqDate(dateStr string) (cyclecount, cycleunit int, err error) {
|
|
|
if strings.HasSuffix(dateStr, "年") {
|
|
|
@@ -353,7 +353,7 @@ func checkReqDate(dateStr string) (cyclecount, cycleunit int, err error) {
|
|
|
return
|
|
|
} else if strings.HasSuffix(dateStr, "季") {
|
|
|
cycleunit = 3
|
|
|
- dateStr = strings.Replace(dateStr, "个季度", "", -1)
|
|
|
+ dateStr = strings.Replace(dateStr, "季", "", -1)
|
|
|
cyclecount, err = strconv.Atoi(strings.Trim(dateStr, " "))
|
|
|
if cyclecount > 12 && err == nil {
|
|
|
err = errors.New(fmt.Sprintf("日期%s范围超出最大值", dateStr))
|
