Merge branch 'master' of 10.10.14.250:huanghai/dsMin

dsBaseRpc/RpcService/BaseClass/BaseClassDao/BaseClassDao.go

@@ -144,6 +144,7 @@ func GetRxnf(schoolId string, stageId string) ([]map[string]interface{}, int32,
 		From("t_base_class").
 		Where(builder.Eq{"bureau_id": schoolId}).
 		And(builder.Eq{"stage_id": stageId}).
+		And(builder.Eq{"b_use": 1}).
 		OrderBy("rxnf")
 	sql, err := myBuilder.ToBoundSQL()
 	if err != nil {

dsBaseRpc/Test/excel_test.go

@@ -25,7 +25,7 @@ func TestImportTeacher(t *testing.T) {
 	////哪个单位
 	//bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	////文件在哪里
-	//fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Static\\ExcelTemp\\" + bureauId + ".xlsx"
+	//fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx"
 	//success, message, err := BaseTeacherDao.ImportTeacherInfoExcel(fileName, bureauId)
 	//if err != nil {
 	//	fmt.Println(err.Error())
@@ -43,7 +43,7 @@ func TestTeacherExportExcel(t *testing.T) {
 	//哪个单位
 	bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	//文件在哪里
-	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Static\\ExcelTemp\\" + bureauId + ".xlsx"
+	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx"
 	BaseTeacherDao.ExportTeacherInfoExcel(fileName, bureauId, 1)
 }
 
@@ -56,7 +56,7 @@ func TestStudentExportExcel(t *testing.T) {
 	//哪个单位
 	bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	//文件在哪里
-	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Static\\ExcelTemp\\" + bureauId + ".xlsx"
+	fileName := "E:\\Work\\dsMin\\dsBaseWeb\\Html\\ExcelTemp\\" + bureauId + ".xlsx"
 	BaseStudentDao.ExportStudentInfoExcel(fileName, bureauId, 1, []string{})
 }
 
@@ -64,7 +64,7 @@ func TestImportStudent(t *testing.T) {
 	////哪个单位
 	//bureauId := "042F28BE-296C-40F4-8AD4-A68A6D852CF0"
 	////文件在哪里
-	//fileName := `E:\Work\dsMin\dsBaseWeb\Static\ExcelTemp\` + bureauId + ".xlsx"
+	//fileName := `E:\Work\dsMin\dsBaseWeb\html\ExcelTemp\` + bureauId + ".xlsx"
 	//success, message, err := BaseStudentDao.ImportStudentInfoExcel(fileName, bureauId)
 	//if err != nil {
 	//	fmt.Println(err.Error())

dsBaseRpc/Test/readXlsx_test.go

@@ -6,7 +6,7 @@ import (
 )
 
 func TestReadXlsx(t *testing.T){
-	outFileName:=`E:\Work\dsMin\dsBaseWeb\Static\ExcelTemp\test2.xlsx`
+	outFileName:=`E:\Work\dsMin\dsBaseWeb\Html\ExcelTemp\test2.xlsx`
 	file := xlsx.NewFile()
 	sheet,err := file.AddSheet("sheet1")
 	if err != nil  {

dsBaseRpc/Utils/CommonUtil/CommonUtil.go

@@ -581,7 +581,7 @@ func IsContainInt32(items []int32, item int32) bool {
 func GetExportExcelFilePath() string {
 	TargetPath, _ := os.Getwd()
 	//生成随机的文件名
-	TargetPath = filepath.Dir(TargetPath) + "/dsBaseWeb/Static/ExcelTemp/" + GetUUID() + ".xlsx"
+	TargetPath = filepath.Dir(TargetPath) + "/dsBaseWeb/Html/ExcelTemp/" + GetUUID() + ".xlsx"
 	return TargetPath
 }