diff --git a/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx b/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx index 67a1bde5..8c3d4ece 100644 Binary files a/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx and b/dsBaseRpc/Config/ImportExcelTemplate/student.xlsx differ diff --git a/dsBaseRpc/Config/ImportExcelTemplate/teacher2222.xlsx b/dsBaseRpc/Config/ImportExcelTemplate/teacher2222.xlsx new file mode 100644 index 00000000..4caac5a3 Binary files /dev/null and b/dsBaseRpc/Config/ImportExcelTemplate/teacher2222.xlsx differ diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go index c760790c..a60573d8 100644 --- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go +++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go @@ -206,7 +206,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, - (case t1.sfzjh when '-1' then '' else t1.sfzjh end ) as sfzjh, + (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`). From("t_base_student as t1").InnerJoin("t_base_class as t2", "t1.class_id=t2.class_id"). diff --git a/dsBaseRpc/Test/excel_test.go b/dsBaseRpc/Test/excel_test.go index 6ed7e6fa..55c5278e 100644 --- a/dsBaseRpc/Test/excel_test.go +++ b/dsBaseRpc/Test/excel_test.go @@ -1,24 +1,21 @@ package Test import ( - "dsBaseRpc/Const" "dsBaseRpc/RpcService/BaseStudent/BaseStudentDao" - "dsBaseRpc/RpcService/BaseTeacher/BaseTeacherDao" - "github.com/360EntSecGroup-Skylar/excelize/v2" "testing" ) func TestStyle(t *testing.T) { - excelPath := `E:\Work\dsMin\dsBaseRpc\Config\ImportExcelTemplate\teacher.xlsx` - tPath := `E:\Work\dsMin\dsBaseRpc\Config\ImportExcelTemplate\teacher2222.xlsx` - f, _ := excelize.OpenFile(excelPath) - - style, _ := f.GetCellStyle("教工信息", Const.RedCell) - f.SetCellStyle("教工信息", "A202", "A202", style) - - if err := f.SaveAs(tPath); err != nil { - println(err.Error()) - } + //excelPath := `E:\Work\dsMin\dsBaseRpc\Config\ImportExcelTemplate\teacher.xlsx` + //tPath := `E:\Work\dsMin\dsBaseRpc\Config\ImportExcelTemplate\teacher2222.xlsx` + //f, _ := excelize.OpenFile(excelPath) + // + //style, _ := f.GetCellStyle("教工信息", Const.RedCell) + //f.SetCellStyle("教工信息", "A202", "A202", style) + // + //if err := f.SaveAs(tPath); err != nil { + // println(err.Error()) + //} } func TestImportTeacher(t *testing.T) { @@ -41,10 +38,10 @@ func TestImportTeacher(t *testing.T) { */ func TestTeacherExportExcel(t *testing.T) { //哪个单位 - bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0" - //文件在哪里 - fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx" - BaseTeacherDao.ExportTeacherInfoExcel(fileName, bureauId, 1) + //bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0" + ////文件在哪里 + //fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx" + //BaseTeacherDao.ExportTeacherInfoExcel(fileName, bureauId, 1) } /** @@ -54,7 +51,7 @@ func TestTeacherExportExcel(t *testing.T) { */ func TestStudentExportExcel(t *testing.T) { //哪个单位 - bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0" + bureauId := "7ED4080B-924F-40F0-9004-881A2B833E44" //文件在哪里 fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx" BaseStudentDao.ExportStudentInfoExcel(fileName, bureauId, 1, []string{}) diff --git a/dsBaseWeb/Html/ExcelTemp/7ED4080B-924F-40F0-9004-881A2B833E44.xlsx b/dsBaseWeb/Html/ExcelTemp/7ED4080B-924F-40F0-9004-881A2B833E44.xlsx new file mode 100644 index 00000000..4a7a8f48 Binary files /dev/null and b/dsBaseWeb/Html/ExcelTemp/7ED4080B-924F-40F0-9004-881A2B833E44.xlsx differ