From 57ba6a53d410e4710b9b99c77aa03397e99ed853 Mon Sep 17 00:00:00 2001
From: wubin <kgdxpr@163.com>
Date: Thu, 20 Aug 2020 16:59:40 +0800
Subject: [PATCH] update

---
 .../BaseTeacherController.go                  | 33 ++++++++++++++++++-
 .../BaseTeacherProtoService.go                |  5 +++
 .../BaseTeacherProtoServiceRpc.go             | 21 ++++++++++--
 3 files changed, 56 insertions(+), 3 deletions(-)

diff --git a/dsBaseWeb/Business/BaseTeacher/BaseTeacherController/BaseTeacherController.go b/dsBaseWeb/Business/BaseTeacher/BaseTeacherController/BaseTeacherController.go
index 96fc0552..36f55bfc 100644
--- a/dsBaseWeb/Business/BaseTeacher/BaseTeacherController/BaseTeacherController.go
+++ b/dsBaseWeb/Business/BaseTeacher/BaseTeacherController/BaseTeacherController.go
@@ -34,6 +34,8 @@ func Routers(r *gin.RouterGroup) {
 	rr.POST("/SettingTeacherMultipleBureauInfo", SettingTeacherMultipleBureauInfo)
 	rr.GET("/PageTeacherMultipleBureauInfo", PageTeacherMultipleBureauInfo)
 	rr.POST("/DeleteTeacherMultipleBureauInfo", DeleteTeacherMultipleBureauInfo)
+	rr.POST("/SettingMainOrgInfo", SettingMainOrgInfo)
+
 
 	return
 }
@@ -712,7 +714,7 @@ func PageTeacherMultipleBureauInfo(c *gin.Context) {
 // @X-RoleLimit ["1","3","4"]
 // @X-Sort [13]
 func DeleteTeacherMultipleBureauInfo(c *gin.Context) {
-	//部门ID
+	//ID
 	id := c.PostForm("id")
 	r, err := BaseTeacherService.DeleteTeacherMultipleBureauInfo(id)
 	if err != nil {
@@ -727,3 +729,32 @@ func DeleteTeacherMultipleBureauInfo(c *gin.Context) {
 		Message: r.Message,
 	})
 }
+
+// @Summary 		设置主单位
+// @Description 	设置主单位
+// @Tags 教师信息
+// @Accept application/x-www-form-urlencoded
+// @Produce  json
+// @Param id formData string true "ID"
+// @Success 200 {object} Model.Res
+// @Router /base/teacher/SettingMainOrgInfo [post]
+// @X-EmptyLimit ["id"]
+// @X-LengthLimit [{"id":"36,36"}]
+// @X-RoleLimit ["1","3","4"]
+// @X-Sort [14]
+func SettingMainOrgInfo(c *gin.Context) {
+	//ID
+	id := c.PostForm("id")
+	r, err := BaseTeacherService.SettingMainOrgInfo(id)
+	if err != nil {
+		c.JSON(http.StatusOK, Model.Res{
+			Success: false,
+			Message: "调用RPC服务失败！",
+		})
+		return
+	}
+	c.JSON(http.StatusOK, Model.Res{
+		Success: r.Success,
+		Message: r.Message,
+	})
+}
diff --git a/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoService.go b/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoService.go
index d1e04c57..89e6e87c 100644
--- a/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoService.go
+++ b/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoService.go
@@ -139,3 +139,8 @@ func DeleteTeacherMultipleBureauInfo(id string) (*BaseTeacherProto.Reply, error)
 	Reply, err := DeleteTeacherMultipleBureau(BaseTeacherProto.MultipleBureauIdArg{Id: id})
 	return Reply, err
 }
+
+func SettingMainOrgInfo(id string) (*BaseTeacherProto.Reply, error) {
+	Reply, err := SettingMainOrg(BaseTeacherProto.MultipleBureauIdArg{Id: id})
+	return Reply, err
+}
diff --git a/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoServiceRpc.go b/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoServiceRpc.go
index e420d868..937bc87b 100644
--- a/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoServiceRpc.go
+++ b/dsBaseWeb/Business/BaseTeacher/BaseTeacherService/BaseTeacherProtoServiceRpc.go
@@ -238,7 +238,7 @@ func PageTeacherMultipleBureau(pageMultipleBureauArg BaseTeacherProto.PageMultip
 	c := BaseTeacherProto.NewBaseTeacherManageClient(conn)
 	Reply, err := c.PageTeacherMultipleBureau(ctx, &pageMultipleBureauArg)
 	if err != nil {
-		LogUtil.Error("设置教师多单位信息错误: ", err.Error())
+		LogUtil.Error("获取教师多单位列表错误: ", err.Error())
 	}
 	return Reply, err
 }
@@ -255,7 +255,24 @@ func DeleteTeacherMultipleBureau(multipleBureauIdArg BaseTeacherProto.MultipleBu
 	c := BaseTeacherProto.NewBaseTeacherManageClient(conn)
 	Reply, err := c.DeleteTeacherMultipleBureau(ctx, &multipleBureauIdArg)
 	if err != nil {
-		LogUtil.Error("设置教师多单位信息错误: ", err.Error())
+		LogUtil.Error("删除教师多单位信息错误: ", err.Error())
+	}
+	return Reply, err
+}
+
+func SettingMainOrg(multipleBureauIdArg BaseTeacherProto.MultipleBureauIdArg)  (*BaseTeacherProto.Reply, error) {
+	//1、准备动作：连接服务器
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
+	defer cancel()
+	conn := GRpcUtil.GetConnection()
+	if conn == nil {
+		return nil, errors.New("RPC服务未启动！")
+	}
+	//2、业务传参
+	c := BaseTeacherProto.NewBaseTeacherManageClient(conn)
+	Reply, err := c.SettingMainOrg(ctx, &multipleBureauIdArg)
+	if err != nil {
+		LogUtil.Error("设置主单位信息错误: ", err.Error())
 	}
 	return Reply, err
 }