update

dsBaseWeb/docs/swagger.yaml

@@ -35,6 +35,10 @@ definitions:
               description: 行政区划类型  0：无  1：县市区  2：开发区
               example: 0
               type: integer
+            b_use:
+              description: 是否启用
+              example: 1
+              type: integer
             master_code:
               description: 上级行政区划代码
               example: "0"
@@ -582,6 +586,10 @@ definitions:
               description: 机构联系电话
               example: ""
               type: string
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -641,6 +649,10 @@ definitions:
               description: 机构联系电话
               example: ""
               type: string
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -680,6 +692,10 @@ definitions:
               description: 创建时间
               example: "2020-07-28 09:50:16"
               type: timestamp
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -735,10 +751,6 @@ definitions:
               description: 创建时间
               example: "2020-07-28 09:50:16"
               type: timestamp
-            directly_under_type:
-              description: 直属类型 1：普通 2：省直 3：市直  4：中直
-              example: 0
-              type: integer
             fddbr:
               description: 机构法定代表人
               example: ""
@@ -763,9 +775,9 @@ definitions:
               description: 主校类型，1：普通校，2：主校，3：分校
               example: -1
               type: integer
-            manage_org_id:
-              description: 上级管理单位ID（*一个单位只能有一个上级管理单位）
-              example: 0001E72B-BA0D-4FA4-A61E-C481FD4979A6
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
               type: string
             org_code:
               description: 组织机构编码
@@ -787,10 +799,6 @@ definitions:
               description: 学校城乡类型（学校专有属性）有字典
               example: ""
               type: string
-            xxbbm:
-              description: 学校办别（学校专有属性）有字典
-              example: ""
-              type: string
             xxbxlxm:
               description: 学校办学类型（学校专有属性）有字典
               example: ""
@@ -826,6 +834,10 @@ definitions:
               description: 创建时间
               example: "2020-07-28 09:50:16"
               type: timestamp
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -865,6 +877,10 @@ definitions:
               description: 创建时间
               example: "2020-07-28 09:50:16"
               type: timestamp
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -912,6 +928,10 @@ definitions:
               description: 初始密码
               example: "741369"
               type: string
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -955,6 +975,10 @@ definitions:
               description: 主校类型，1：普通校，2：主校，3：分校
               example: -1
               type: integer
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -998,6 +1022,10 @@ definitions:
               description: 创建时间
               example: "2020-07-28 09:50:16"
               type: timestamp
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -1049,6 +1077,10 @@ definitions:
               description: 主校类型，1：普通校，2：主校，3：分校
               example: -1
               type: integer
+            manager_area_code:
+              description: 上级管理单位所在行政区划码
+              example: ""
+              type: string
             org_code:
               description: 组织机构编码
               example: 4C798F41-584C-4C15-A648-09B9BB
@@ -3355,11 +3387,6 @@ paths:
         name: orgName
         required: true
         type: string
-      - description: 直属类型 1：普通 2：省直 3：市直
-        in: formData
-        name: directlyUnderType
-        required: true
-        type: integer
       - description: 是否为分校 -1：非分校 1：是分校
         in: formData
         name: isBranchSchool
@@ -3369,9 +3396,9 @@ paths:
         in: formData
         name: mainSchoolId
         type: string
-      - description: 学校办别（字典：xxbbm）
+      - description: 上级管理单位行政区划编码
         in: formData
-        name: xxbbm
+        name: managerAreaCode
         required: true
         type: string
       - description: 学校办学类型（字典：xxbxlxm）
@@ -3389,6 +3416,10 @@ paths:
         name: xxjbzm
         required: true
         type: string
+      - description: 附设班办学类型ID,多个用逗号分隔
+        in: formData
+        name: fsbIds
+        type: string
       - description: 学校法定代表人
         in: formData
         name: fddbr
@@ -3839,11 +3870,11 @@ paths:
     get:
       consumes:
       - application/x-www-form-urlencoded
-      description: 根据单位ID获取部门树
+      description: 根据单位名称的关键字和管理员的人员ID查询单位列表
       parameters:
-      - description: 单位ID
+      - description: 单位名称关键字
         in: query
-        name: orgId
+        name: keyWord
         required: true
         type: string
       produces:
@@ -3853,49 +3884,21 @@ paths:
           description: OK
           schema:
             $ref: '#/definitions/Model.Res'
