|
|
@@ -98,11 +98,9 @@ func (s *SamplesSourceService) InsertExcelAnimal(excelpath, tablename, accode, c
|
|
|
basestation.ProvinceName = cell.String()
|
|
|
} else if cellindex == 1 {
|
|
|
if cell.String() == "" {
|
|
|
- basestation.Name = "其他"
|
|
|
- basestation.Genus = "其他"
|
|
|
+ basestation.ZBack37 = "其他"
|
|
|
} else {
|
|
|
- basestation.Name = cell.String()
|
|
|
- basestation.Genus = cell.String()
|
|
|
+ basestation.ZBack37 = cell.String()
|
|
|
}
|
|
|
} else if cellindex == 2 {
|
|
|
basestation.CityName = cell.String()
|
|
|
@@ -140,6 +138,8 @@ func (s *SamplesSourceService) InsertExcelAnimal(excelpath, tablename, accode, c
|
|
|
}
|
|
|
|
|
|
basestation.AccCode = accode
|
|
|
+ basestation.Name = ""
|
|
|
+ basestation.Genus = ""
|
|
|
basestation.Unit = "群"
|
|
|
basestation.ProjectId = 0
|
|
|
basestation.ProjectName = "技术体系"
|
|
|
@@ -151,7 +151,7 @@ func (s *SamplesSourceService) InsertExcelAnimal(excelpath, tablename, accode, c
|
|
|
sqlfield = sqlfield + "Street,StreetName,Address,AreaCode,Longitude,Latitude,Altitude,SurveyDate,"
|
|
|
sqlfield = sqlfield + "ProjectId,ProjectName,"
|
|
|
sqlfield = sqlfield + "CreateUserId,CreateBy,CreateOn,"
|
|
|
- sqlfield = sqlfield + "ZBack11,ZBack17"
|
|
|
+ sqlfield = sqlfield + "ZBack11,ZBack17,ZBack37"
|
|
|
//sqlfield = sqlfield + notefieldstr
|
|
|
|
|
|
sqlvalue := "'" + basestation.AccCode + "','" + basestation.Genus + "','" + basestation.InnerNo + "','" + basestation.Name + "'," + utils.ToStr(basestation.Amount) + ",'" + basestation.Unit + "',"
|
|
|
@@ -159,7 +159,7 @@ func (s *SamplesSourceService) InsertExcelAnimal(excelpath, tablename, accode, c
|
|
|
sqlvalue = sqlvalue + "'" + basestation.StreetName + "','" + basestation.Address + "','" + basestation.AreaCode + "','" + basestation.Longitude + "','" + basestation.Latitude + "',"
|
|
|
sqlvalue = sqlvalue + "'" + basestation.Altitude + "','" + basestation.SurveyDate.Format("2006-1-2 15:4:5") + "'," + utils.ToStr(basestation.ProjectId) + ",'" + basestation.ProjectName + "',"
|
|
|
sqlvalue = sqlvalue + "" + utils.ToStr(basestation.CreateUserId) + ",'" + basestation.CreateBy + "'," + "now(),"
|
|
|
- sqlvalue = sqlvalue + "'" + basestation.ZBack11 + "','" + basestation.ZBack17 + "'"
|
|
|
+ sqlvalue = sqlvalue + "'" + basestation.ZBack11 + "','" + basestation.ZBack17 + "','" + basestation.ZBack37 + "'"
|
|
|
//sqlvalue = sqlvalue + notevaluestr
|
|
|
s.AddLine(tablename, sqlfield, sqlvalue, basestation.InnerNo)
|
|
|
|
shiyi