'commit'

dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go

@@ -165,7 +165,7 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	//2、添加批注
 	f.AddComment(SheetName, "B201", `{"author":"示例: ","text":"填写年份全称,如：2019 或 2020。"}`)
 	f.AddComment(SheetName, "C201", `{"author":"示例: ","text":"填写本年级内班级的编号,如：1或2,代表本年级内的1班或2班。"}`)
-
+	f.AddComment(SheetName, "F201", `{"author":"示例: ","text":"1980-01-01"}`)
 	//3、入学年份+班号的有效性
 	for k := 2 + ExcelUtil.HiddenRows; k <= 5000+ExcelUtil.HiddenRows; k++ {
 		//入学年份
@@ -181,8 +181,8 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 		dvRange.SetError(excelize.DataValidationErrorStyleStop, "班号录入错误", "系统只支持1-99的班号！")
 		f.AddDataValidation(SheetName, dvRange)
 	}
-	//4、添加是否的下拉框L--->N
+	//4、添加是否的下拉框K--->P
-	for i := 9; i <= 14; i++ {
+	for i := 11; i <= 16; i++ {
 		//要设置下拉框的列
 		cName, _ := excelize.ColumnNumberToName(i)
 		dvRange := excelize.NewDataValidation(true)
@@ -204,7 +204,7 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	}
 	if ExportExcelStatus > 0 {
 		//将现有数据填充到下载的模板中
-		var myBuilder = builder.Dialect(builder.MYSQL).Select(`t2.stage_id,t2.rxnf,t2.bh,t1.xm,
+		var myBuilder = builder.Dialect(builder.MYSQL).Select(`t2.stage_id,t2.rxnf,t2.bh,t1.xm,t1.xbm,t1.csrq,
          (case t1.sfzjh when '-1' then '' else t1.sfzjh  end ) as sfzjh,
 		   t1.mzm,t1.zzmmm,t1.sfzjlxm,t1.dszybz,t1.sqznbz,t1.jcwgrysqznbz,
 		   t1.gebz,t1.lsetbz,t1.cjbz`).
@@ -224,6 +224,12 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 		}
 		for i := range list {
 			record := list[i]
+			//扩展性别
+			if record["xbm"].(string) == "2" {
+				record["xbm"] = "男"
+			} else {
+				record["xbm"] = "女"
+			}
 			//扩展学段
 			record["stage_name"] = SysDictKit.MapStageIdToName[record["stage_id"].(string)]
 			//扩展民族
@@ -246,7 +252,7 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 			record["cjbz"] = SysDictKit.MapTrueOrFalseValueToName[CommonUtil.ConvertInt64ToString(record["cjbz"].(int64))]
 		}
 		//填充
-		var colNames = []string{"stage_name", "rxnf", "bh", "xm", "mzm", "zzmmm", "sfzjlxm", "sfzjh", "dszybz", "sqznbz", "jcwgrysqznbz", "gebz", "lsetbz", "cjbz"}
+		var colNames = []string{"stage_name", "rxnf", "bh", "xm", "xbm", "csrq", "mzm", "zzmmm", "sfzjlxm", "sfzjh", "dszybz", "sqznbz", "jcwgrysqznbz", "gebz", "lsetbz", "cjbz"}
 		for i := range list {
 			for j := range colNames {
 				cName, _ := excelize.ColumnNumberToName(j + 1)

dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao/BaseTeacherDao.go

@@ -296,6 +296,9 @@ func ExportTeacherInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 	//1、配置文件
 	jsonTemplate := "teacher.json"
 	f, s1, dictCols, SheetName := ExcelUtil.TemplateAddDict("teacher.xlsx", jsonTemplate)
+	//添加注释
+	f.AddComment(SheetName, "D201", `{"author":"示例: ","text":"1980-01-01"}`)
+
 	//数据准备
 	list, _ := db.SQL(s1.Level2Sql[0][0]).Query().List()
 	//初始列