..

services/knowledge/resource.go

@@ -664,16 +664,17 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 		fmt.Println("lenCell:", lenCell)
 
 		// 校验日期格式
+		var startDateVal, endDateVal float64
 		if startDate != "" {
 			// 判断9:09:14日期格式是否正确
 			// 判断是否是数字
-			_, tmpErr := strconv.Atoi(startDate)
-			if tmpErr == nil {
+			startDateVal, err = strconv.ParseFloat(startDate, 64)
+			if err == nil {
 				startDate = utils.ExcelDateToDate(startDate).Format(utils.FormatDate)
 				fmt.Println(startDate)
 			} else {
-				startDate, tmpErr = getExcelDate(startDate)
-				if tmpErr != nil {
+				startDate, err = getExcelDate(startDate)
+				if err != nil {
 					failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
 						//Id:           0,
 						Title:          title,
@@ -698,6 +699,7 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 				// 判断9:09:14日期格式是否正确
 				startTimeVal, tmpErr := strconv.ParseFloat(startTime, 64)
 				if tmpErr == nil {
+					startTimeVal = startDateVal + startTimeVal
 					startTime = utils.ExcelTimeToTime(startTimeVal).Format(utils.FormatTime)
 					fmt.Println(startTime)
 				} else {
@@ -726,12 +728,13 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 			}
 		}
 		if endDate != "" {
-			_, tmpErr := strconv.Atoi(endDate)
-			if tmpErr == nil {
+			endDateVal, err = strconv.ParseFloat(endDate, 64)
+			if err == nil {
 				endDate = utils.ExcelDateToDate(endDate).Format(utils.FormatDate)
+				fmt.Println(endDate)
 			} else {
-				endDate, tmpErr = getExcelDate(endDate)
-				if tmpErr != nil {
+				endDate, err = getExcelDate(endDate)
+				if err != nil {
 					failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
 						//Id:           0,
 						Title:          title,
@@ -754,13 +757,14 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 			}
 			if endTime != "" {
 				// 判断9:09:14日期格式是否正确
-				endTimeVal, tmpErr := strconv.ParseFloat(endTime, 64)
-				if tmpErr == nil {
+				endTimeVal, e := strconv.ParseFloat(endTime, 64)
+				if e == nil {
+					endTimeVal = endDateVal + endTimeVal
 					endTime = utils.ExcelTimeToTime(endTimeVal).Format(utils.FormatTime)
 					fmt.Println(endTime)
 				} else {
-					_, tmpErr = time.Parse(utils.FormatDateTime, endDate+" "+endTime)
-					if tmpErr != nil {
+					_, e = time.Parse(utils.FormatDateTime, endDate+" "+endTime)
+					if e != nil {
 						failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
 							//Id:           0,
 							Title:          title,