|
@@ -812,13 +812,13 @@ func getDataByTemplate1(sheet *xlsx.Sheet, sysUserId int) (indexDataList []Impor
|
|
|
|
|
|
|
|
|
func getDataByTemplate2(sheet *xlsx.Sheet, sysUserId int) (indexDataList []ImportManualIndexData, failDataList []*models.EdbdataImportFail, err error, errMsg string) {
|
|
|
- fmt.Println("sheet name: ", sheet.Name)
|
|
|
+
|
|
|
indexDataList = make([]ImportManualIndexData, 0)
|
|
|
failDataList = make([]*models.EdbdataImportFail, 0)
|
|
|
|
|
|
|
|
|
maxRow := sheet.MaxRow
|
|
|
- fmt.Println("maxRow:", maxRow)
|
|
|
+
|
|
|
|
|
|
varietyList := make([]string, 0)
|
|
|
indexNameList := make([]string, 0)
|
|
@@ -896,24 +896,19 @@ func getDataByTemplate2(sheet *xlsx.Sheet, sysUserId int) (indexDataList []Impor
|
|
|
|
|
|
|
|
|
var dateErr bool
|
|
|
+ var emptyDate bool
|
|
|
|
|
|
|
|
|
for k, v := range cells {
|
|
|
if k == 0 {
|
|
|
+
|
|
|
+ if v.Value == `` {
|
|
|
+ emptyDate = true
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
tmpCurrDate, tmpErr := getExcelDate(v.Value)
|
|
|
if tmpErr != nil {
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
dateErr = true
|
|
|
}
|
|
|
|
|
@@ -922,7 +917,12 @@ func getDataByTemplate2(sheet *xlsx.Sheet, sysUserId int) (indexDataList []Impor
|
|
|
}
|
|
|
key := k - 1
|
|
|
|
|
|
-
|
|
|
+
|
|
|
+ if emptyDate {
|
|
|
+ continue
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
if dateErr {
|
|
|
var indexName, unit, classifyName, frequency string
|
|
|
if key <= maxNameIndex {
|