|
@@ -800,7 +800,7 @@ func getDataByTemplate1(sheet *xlsx.Sheet, sysUserId int) (indexDataList []Impor
|
|
|
// @return indexDataList []ImportManualIndexData
|
|
|
// @return err error
|
|
|
// @return errMsg string
|
|
|
-func getDataByTemplate2(sheet *xlsx.Sheet) (indexDataList []ImportManualIndexData, failDataList []*models.EdbdataImportFail, err error, errMsg string) {
|
|
|
+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)
|
|
@@ -898,13 +898,26 @@ func getDataByTemplate2(sheet *xlsx.Sheet) (indexDataList []ImportManualIndexDat
|
|
|
currDate = tmpCurrDate
|
|
|
continue
|
|
|
}
|
|
|
+ key := k - 1
|
|
|
|
|
|
// 日期异常,所以不处理该行了
|
|
|
if dateErr {
|
|
|
+ varietyList[key]
|
|
|
+ failDataList = append(failDataList, &models.EdbdataImportFail{
|
|
|
+ //Id: 0,
|
|
|
+ ClassifyName: classifyName,
|
|
|
+ CreateDate: currDate,
|
|
|
+ SecName: indexName,
|
|
|
+ Close: cells[3].Value,
|
|
|
+ Remark: "值类型异常",
|
|
|
+ SysUserId: strconv.Itoa(sysUserId),
|
|
|
+ Frequency: frequency,
|
|
|
+ Unit: unit,
|
|
|
+ })
|
|
|
+
|
|
|
continue
|
|
|
}
|
|
|
|
|
|
- key := k - 1
|
|
|
_, ok := indexDateValueMap[key]
|
|
|
if !ok {
|
|
|
indexDateValueMap[key] = make(map[string]string)
|