-      summary: 根据单位ID获取部门树
+      summary: 根据单位名称的关键字和管理员的人员ID查询单位列表
       tags:
       - 组织机构
       x-emptylimit:
-      - orgId
+      - keyWord
       x-lengthlimit:
-      - orgId: 36,36
+      - keyWord: 2,30
       x-removeswaggerfield:
       - id_int
-      - bureau_id
-      - org_type
-      - edu_assist_type
-      - main_school_type
-      - main_school_id
-      - manage_org_id
-      - directly_under_type
-      - xxbbm
-      - xxbxlxm
-      - szdcxlxm
-      - xxjbzm
-      - fzr
-      - fddbr
-      - fddbrdh
-      - address
-      - lxdh
-      - org_lng
-      - org_lat
-      - b_use
-      - province_code
-      - city_code
-      - district_code
-      - area_code
-      - last_updated_time
       x-rolelimit:
       - "1"
-      - "2"
       - "3"
       - "4"
-      - "5"
-      - "6"
-      - "7"
       x-sort:
-      - 22
+      - 23
   /base/organization/GetSchoolInfoById:
     get:
       consumes:
@@ -3947,6 +3950,37 @@ paths:
       - 13
       x-tablename:
       - t_base_organization
+  /base/organization/ListEduByCityCodeInfo:
+    get:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 根据市的行政区划码获取教育局列表
+      parameters:
+      - description: 市的行政区划码
+        in: query
+        name: cityCode
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 根据市的行政区划码获取教育局列表
+      tags:
+      - 组织机构
+      x-emptylimit:
+      - cityCode
+      x-lengthlimit:
+      - cityCode: 6,6
+      x-rolelimit:
+      - "1"
+      - "3"
+      - "4"
+      x-sort:
+      - 24
   /base/organization/PageDisableEduInfo:
     get:
       consumes:
@@ -4682,11 +4716,6 @@ paths:
         name: orgName
         required: true
         type: string
-      - description: 直属类型 1：普通 2：省直 3：市直
-        in: formData
-        name: directlyUnderType
-        required: true
-        type: integer
       - description: 是否为分校 -1：非分校 1：是分校
         in: formData
         name: isBranchSchool
@@ -4696,9 +4725,9 @@ paths:
         in: formData
         name: mainSchoolId
         type: string
-      - description: 学校办别（字典：xxbbm）
+      - description: 上级管理单位行政区划编码
         in: formData
-        name: xxbbm
+        name: managerAreaCode
         required: true
         type: string
       - description: 学校办学类型（字典：xxbxlxm）
@@ -4716,6 +4745,10 @@ paths:
         name: xxjbzm
         required: true
         type: string
+      - description: 附设班办学类型ID,多个用逗号分隔
+        in: formData
+        name: fsbIds
+        type: string
       - description: 学校法定代表人
         in: formData
         name: fddbr
@@ -5873,6 +5906,40 @@ paths:
       - "7"
       x-sort:
       - 6
+  /base/student/StudentTransferInfo:
+    post:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 修改学生信息
+      parameters:
+      - description: 学生ID
+        in: formData
+        name: personId
+        required: true
+        type: string
+      - description: 班级ID
+        in: formData
+        name: classId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 修改学生信息
+      tags:
+      - 学生信息
+      x-emptylimit:
+      - classId
+      - personId
+      x-lengthlimit:
+      - classId: 36,36
+      - personId: 36,36
+      x-sort:
+      - 10
   /base/student/UpdateStudentInfo:
     post:
       consumes:
@@ -6063,6 +6130,10 @@ paths:
         name: subjectId
         required: true
         type: string
+      - description: 职务ID,多个用逗号分隔
+        in: formData
+        name: positionIds
+        type: string
       - description: 从教年月
         in: formData
         name: cjny
@@ -6166,6 +6237,37 @@ paths:
       - "7"
       x-sort:
       - 4
+  /base/teacher/DeleteTeacherMultipleBureauInfo:
+    post:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 删除教职工所在多单位信息
+      parameters:
+      - description: ID
+        in: formData
+        name: id
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 删除教职工所在多单位信息
+      tags:
+      - 教师信息
+      x-emptylimit:
+      - id
+      x-lengthlimit:
+      - id: 36,36
+      x-rolelimit:
+      - "1"
+      - "3"
+      - "4"
+      x-sort:
+      - 13
   /base/teacher/DownLoadTeacherTemplateExcel:
     get:
       consumes:
