diff --git a/dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json b/dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json new file mode 100644 index 00000000..7bbff5b8 --- /dev/null +++ b/dsBaseRpc/Config/ExcelStyle/tableStyleIntNormal.json @@ -0,0 +1,34 @@ +{ + "font": { + "family": "宋体", + "size": 14, + "color": "#000000" + }, + "alignment": { + "horizontal": "center", + "vertical": "center" + }, + "number_format": 1, + "border": [ + { + "type": "left", + "color": "000000", + "style": 1 + }, + { + "type": "right", + "color": "000000", + "style": 1 + }, + { + "type": "top", + "color": "000000", + "style": 1 + }, + { + "type": "bottom", + "color": "000000", + "style": 1 + } + ] +} \ No newline at end of file diff --git a/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx b/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx index 45f2bc34..d3a10f1d 100644 Binary files a/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx and b/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx differ diff --git a/dsBaseRpc/Config/ImportExcelTemplate/teacher.xlsx b/dsBaseRpc/Config/ImportExcelTemplate/teacher.xlsx index 382dc93a..aae63e5d 100644 Binary files a/dsBaseRpc/Config/ImportExcelTemplate/teacher.xlsx and b/dsBaseRpc/Config/ImportExcelTemplate/teacher.xlsx differ diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go index 9b259bfb..697c5a6c 100644 --- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go +++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go @@ -181,20 +181,24 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu _ = 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++ { - //入学年份 - dvRange := excelize.NewDataValidation(true) - dvRange.Sqref = "B" + CommonUtil.ConvertIntToString(k) + ":B" + CommonUtil.ConvertIntToString(k) - _ = dvRange.SetRange(2014, 2030, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween) - dvRange.SetError(excelize.DataValidationErrorStyleStop, "入学年份校验错误", "系统只支持2014-2030年度的班级!") - _ = f.AddDataValidation(SheetName, dvRange) - //班号 - dvRange = excelize.NewDataValidation(true) - dvRange.Sqref = "C" + CommonUtil.ConvertIntToString(k) + ":C" + CommonUtil.ConvertIntToString(k) - _ = dvRange.SetRange(1, 99, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween) - dvRange.SetError(excelize.DataValidationErrorStyleStop, "班号录入错误", "系统只支持1-99的班号!") - _ = f.AddDataValidation(SheetName, dvRange) - } + //for k := 2 + ExcelUtil.HiddenRows; k <= 5000+ExcelUtil.HiddenRows; k++ { + // //入学年份 + // dvRange := excelize.NewDataValidation(true) + // dvRange.Sqref = "B" + CommonUtil.ConvertIntToString(k) + ":B" + CommonUtil.ConvertIntToString(k) + // _ = dvRange.SetRange(2014, 2030, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween) + // dvRange.SetError(excelize.DataValidationErrorStyleStop, "入学年份校验错误", "系统只支持2014-2030年度的班级!") + // _ = f.AddDataValidation(SheetName, dvRange) + // //设置单元格格式 + // + // //班号 + // dvRange = excelize.NewDataValidation(true) + // dvRange.Sqref = "C" + CommonUtil.ConvertIntToString(k) + ":C" + CommonUtil.ConvertIntToString(k) + // _ = dvRange.SetRange(1, 99, excelize.DataValidationTypeWhole, excelize.DataValidationOperatorBetween) + // dvRange.SetError(excelize.DataValidationErrorStyleStop, "班号录入错误", "系统只支持1-99的班号!") + // _ = f.AddDataValidation(SheetName, dvRange) + // //设置单元格格式 + // + //} //4、添加是否的下拉框K--->P for i := 11; i <= 16; i++ { //要设置下拉框的列