优化提示文案, 修改日期解析方式

controllers/knowledge/resource.go

@@ -827,9 +827,9 @@ func (c *ResourceController) ImportData() {
 		br.ErrMsg = "文件保存失败，Err:" + err.Error()
 		return
 	}
-	if utils.RunMode == "debug" {
-		defer os.Remove(path)
-	}
+	//if utils.RunMode == "debug" {
+	defer os.Remove(path)
+	//}
 
 	successCount, failCount, err, errMsg := knowledgeServ.ImportResourceData(path, resourceType, sysUser)
 	if err != nil {

services/knowledge/resource.go

@@ -2,7 +2,6 @@ package knowledge
 
 import (
 	"errors"
-	"eta_gn/eta_api/models"
 	"eta_gn/eta_api/models/knowledge"
 	"eta_gn/eta_api/models/system"
 	"eta_gn/eta_api/services"
@@ -291,26 +290,7 @@ func EditResource(resourceInfo *knowledge.KnowledgeResource, req knowledge.EditR
 func ImportResourceData(path string, resourceType int, sysUser *system.Admin) (successCount, failCount int, err error, errMsg string) {
 	// 错误信息
 	errMsgList := make([]string, 0)
-	// 操作记录
-	recordMap := make(map[string]string)
 	defer func() {
-		recordList := make([]*models.EdbinfoOpRecord, 0)
-		for tradeCode, remark := range recordMap {
-			recordList = append(recordList, &models.EdbinfoOpRecord{
-				TradeCode:  tradeCode,
-				Remark:     remark,
-				UserId:     sysUser.AdminId,
-				UserName:   sysUser.RealName,
-				CreateTime: time.Now(),
-			})
-		}
-		if len(recordList) > 0 {
-			go func() {
-				obj := models.EdbinfoOpRecord{}
-				_ = obj.MulCreate(recordList)
-			}()
-		}
-
 		// 错误信息记录
 		if len(errMsgList) > 0 {
 			utils.FileLog.Info("导入失败, errMsgList: %v", strings.Join(errMsgList, "\n"))
@@ -682,17 +662,18 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 		fmt.Println("lenCell:", lenCell)
 
 		// 校验日期格式
-		var startDateVal, endDateVal float64
+		var startDateVal, endDateVal, startTimeVal float64
+		var tmpErr error
 		if startDate != "" {
 			// 判断9:09:14日期格式是否正确
 			// 判断是否是数字
-			startDateVal, err = strconv.ParseFloat(startDate, 64)
-			if err == nil {
-				startDate = utils.ExcelDateToDate(startDate).Format(utils.FormatDate)
+			startDateVal, tmpErr = strconv.ParseFloat(startDate, 64)
+			if tmpErr == nil {
+				startDate = xlsx.TimeFromExcelTime(startDateVal, false).Format(utils.FormatDate)
 				fmt.Println(startDate)
 			} else {
-				startDate, err = getExcelDate(startDate)
-				if err != nil {
+				startDate, tmpErr = getExcelDate(startDate)
+				if tmpErr != nil {
 					failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
 						//Id:           0,
 						Title:          title,
@@ -715,10 +696,10 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 			}
 			if startTime != "" {
 				// 判断9:09:14日期格式是否正确
-				startTimeVal, tmpErr := strconv.ParseFloat(startTime, 64)
+				startTimeVal, tmpErr = strconv.ParseFloat(startTime, 64)
 				if tmpErr == nil {
 					startTimeVal = startDateVal + startTimeVal
-					startTime = utils.ExcelTimeToTime(startTimeVal).Format(utils.FormatTime)
+					startTime = xlsx.TimeFromExcelTime(startTimeVal, false).Format(utils.FormatTime)
 					fmt.Println(startTime)
 				} else {
 					_, tmpErr = time.Parse(utils.FormatDateTime, startDate+" "+startTime)
@@ -746,13 +727,13 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 			}
 		}
 		if endDate != "" {
-			endDateVal, err = strconv.ParseFloat(endDate, 64)
-			if err == nil {
-				endDate = utils.ExcelDateToDate(endDate).Format(utils.FormatDate)
+			endDateVal, tmpErr = strconv.ParseFloat(endDate, 64)
+			if tmpErr == nil {
+				endDate = xlsx.TimeFromExcelTime(endDateVal, false).Format(utils.FormatDate)
 				fmt.Println(endDate)
 			} else {
-				endDate, err = getExcelDate(endDate)
-				if err != nil {
+				endDate, tmpErr = getExcelDate(endDate)
+				if tmpErr != nil {
 					failDataList = append(failDataList, &knowledge.KnowledgeImportFail{
 						//Id:           0,
 						Title:          title,
@@ -778,7 +759,7 @@ func getDataByTemplateEvent(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 				endTimeVal, e := strconv.ParseFloat(endTime, 64)
 				if e == nil {
 					endTimeVal = endDateVal + endTimeVal
-					endTime = utils.ExcelTimeToTime(endTimeVal).Format(utils.FormatTime)
+					endTime = xlsx.TimeFromExcelTime(endTimeVal, false).Format(utils.FormatTime)
 					fmt.Println(endTime)
 				} else {
 					_, e = time.Parse(utils.FormatDateTime, endDate+" "+endTime)
@@ -928,9 +909,9 @@ func getDataByTemplatePoint(sheet *xlsx.Sheet, sysUserId, resourceType int) (ind
 		if startDate != "" {
 			// 判断9:09:14日期格式是否正确
 			// 判断是否是数字
-			_, tmpErr := strconv.Atoi(startDate)
+			startDateVal, tmpErr := strconv.ParseFloat(startDate, 64)
 			if tmpErr == nil {
-				startDate = utils.ExcelDateToDate(startDate).Format(utils.FormatDate)
+				startDate = xlsx.TimeFromExcelTime(startDateVal, false).Format(utils.FormatDate)
 				fmt.Println(startDate)
 			} else {
 				startDate, tmpErr = getExcelDate(startDate)