From cd1bfce316d76594bd2db2cd556733f779acac9a Mon Sep 17 00:00:00 2001
From: huanghai <10402852@qq.com>
Date: Fri, 21 Aug 2020 08:02:08 +0800
Subject: [PATCH] 'commit'

---
 .../BaseStudentDao/BaseStudentDao.go          | 26 +++++++++++++++++--
 dsBaseRpc/Tools/MockData/MockData.go          | 17 +-----------
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
index fb7dea1d..d0b2fa9e 100644
--- a/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
+++ b/dsBaseRpc/RpcService/BaseStudent/BaseStudentDao/BaseStudentDao.go
@@ -3,6 +3,7 @@ package BaseStudentDao
 import (
 	"dsBaseRpc/Const"
 	"dsBaseRpc/RpcService/BaseClass/BaseClassDao"
+	"dsBaseRpc/RpcService/BaseOrganization/BaseOrganizationDao"
 	"dsBaseRpc/RpcService/BaseParent/BaseParentDao"
 	"dsBaseRpc/RpcService/BaseStudent/BaseStudentProto"
 	"dsBaseRpc/RpcService/SysDict/SysDictKit"
@@ -19,6 +20,7 @@ import (
 	"dsBaseRpc/Utils/RedisUtil"
 	"dsBaseRpc/Utils/SqlKit"
 	"dsBaseRpc/models"
+	"errors"
 	"fmt"
 	"github.com/360EntSecGroup-Skylar/excelize/v2"
 	"github.com/xormplus/builder"
@@ -142,7 +144,7 @@ func ExportStudentAccountInfoExcel(in *BaseStudentProto.ModelArg) ([]map[string]
 		InnerJoin("t_base_student as t2", "t1.person_id=t2.person_id").
 		InnerJoin("t_base_class as t3", "t2.class_id=t3.class_id").
 		InnerJoin("t_dm_stage as t4", "t3.stage_id=t4.stage_id").
-		InnerJoin("t_base_parent as t5","t2.person_id=t5.student_id")
+		InnerJoin("t_base_parent as t5", "t2.person_id=t5.student_id")
 
 	myBuilder.Where(builder.Eq{"t1.b_use": 1}).
 		And(builder.Eq{"t2.b_use": 1}).
@@ -274,7 +276,7 @@ func ExportStudentInfoExcel(targetPath string, bureauId string, ExportExcelStatu
 			//单独填充上person_id,为了能在没有身份号的唯一标识的情况下，确定是新增还是修改
 			cName := "Q"
 			cName = cName + strconv.Itoa(i+2+ExcelUtil.HiddenRows)
-			f.SetCellValue(SheetName, cName, list[i]["person_id"])
+			_ = f.SetCellValue(SheetName, cName, list[i]["person_id"])
 		}
 	}
 	// 6、根据指定路径保存文件
@@ -985,3 +987,23 @@ func GetParentIds(studentIds []string) ([]string, error) {
 	}
 	return parentIds, nil
 }
+
+//学生的调转
+func StudentTransfer(personId string, classId string) error {
+	//1、获取班级信息
+	list := SqlKit.QueryByIds([]string{classId}, "t_base_class")
+	if list == nil || len(list) == 0 {
+		return errors.New("没有找到指定的班级信息")
+	}
+	//单位ID
+	bureauId := list[0]["bureau_id"].(string)
+	_, provinceCode, cityCode, districtCode, mainSchoolId, _ := BaseOrganizationDao.GetBureauAdministrativeDivision(bureauId)
+	//2、修改学生信息
+	sql := `update t_base_student set bureau_id,class_id=?,province_code=?,city_code=?,district_code=?,main_school_id=? where student_id=? and b_use=1`
+	_,_=db.SQL(sql, bureauId, classId, provinceCode, cityCode, districtCode, mainSchoolId, personId).Execute()
+	//3、修改家长信息
+	sql = `update t_base_parent set bureau_id=?,class_id=?,province_code=?,city_code=?,district_code=?,main_school_id=? where student_id=? and b_use=1`
+	_,_=db.SQL(sql, bureauId, classId, provinceCode, cityCode, districtCode, mainSchoolId, personId).Execute()
+
+	return nil
+}
diff --git a/dsBaseRpc/Tools/MockData/MockData.go b/dsBaseRpc/Tools/MockData/MockData.go
index 24d14ae1..6574c4e8 100644
--- a/dsBaseRpc/Tools/MockData/MockData.go
+++ b/dsBaseRpc/Tools/MockData/MockData.go
@@ -156,9 +156,6 @@ func addBureau(areaCode string, jiaoYuJuId string, areaName string, provinceCode
 func addManager(bureauId string, bureauName string, orgType int32, ProvinceCode string, CityCode string, DistrictCode string, loginBean LoginAccount) {
 	//(1)插入基本人员信息
 	model := new(models.TBaseTeacher)
-	model.ProvinceCode = ProvinceCode
-	model.CityCode = CityCode
-	model.DistrictCode = DistrictCode
 	model.PersonId = CommonUtil.GetUUID()
 	model.IdentityId = 1
 	model.Xm = bureauName + "管理员"
@@ -181,9 +178,6 @@ func addManager(bureauId string, bureauName string, orgType int32, ProvinceCode
 	model.Lxdh = "18888888888"
 	model.Dzxx = "xx@dsideal.com"
 	model.BUse = 1
-	model.BureauId = bureauId
-	model.OrgId = bureauId
-	model.SortId = 1
 	arrayTBaseTeacher = append(arrayTBaseTeacher, *model)
 	//(2)生成登录名和密码
 	modelLoginPerson := new(models.TSysLoginperson)
@@ -290,16 +284,7 @@ func addTeacher(bureauId string, provinceCode string, cityCode string, districtC
 		model.BUse = 1
 		//教师的身份ID
 		model.IdentityId = 2
-		//排序号
-		model.SortId = 1
-		//主单位与主部门
-		model.BureauId = bureauId
-		model.OrgId = bureauId
-		//所属省市县
-		model.ProvinceCode = provinceCode
-		model.CityCode = cityCode
-		model.DistrictCode = districtCode
-		model.MainSchoolId = mainSchoolId
+
 		//调用DAO保存
 		arrayTBaseTeacher = append(arrayTBaseTeacher, *model)
 		// 生成教师账号