'commit'

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -332,13 +332,13 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	}
 	//学段限定
 	dvRange := excelize.NewDataValidation(true)
-	dvRange.Sqref = "K" + CommonUtil.ConvertIntToString(ExcelUtil.HiddenRows+2) + ":K" + CommonUtil.ConvertIntToString(ExcelUtil.RowsCount+ExcelUtil.HiddenRows)
+	dvRange.Sqref = "M" + CommonUtil.ConvertIntToString(ExcelUtil.HiddenRows+2) + ":M" + CommonUtil.ConvertIntToString(ExcelUtil.RowsCount+ExcelUtil.HiddenRows)
 	dvRange.SetSqrefDropList("$"+startDictCName+"$1:$"+stopDictCName+"$1", true)
 	f.AddDataValidation(SheetName, dvRange)
 
 	//学科级联绑定
 	dvRange = excelize.NewDataValidation(true)
-	dvRange.Sqref = "L" + CommonUtil.ConvertIntToString(2+ExcelUtil.HiddenRows) + ":L" + CommonUtil.ConvertIntToString(ExcelUtil.RowsCount+ExcelUtil.HiddenRows)
+	dvRange.Sqref = "N" + CommonUtil.ConvertIntToString(2+ExcelUtil.HiddenRows) + ":N" + CommonUtil.ConvertIntToString(ExcelUtil.RowsCount+ExcelUtil.HiddenRows)
 	dvRange.SetSqrefDropList("INDIRECT($K"+CommonUtil.ConvertIntToString(ExcelUtil.HiddenRows+2)+")", true)
 	f.AddDataValidation(SheetName, dvRange)
 
@@ -372,6 +372,12 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 		list, _ := db.SQL(sql, bureauId).Query().List()
 		for i := range list {
 			record := list[i]
+			//扩展性别
+			if record["xbm"].(string) == "2" {
+				record["xbm"] = "男"
+			} else {
+				record["xbm"] = "女"
+			}
 			//扩展民族
 			record["mzm"] = SysDictKit.MapDictKindCodeToChinese["mzm"+"_"+record["mzm"].(string)]
 			//扩展政治面貌