'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -470,12 +470,10 @@ func readToTable(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[s
 		m.Zcm = SysDictKit.MapDictKindChineseToCode["zcm_"+row[8]]
 		//编制
 		m.Bzlbm = SysDictKit.MapDictKindChineseToCode["bzlbm_"+row[9]]
-		//岗位
-		m.Gwzym = SysDictKit.MapDictKindChineseToCode["gwzym_"+row[10]]
 		//学段
-		m.StageId = SysDictKit.MapStageNameToId[row[11]]
+		m.StageId = SysDictKit.MapStageNameToId[row[10]]
 		//学科
-		m.SubjectId = SysDictKit.MapSubjectNameToId[row[12]]
+		m.SubjectId = SysDictKit.MapSubjectNameToId[row[11]]
 
 		//部门名称
 		m.OrgName = row[0]
@@ -486,9 +484,7 @@ func readToTable(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[s
 			m.OrgId = MapOrgName[m.OrgName]
 		}
 		//联系电话
-		m.Lxdh = row[13]
-		//邮箱
-		m.Dzxx = row[14]
+		m.Lxdh = row[12]
 		//批次号
 		m.BatchId = batchId
 		//第几行的数据
@@ -629,8 +625,6 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st
 	var _idCardMap = make(map[string][]int)
 	//手机号的map
 	var _mobileMap = make(map[string][]int)
-	////电子邮箱的map
-	var _emailMap = make(map[string][]int)
 
 	//遍历所有数据
 	rows, _ := f.GetRows(s1.Title)
@@ -717,36 +711,25 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st
 					pass = false
 				}
 			}
-			//(10)岗位
+			//(10)任课学段
 			if j == 10 {
-				if _, ok := SysDictKit.MapDictKindChineseToCode["gwzym_"+row[j]]; !ok {
-					pass = false
-				}
-			}
-			//(11)任课学段
-			if j == 11 {
 				if _, ok := SysDictKit.MapStageNameToId[row[j]]; !ok {
 					pass = false
 				}
 			}
-			//(12)任课学科
-			if j == 12 {
+			//(11)任课学科
+			if j == 11 {
 				if _, ok := SysDictKit.MapStageSubjectNameExist[row[j-1]+"_"+row[j]]; !ok {
 					pass = false
 				}
 			}
-			//(13)联系电话
-			if j == 13 {
+			//(12)联系电话
+			if j == 12 {
 				if row[j] != "" {
 					_mobileMap[row[j]] = append(_mobileMap[row[j]], i+1)
 				}
 			}
-			//(14)电子邮箱
-			if j == 14 {
-				if row[j] != "" {
-					_emailMap[row[j]] = append(_emailMap[row[j]], i+1)
-				}
-			}
+
 			//标红
 			cName, _ := excelize.ColumnNumberToName(j + 1)
 			cell := cName + CommonUtil.ConvertIntToString(i+1)
@@ -787,19 +770,6 @@ func checkExcel(excelPath string, s1 ExcelUtil.TemplateStruct, MapOrgName map[st
 			firstSuccess = false
 		}
 	}
-	//判断电子邮箱是不是在本EXCEL中存在重复，如果存在，需要进行标识
-	for _, rowArray := range _emailMap {
-		//重复
-		if len(rowArray) > 1 {
-			for i := range rowArray {
-				cell := "O" + CommonUtil.ConvertIntToString(rowArray[i])
-				//重复
-				style, _ := f.GetCellStyle(s1.Title, Const.BlueCell)
-				f.SetCellStyle(s1.Title, cell, cell, style)
-			}
-			firstSuccess = false
-		}
-	}
 	// 根据指定路径保存文件(不管是不是通过，都保存一次)
 	if err := f.SaveAs(excelPath); err != nil {
 		println(err.Error())