@@ -6282,6 +6384,11 @@ paths:
         name: personId
         required: true
         type: string
+      - description: 单位ID
+        in: query
+        name: bureauId
+        required: true
+        type: string
       produces:
       - application/json
       responses:
@@ -6471,6 +6578,46 @@ paths:
       - 1
       x-tablename:
       - t_base_teacher
+  /base/teacher/PageTeacherMultipleBureauInfo:
+    get:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 根据教职工ID获取该教职工所在多单位列表
+      parameters:
+      - description: 教职工ID
+        in: query
+        name: personId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 根据教职工ID获取该教职工所在多单位列表
+      tags:
+      - 教师信息
+      x-emptylimit:
+      - personId
+      x-lengthlimit:
+      - personId: 36,36
+      x-removeswaggerfield:
+      - identity_id
+      - id_int
+      - xmpy
+      - cym
+      - gwzym
+      - b_use
+      - state_id
+      - last_updated_time
+      x-rolelimit:
+      - "1"
+      - "3"
+      - "4"
+      x-sort:
+      - 12
   /base/teacher/ReviseTeacherOrg:
     post:
       consumes:
@@ -6513,12 +6660,129 @@ paths:
       - "7"
       x-sort:
       - 6
+  /base/teacher/SettingMainOrgInfo:
+    post:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 设置主单位
+      parameters:
+      - description: ID
+        in: formData
+        name: id
+        required: true
+        type: string
+      - description: 人员ID
+        in: formData
+        name: personId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 设置主单位
+      tags:
+      - 教师信息
+      x-emptylimit:
+      - id
+      x-lengthlimit:
+      - id: 36,36
+      x-rolelimit:
+      - "1"
+      - "3"
+      - "4"
+      x-sort:
+      - 14
+  /base/teacher/SettingTeacherMultipleBureauInfo:
+    post:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 设置教师多单位
+      parameters:
+      - description: 部门ID
+        in: formData
+        name: orgId
+        required: true
+        type: string
+      - description: 教职工ID
+        in: formData
+        name: personId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 设置教师多单位
+      tags:
+      - 教师信息
+      x-emptylimit:
+      - orgId
+      - personId
+      x-lengthlimit:
+      - orgId: 36,36
+      - personId: 36,36
+      x-rolelimit:
+      - "1"
+      - "3"
+      - "4"
+      x-sort:
+      - 11
+  /base/teacher/TeacherTransferInfo:
+    post:
+      consumes:
+      - application/x-www-form-urlencoded
+      description: 教师调转单位
+      parameters:
+      - description: 部门ID
+        in: formData
+        name: orgId
+        required: true
+        type: string
+      - description: 人员ID
+        in: formData
+        name: personId
+        required: true
+        type: string
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/Model.Res'
+      summary: 教师调转单位
+      tags:
+      - 教师信息
+      x-emptylimit:
+      - orgId
+      - personId
+      x-lengthlimit:
+      - orgId: 36,36
+      - personId: 36,36
+      x-rolelimit:
+      - "1"
+      - "3"
+      - "4"
+      x-sort:
+      - 15
   /base/teacher/UpdateTeacherInfo:
     post:
       consumes:
       - application/x-www-form-urlencoded
       description: 修改教职工信息
       parameters:
+      - description: 单位ID
+        in: formData
+        name: bureauId
+        required: true
+        type: string
       - description: 教职工ID
         in: formData
         name: personId
@@ -6587,6 +6851,10 @@ paths:
         name: subjectId
         required: true
         type: string
+      - description: 职务ID,多个用逗号分隔
+        in: formData
+        name: positionIds
+        type: string
       - description: 从教年月
         in: formData
         name: cjny

dsBaseWeb/main.go

@@ -57,7 +57,7 @@ func main() {
 	r.GET("/swagger/*any", ginSwagger.WrapHandler(swaggerFiles.Handler))
 
 	//统一认证拦截器
-	//r.Use(Handler.SsoHandler())
+	r.Use(Handler.SsoHandler())
 
 	//EXCEL目录
 	//r.Static("/dsBaseWeb/static", "./Static")