diff --git a/dsBaseWeb/docs/docs.go b/dsBaseWeb/docs/docs.go index 889410b9..5c57b018 100644 --- a/dsBaseWeb/docs/docs.go +++ b/dsBaseWeb/docs/docs.go @@ -60,6 +60,11 @@ var doc = `{ "example": 0, "type": "integer" }, + "b_use": { + "description": "是否启用", + "example": 1, + "type": "integer" + }, "master_code": { "description": "上级行政区划代码", "example": "0", @@ -786,6 +791,11 @@ var doc = `{ "example": "", "type": "string" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -863,6 +873,11 @@ var doc = `{ "example": "", "type": "string" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -915,6 +930,11 @@ var doc = `{ "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", @@ -987,11 +1007,6 @@ var doc = `{ "example": "2020-07-28 09:50:16", "type": "timestamp" }, - "directly_under_type": { - "description": "直属类型 1：普通 2：省直 3：市直 4：中直", - "example": 0, - "type": "integer" - }, "fddbr": { "description": "机构法定代表人", "example": "", @@ -1022,9 +1037,9 @@ var doc = `{ "example": -1, "type": "integer" }, - "manage_org_id": { - "description": "上级管理单位ID（*一个单位只能有一个上级管理单位）", - "example": "0001E72B-BA0D-4FA4-A61E-C481FD4979A6", + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", "type": "string" }, "org_code": { @@ -1052,11 +1067,6 @@ var doc = `{ "example": "", "type": "string" }, - "xxbbm": { - "description": "学校办别（学校专有属性）有字典", - "example": "", - "type": "string" - }, "xxbxlxm": { "description": "学校办学类型（学校专有属性）有字典", "example": "", @@ -1104,6 +1114,11 @@ var doc = `{ "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", @@ -1156,6 +1171,11 @@ var doc = `{ "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", @@ -1218,6 +1238,11 @@ var doc = `{ "example": "741369", "type": "string" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -1275,6 +1300,11 @@ var doc = `{ "example": -1, "type": "integer" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -1332,6 +1362,11 @@ var doc = `{ "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", @@ -1399,6 +1434,11 @@ var doc = `{ "example": -1, "type": "integer" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -2029,49 +2069,6 @@ var doc = `{ "version": "1.0" }, "paths": { - "/base/business/DeleteBaseBusiness": { - "post": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "删除业务系统信息", - "parameters": [ - { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", - "required": true, - "type": "string" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "删除业务系统信息", - "tags": [ - "业务系统维护" - ], - "x-emptylimit": [ - "businessCode" - ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } - ], - "x-rolelimit": [ - "1" - ] - } - }, "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ @@ -2176,6 +2173,49 @@ var doc = `{ ] } }, + "/base/business/DeleteBaseBusiness": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "删除业务系统信息", + "parameters": [ + { + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "删除业务系统信息", + "tags": [ + "业务系统维护" + ], + "x-emptylimit": [ + "businessCode" + ], + "x-lengthlimit": [ + { + "businessCode": "6,6" + } + ], + "x-rolelimit": [ + "1" + ] + } + }, "/base/business/AddBaseBusiness": { "post": { "consumes": [ @@ -3868,6 +3908,60 @@ var doc = `{ ] } }, + "/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/teacher/PageTeacherInfo": { "get": { "consumes": [ @@ -4037,6 +4131,13 @@ var doc = `{ "name": "personId", "required": true, "type": "string" + }, + { + "description": "单位ID", + "in": "query", + "name": "bureauId", + "required": true, + "type": "string" } ], "produces": [ @@ -4202,6 +4303,12 @@ var doc = `{ "required": true, "type": "string" }, + { + "description": "职务ID,多个用逗号分隔", + "in": "formData", + "name": "positionIds", + "type": "string" + }, { "description": "从教年月", "in": "formData", @@ -4382,6 +4489,13 @@ var doc = `{ ], "description": "修改教职工信息", "parameters": [ + { + "description": "单位ID", + "in": "formData", + "name": "bureauId", + "required": true, + "type": "string" + }, { "description": "教职工ID", "in": "formData", @@ -4478,6 +4592,12 @@ var doc = `{ "required": true, "type": "string" }, + { + "description": "职务ID,多个用逗号分隔", + "in": "formData", + "name": "positionIds", + "type": "string" + }, { "description": "从教年月", "in": "formData", @@ -4876,53 +4996,26 @@ var doc = `{ ] } }, - "/base/purview/AddPurviewInfo": { + "/base/teacher/SettingTeacherMultipleBureauInfo": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加权限信息", + "description": "设置教师多单位", "parameters": [ { - "description": "权限名称", - "in": "formData", - "name": "purviewName", - "required": true, - "type": "string" - }, - { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", - "required": true, - "type": "string" - }, - { - "description": "权限类型 1：菜单 2：按钮", - "in": "formData", - "name": "purviewType", - "required": true, - "type": "integer" - }, - { - "description": "菜单的URL 没有填#", + "description": "部门ID", "in": "formData", - "name": "menuUrl", + "name": "orgId", "required": true, "type": "string" }, { - "description": "父节点ID", + "description": "教职工ID", "in": "formData", - "name": "parentId", + "name": "personId", "required": true, "type": "string" - }, - { - "description": "排序号", - "in": "formData", - "name": "sortId", - "type": "integer" } ], "produces": [ @@ -4936,25 +5029,331 @@ var doc = `{ } } }, - "summary": "增加权限信息", + "summary": "设置教师多单位", "tags": [ - "权限" + "教师信息" ], "x-emptylimit": [ - "purviewName", - "businessCode", - "purviewType", - "menuUrl", - "parentId" - ], - "x-interfacename": [ - "AddBasePurview" - ], - "x-intlimit": [ - "purviewType", - "sortId" + "orgId", + "personId" ], - "x-intrangelimit": [ + "x-lengthlimit": [ + { + "orgId": "36,36" + }, + { + "personId": "36,36" + } + ], + "x-rolelimit": [ + "1", + "3", + "4" + ], + "x-sort": [ + 11 + ] + } + }, + "/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/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/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/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/purview/AddPurviewInfo": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "增加权限信息", + "parameters": [ + { + "description": "权限名称", + "in": "formData", + "name": "purviewName", + "required": true, + "type": "string" + }, + { + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", + "required": true, + "type": "string" + }, + { + "description": "权限类型 1：菜单 2：按钮", + "in": "formData", + "name": "purviewType", + "required": true, + "type": "integer" + }, + { + "description": "菜单的URL 没有填#", + "in": "formData", + "name": "menuUrl", + "required": true, + "type": "string" + }, + { + "description": "父节点ID", + "in": "formData", + "name": "parentId", + "required": true, + "type": "string" + }, + { + "description": "排序号", + "in": "formData", + "name": "sortId", + "type": "integer" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "增加权限信息", + "tags": [ + "权限" + ], + "x-emptylimit": [ + "purviewName", + "businessCode", + "purviewType", + "menuUrl", + "parentId" + ], + "x-interfacename": [ + "AddBasePurview" + ], + "x-intlimit": [ + "purviewType", + "sortId" + ], + "x-intrangelimit": [ { "purviewType": "1,2" }, @@ -7663,12 +8062,12 @@ var doc = `{ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7692,9 +8091,16 @@ var doc = `{ "type": "string" }, { - "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", + "description": "学校办学类型 -1：全部", "in": "query", - "name": "orgId", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", "type": "string" } ], @@ -7705,11 +8111,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7739,6 +8145,9 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7782,12 +8191,12 @@ var doc = `{ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7811,16 +8220,9 @@ var doc = `{ "type": "string" }, { - "description": "学校办学类型 -1：全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", + "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", "in": "query", - "name": "orgName", + "name": "orgId", "type": "string" } ], @@ -7831,11 +8233,11 @@ var doc = `{ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7865,9 +8267,6 @@ var doc = `{ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -8010,13 +8409,6 @@ var doc = `{ "required": true, "type": "string" }, - { - "description": "直属类型 1：普通 2：省直 3：市直", - "in": "formData", - "name": "directlyUnderType", - "required": true, - "type": "integer" - }, { "description": "是否为分校 -1：非分校 1：是分校", "in": "formData", @@ -8031,9 +8423,9 @@ var doc = `{ "type": "string" }, { - "description": "学校办别（字典：xxbbm）", + "description": "上级管理单位行政区划编码", "in": "formData", - "name": "xxbbm", + "name": "managerAreaCode", "required": true, "type": "string" }, @@ -8058,6 +8450,12 @@ var doc = `{ "required": true, "type": "string" }, + { + "description": "附设班办学类型ID,多个用逗号分隔", + "in": "formData", + "name": "fsbIds", + "type": "string" + }, { "description": "学校法定代表人", "in": "formData", @@ -8177,13 +8575,6 @@ var doc = `{ "required": true, "type": "string" }, - { - "description": "直属类型 1：普通 2：省直 3：市直", - "in": "formData", - "name": "directlyUnderType", - "required": true, - "type": "integer" - }, { "description": "是否为分校 -1：非分校 1：是分校", "in": "formData", @@ -8198,9 +8589,9 @@ var doc = `{ "type": "string" }, { - "description": "学校办别（字典：xxbbm）", + "description": "上级管理单位行政区划编码", "in": "formData", - "name": "xxbbm", + "name": "managerAreaCode", "required": true, "type": "string" }, @@ -8225,6 +8616,12 @@ var doc = `{ "required": true, "type": "string" }, + { + "description": "附设班办学类型ID,多个用逗号分隔", + "in": "formData", + "name": "fsbIds", + "type": "string" + }, { "description": "学校法定代表人", "in": "formData", @@ -8796,17 +9193,72 @@ var doc = `{ ] } }, - "/base/organization/DeleteOrgInfo": { - "post": { + "/base/organization/DeleteOrgInfo": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "删除部门信息", + "parameters": [ + { + "description": "部门ID", + "in": "formData", + "name": "orgId", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "删除部门信息", + "tags": [ + "组织机构" + ], + "x-emptylimit": [ + "orgId" + ], + "x-interfacename": [ + "DeleteBaseOrganization" + ], + "x-lengthlimit": [ + { + "orgId": "36,36" + } + ], + "x-rolelimit": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ], + "x-sort": [ + 21 + ] + } + }, + "/base/organization/GetOrgTreeInfo": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除部门信息", + "description": "根据单位名称的关键字和管理员的人员ID查询单位列表", "parameters": [ { - "description": "部门ID", - "in": "formData", - "name": "orgId", + "description": "单位名称关键字", + "in": "query", + "name": "keyWord", "required": true, "type": "string" } @@ -8822,46 +9274,42 @@ var doc = `{ } } }, - "summary": "删除部门信息", + "summary": "根据单位名称的关键字和管理员的人员ID查询单位列表", "tags": [ "组织机构" ], "x-emptylimit": [ - "orgId" - ], - "x-interfacename": [ - "DeleteBaseOrganization" + "keyWord" ], "x-lengthlimit": [ { - "orgId": "36,36" + "keyWord": "2,30" } ], + "x-removeswaggerfield": [ + "id_int" + ], "x-rolelimit": [ "1", - "2", "3", - "4", - "5", - "6", - "7" + "4" ], "x-sort": [ - 21 + 23 ] } }, - "/base/organization/GetOrgTreeInfo": { + "/base/organization/ListEduByCityCodeInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "根据单位ID获取部门树", + "description": "根据市的行政区划码获取教育局列表", "parameters": [ { - "description": "单位ID", + "description": "市的行政区划码", "in": "query", - "name": "orgId", + "name": "cityCode", "required": true, "type": "string" } @@ -8877,77 +9325,67 @@ var doc = `{ } } }, - "summary": "根据单位ID获取部门树", + "summary": "根据市的行政区划码获取教育局列表", "tags": [ "组织机构" ], "x-emptylimit": [ - "orgId" + "cityCode" ], "x-lengthlimit": [ { - "orgId": "36,36" + "cityCode": "6,6" } ], - "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" + "4" ], "x-sort": [ - 22 + 24 ] } }, - "/base/position/UpdatePositionInfo": { + "/base/position/AddPositionInfo": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改职务信息", + "description": "增加职务信息", "parameters": [ { - "description": "职务ID", + "description": "职务名称", "in": "formData", - "name": "id", + "name": "nodeName", "required": true, "type": "string" }, { - "description": "职务名称", + "description": "上级节点ID", "in": "formData", - "name": "nodeName", + "name": "parentId", + "required": true, + "type": "string" + }, + { + "description": "区域级别,传上一级节点的area_level", + "in": "formData", + "name": "areaLevel", + "required": true, + "type": "integer" + }, + { + "description": "单位类型,传上一级节点的org_type", + "in": "formData", + "name": "orgType", + "required": true, + "type": "integer" + }, + { + "description": "学校办学类型,传上一级节点的xxbxlxm", + "in": "formData", + "name": "xxbxlxm", "required": true, "type": "string" }, @@ -8970,13 +9408,16 @@ var doc = `{ } } }, - "summary": "修改职务信息", + "summary": "增加职务信息", "tags": [ "职务" ], "x-emptylimit": [ - "id", "nodeName", + "parentId", + "areaLevel", + "orgType", + "xxbxlxm", "sortId" ], "x-intlimit": [ @@ -8991,7 +9432,7 @@ var doc = `{ ], "x-lengthlimit": [ { - "id": "36,36" + "parentId": "36,36" }, { "nodeName": "2,30" @@ -9005,45 +9446,24 @@ var doc = `{ ] } }, - "/base/position/AddPositionInfo": { + "/base/position/UpdatePositionInfo": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加职务信息", + "description": "修改职务信息", "parameters": [ { - "description": "职务名称", - "in": "formData", - "name": "nodeName", - "required": true, - "type": "string" - }, - { - "description": "上级节点ID", + "description": "职务ID", "in": "formData", - "name": "parentId", + "name": "id", "required": true, "type": "string" }, { - "description": "区域级别,传上一级节点的area_level", - "in": "formData", - "name": "areaLevel", - "required": true, - "type": "integer" - }, - { - "description": "单位类型,传上一级节点的org_type", - "in": "formData", - "name": "orgType", - "required": true, - "type": "integer" - }, - { - "description": "学校办学类型,传上一级节点的xxbxlxm", + "description": "职务名称", "in": "formData", - "name": "xxbxlxm", + "name": "nodeName", "required": true, "type": "string" }, @@ -9066,16 +9486,13 @@ var doc = `{ } } }, - "summary": "增加职务信息", + "summary": "修改职务信息", "tags": [ "职务" ], "x-emptylimit": [ + "id", "nodeName", - "parentId", - "areaLevel", - "orgType", - "xxbxlxm", "sortId" ], "x-intlimit": [ @@ -9090,7 +9507,7 @@ var doc = `{ ], "x-lengthlimit": [ { - "parentId": "36,36" + "id": "36,36" }, { "nodeName": "2,30" @@ -9282,12 +9699,12 @@ var doc = `{ ] } }, - "/base/area/AddGovArea": { + "/base/area/DeleteGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "删除行政区划信息", "parameters": [ { "description": "区域代码", @@ -9295,27 +9712,6 @@ var doc = `{ "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "区域名称", - "in": "formData", - "name": "areaName", - "required": true, - "type": "string" - }, - { - "description": "上级代码", - "in": "formData", - "name": "masterCode", - "required": true, - "type": "string" - }, - { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", - "required": true, - "type": "integer" } ], "produces": [ @@ -9329,28 +9725,16 @@ var doc = `{ } } }, - "summary": "增加行政区划信息", + "summary": "删除行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" - ], - "x-intlimit": [ - "areaTypeId" + "areaCode" ], "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "masterCode": "6,6" - }, - { - "areaName": "3,50" } ], "x-rolelimit": [ @@ -9437,19 +9821,40 @@ var doc = `{ ] } }, - "/base/area/GetGovArea": { - "get": { + "/base/area/UpdateGovArea": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(单条)", + "description": "修改行政区划信息", "parameters": [ { - "description": "行政区划码", - "in": "query", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" + }, + { + "description": "区域名称", + "in": "formData", + "name": "areaName", + "required": true, + "type": "string" + }, + { + "description": "上级代码", + "in": "formData", + "name": "masterCode", + "required": true, + "type": "string" + }, + { + "description": "区域类型", + "in": "formData", + "name": "areaTypeId", + "required": true, + "type": "integer" } ], "produces": [ @@ -9463,19 +9868,28 @@ var doc = `{ } } }, - "summary": "获取行政区划信息(单条)", + "summary": "修改行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaCode" + "areaTypeId", + "areaCode", + "areaName", + "masterCode" ], "x-intlimit": [ - "areaCode" + "areaTypeId" ], "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3:50" } ], "x-rolelimit": [ @@ -9489,16 +9903,16 @@ var doc = `{ ] } }, - "/base/area/DeleteGovArea": { - "post": { + "/base/area/GetGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除行政区划信息", + "description": "获取行政区划信息(单条)", "parameters": [ { - "description": "区域代码", - "in": "formData", + "description": "行政区划码", + "in": "query", "name": "areaCode", "required": true, "type": "string" @@ -9515,13 +9929,16 @@ var doc = `{ } } }, - "summary": "删除行政区划信息", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ "areaCode" ], + "x-intlimit": [ + "areaCode" + ], "x-lengthlimit": [ { "areaCode": "6,6" @@ -9538,12 +9955,12 @@ var doc = `{ ] } }, - "/base/area/UpdateGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -9585,7 +10002,7 @@ var doc = `{ } } }, - "summary": "修改行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], @@ -9606,7 +10023,7 @@ var doc = `{ "masterCode": "6,6" }, { - "areaName": "3:50" + "areaName": "3,50" } ], "x-rolelimit": [ diff --git a/dsBaseWeb/docs/swagger.json b/dsBaseWeb/docs/swagger.json index b92a67cd..b6bec44d 100644 --- a/dsBaseWeb/docs/swagger.json +++ b/dsBaseWeb/docs/swagger.json @@ -45,6 +45,11 @@ "example": 0, "type": "integer" }, + "b_use": { + "description": "是否启用", + "example": 1, + "type": "integer" + }, "master_code": { "description": "上级行政区划代码", "example": "0", @@ -771,6 +776,11 @@ "example": "", "type": "string" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -848,6 +858,11 @@ "example": "", "type": "string" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -900,6 +915,11 @@ "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", @@ -972,11 +992,6 @@ "example": "2020-07-28 09:50:16", "type": "timestamp" }, - "directly_under_type": { - "description": "直属类型 1：普通 2：省直 3：市直 4：中直", - "example": 0, - "type": "integer" - }, "fddbr": { "description": "机构法定代表人", "example": "", @@ -1007,9 +1022,9 @@ "example": -1, "type": "integer" }, - "manage_org_id": { - "description": "上级管理单位ID（*一个单位只能有一个上级管理单位）", - "example": "0001E72B-BA0D-4FA4-A61E-C481FD4979A6", + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", "type": "string" }, "org_code": { @@ -1037,11 +1052,6 @@ "example": "", "type": "string" }, - "xxbbm": { - "description": "学校办别（学校专有属性）有字典", - "example": "", - "type": "string" - }, "xxbxlxm": { "description": "学校办学类型（学校专有属性）有字典", "example": "", @@ -1089,6 +1099,11 @@ "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", @@ -1141,6 +1156,11 @@ "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", @@ -1203,6 +1223,11 @@ "example": "741369", "type": "string" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -1260,6 +1285,11 @@ "example": -1, "type": "integer" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -1317,6 +1347,11 @@ "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", @@ -1384,6 +1419,11 @@ "example": -1, "type": "integer" }, + "manager_area_code": { + "description": "上级管理单位所在行政区划码", + "example": "", + "type": "string" + }, "org_code": { "description": "组织机构编码", "example": "4C798F41-584C-4C15-A648-09B9BB", @@ -2014,49 +2054,6 @@ "version": "1.0" }, "paths": { - "/base/business/DeleteBaseBusiness": { - "post": { - "consumes": [ - "application/x-www-form-urlencoded" - ], - "description": "删除业务系统信息", - "parameters": [ - { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", - "required": true, - "type": "string" - } - ], - "produces": [ - "application/json" - ], - "responses": { - "200": { - "description": "OK", - "schema": { - "$ref": "#/definitions/Model.Res" - } - } - }, - "summary": "删除业务系统信息", - "tags": [ - "业务系统维护" - ], - "x-emptylimit": [ - "businessCode" - ], - "x-lengthlimit": [ - { - "businessCode": "6,6" - } - ], - "x-rolelimit": [ - "1" - ] - } - }, "/base/business/UpdateBaseBusiness": { "post": { "consumes": [ @@ -2161,6 +2158,49 @@ ] } }, + "/base/business/DeleteBaseBusiness": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "删除业务系统信息", + "parameters": [ + { + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "删除业务系统信息", + "tags": [ + "业务系统维护" + ], + "x-emptylimit": [ + "businessCode" + ], + "x-lengthlimit": [ + { + "businessCode": "6,6" + } + ], + "x-rolelimit": [ + "1" + ] + } + }, "/base/business/AddBaseBusiness": { "post": { "consumes": [ @@ -3853,6 +3893,60 @@ ] } }, + "/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/teacher/PageTeacherInfo": { "get": { "consumes": [ @@ -4022,6 +4116,13 @@ "name": "personId", "required": true, "type": "string" + }, + { + "description": "单位ID", + "in": "query", + "name": "bureauId", + "required": true, + "type": "string" } ], "produces": [ @@ -4187,6 +4288,12 @@ "required": true, "type": "string" }, + { + "description": "职务ID,多个用逗号分隔", + "in": "formData", + "name": "positionIds", + "type": "string" + }, { "description": "从教年月", "in": "formData", @@ -4367,6 +4474,13 @@ ], "description": "修改教职工信息", "parameters": [ + { + "description": "单位ID", + "in": "formData", + "name": "bureauId", + "required": true, + "type": "string" + }, { "description": "教职工ID", "in": "formData", @@ -4463,6 +4577,12 @@ "required": true, "type": "string" }, + { + "description": "职务ID,多个用逗号分隔", + "in": "formData", + "name": "positionIds", + "type": "string" + }, { "description": "从教年月", "in": "formData", @@ -4861,53 +4981,26 @@ ] } }, - "/base/purview/AddPurviewInfo": { + "/base/teacher/SettingTeacherMultipleBureauInfo": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加权限信息", + "description": "设置教师多单位", "parameters": [ { - "description": "权限名称", - "in": "formData", - "name": "purviewName", - "required": true, - "type": "string" - }, - { - "description": "业务系统编码", - "in": "formData", - "name": "businessCode", - "required": true, - "type": "string" - }, - { - "description": "权限类型 1：菜单 2：按钮", - "in": "formData", - "name": "purviewType", - "required": true, - "type": "integer" - }, - { - "description": "菜单的URL 没有填#", + "description": "部门ID", "in": "formData", - "name": "menuUrl", + "name": "orgId", "required": true, "type": "string" }, { - "description": "父节点ID", + "description": "教职工ID", "in": "formData", - "name": "parentId", + "name": "personId", "required": true, "type": "string" - }, - { - "description": "排序号", - "in": "formData", - "name": "sortId", - "type": "integer" } ], "produces": [ @@ -4921,25 +5014,331 @@ } } }, - "summary": "增加权限信息", + "summary": "设置教师多单位", "tags": [ - "权限" + "教师信息" ], "x-emptylimit": [ - "purviewName", - "businessCode", - "purviewType", - "menuUrl", - "parentId" - ], - "x-interfacename": [ - "AddBasePurview" - ], - "x-intlimit": [ - "purviewType", - "sortId" + "orgId", + "personId" ], - "x-intrangelimit": [ + "x-lengthlimit": [ + { + "orgId": "36,36" + }, + { + "personId": "36,36" + } + ], + "x-rolelimit": [ + "1", + "3", + "4" + ], + "x-sort": [ + 11 + ] + } + }, + "/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/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/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/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/purview/AddPurviewInfo": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "增加权限信息", + "parameters": [ + { + "description": "权限名称", + "in": "formData", + "name": "purviewName", + "required": true, + "type": "string" + }, + { + "description": "业务系统编码", + "in": "formData", + "name": "businessCode", + "required": true, + "type": "string" + }, + { + "description": "权限类型 1：菜单 2：按钮", + "in": "formData", + "name": "purviewType", + "required": true, + "type": "integer" + }, + { + "description": "菜单的URL 没有填#", + "in": "formData", + "name": "menuUrl", + "required": true, + "type": "string" + }, + { + "description": "父节点ID", + "in": "formData", + "name": "parentId", + "required": true, + "type": "string" + }, + { + "description": "排序号", + "in": "formData", + "name": "sortId", + "type": "integer" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "增加权限信息", + "tags": [ + "权限" + ], + "x-emptylimit": [ + "purviewName", + "businessCode", + "purviewType", + "menuUrl", + "parentId" + ], + "x-interfacename": [ + "AddBasePurview" + ], + "x-intlimit": [ + "purviewType", + "sortId" + ], + "x-intrangelimit": [ { "purviewType": "1,2" }, @@ -7648,12 +8047,12 @@ ] } }, - "/base/organization/PageMainSchoolInfo": { + "/base/organization/PageSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取主校列表", + "description": "获取学校列表", "parameters": [ { "description": "第几页", @@ -7677,9 +8076,16 @@ "type": "string" }, { - "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", + "description": "学校办学类型 -1：全部", "in": "query", - "name": "orgId", + "name": "xxbxlxm", + "required": true, + "type": "string" + }, + { + "description": "学校名称", + "in": "query", + "name": "orgName", "type": "string" } ], @@ -7690,11 +8096,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageMainSchoolInfo" + "$ref": "#/definitions/base.organization.PageSchoolInfo" } } }, - "summary": "获取主校列表", + "summary": "获取学校列表", "tags": [ "组织机构" ], @@ -7724,6 +8130,9 @@ "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7767,12 +8176,12 @@ ] } }, - "/base/organization/PageSchoolInfo": { + "/base/organization/PageMainSchoolInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取学校列表", + "description": "获取主校列表", "parameters": [ { "description": "第几页", @@ -7796,16 +8205,9 @@ "type": "string" }, { - "description": "学校办学类型 -1：全部", - "in": "query", - "name": "xxbxlxm", - "required": true, - "type": "string" - }, - { - "description": "学校名称", + "description": "学校ID，增加学校时无需传，修改学校时需要传被修改学校的ID", "in": "query", - "name": "orgName", + "name": "orgId", "type": "string" } ], @@ -7816,11 +8218,11 @@ "200": { "description": "OK", "schema": { - "$ref": "#/definitions/base.organization.PageSchoolInfo" + "$ref": "#/definitions/base.organization.PageMainSchoolInfo" } } }, - "summary": "获取学校列表", + "summary": "获取主校列表", "tags": [ "组织机构" ], @@ -7850,9 +8252,6 @@ "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "orgName": "1,30" } ], "x-removeswaggerfield": [ @@ -7995,13 +8394,6 @@ "required": true, "type": "string" }, - { - "description": "直属类型 1：普通 2：省直 3：市直", - "in": "formData", - "name": "directlyUnderType", - "required": true, - "type": "integer" - }, { "description": "是否为分校 -1：非分校 1：是分校", "in": "formData", @@ -8016,9 +8408,9 @@ "type": "string" }, { - "description": "学校办别（字典：xxbbm）", + "description": "上级管理单位行政区划编码", "in": "formData", - "name": "xxbbm", + "name": "managerAreaCode", "required": true, "type": "string" }, @@ -8043,6 +8435,12 @@ "required": true, "type": "string" }, + { + "description": "附设班办学类型ID,多个用逗号分隔", + "in": "formData", + "name": "fsbIds", + "type": "string" + }, { "description": "学校法定代表人", "in": "formData", @@ -8162,13 +8560,6 @@ "required": true, "type": "string" }, - { - "description": "直属类型 1：普通 2：省直 3：市直", - "in": "formData", - "name": "directlyUnderType", - "required": true, - "type": "integer" - }, { "description": "是否为分校 -1：非分校 1：是分校", "in": "formData", @@ -8183,9 +8574,9 @@ "type": "string" }, { - "description": "学校办别（字典：xxbbm）", + "description": "上级管理单位行政区划编码", "in": "formData", - "name": "xxbbm", + "name": "managerAreaCode", "required": true, "type": "string" }, @@ -8210,6 +8601,12 @@ "required": true, "type": "string" }, + { + "description": "附设班办学类型ID,多个用逗号分隔", + "in": "formData", + "name": "fsbIds", + "type": "string" + }, { "description": "学校法定代表人", "in": "formData", @@ -8781,17 +9178,72 @@ ] } }, - "/base/organization/DeleteOrgInfo": { - "post": { + "/base/organization/DeleteOrgInfo": { + "post": { + "consumes": [ + "application/x-www-form-urlencoded" + ], + "description": "删除部门信息", + "parameters": [ + { + "description": "部门ID", + "in": "formData", + "name": "orgId", + "required": true, + "type": "string" + } + ], + "produces": [ + "application/json" + ], + "responses": { + "200": { + "description": "OK", + "schema": { + "$ref": "#/definitions/Model.Res" + } + } + }, + "summary": "删除部门信息", + "tags": [ + "组织机构" + ], + "x-emptylimit": [ + "orgId" + ], + "x-interfacename": [ + "DeleteBaseOrganization" + ], + "x-lengthlimit": [ + { + "orgId": "36,36" + } + ], + "x-rolelimit": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7" + ], + "x-sort": [ + 21 + ] + } + }, + "/base/organization/GetOrgTreeInfo": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除部门信息", + "description": "根据单位名称的关键字和管理员的人员ID查询单位列表", "parameters": [ { - "description": "部门ID", - "in": "formData", - "name": "orgId", + "description": "单位名称关键字", + "in": "query", + "name": "keyWord", "required": true, "type": "string" } @@ -8807,46 +9259,42 @@ } } }, - "summary": "删除部门信息", + "summary": "根据单位名称的关键字和管理员的人员ID查询单位列表", "tags": [ "组织机构" ], "x-emptylimit": [ - "orgId" - ], - "x-interfacename": [ - "DeleteBaseOrganization" + "keyWord" ], "x-lengthlimit": [ { - "orgId": "36,36" + "keyWord": "2,30" } ], + "x-removeswaggerfield": [ + "id_int" + ], "x-rolelimit": [ "1", - "2", "3", - "4", - "5", - "6", - "7" + "4" ], "x-sort": [ - 21 + 23 ] } }, - "/base/organization/GetOrgTreeInfo": { + "/base/organization/ListEduByCityCodeInfo": { "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "根据单位ID获取部门树", + "description": "根据市的行政区划码获取教育局列表", "parameters": [ { - "description": "单位ID", + "description": "市的行政区划码", "in": "query", - "name": "orgId", + "name": "cityCode", "required": true, "type": "string" } @@ -8862,77 +9310,67 @@ } } }, - "summary": "根据单位ID获取部门树", + "summary": "根据市的行政区划码获取教育局列表", "tags": [ "组织机构" ], "x-emptylimit": [ - "orgId" + "cityCode" ], "x-lengthlimit": [ { - "orgId": "36,36" + "cityCode": "6,6" } ], - "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" + "4" ], "x-sort": [ - 22 + 24 ] } }, - "/base/position/UpdatePositionInfo": { + "/base/position/AddPositionInfo": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改职务信息", + "description": "增加职务信息", "parameters": [ { - "description": "职务ID", + "description": "职务名称", "in": "formData", - "name": "id", + "name": "nodeName", "required": true, "type": "string" }, { - "description": "职务名称", + "description": "上级节点ID", "in": "formData", - "name": "nodeName", + "name": "parentId", + "required": true, + "type": "string" + }, + { + "description": "区域级别,传上一级节点的area_level", + "in": "formData", + "name": "areaLevel", + "required": true, + "type": "integer" + }, + { + "description": "单位类型,传上一级节点的org_type", + "in": "formData", + "name": "orgType", + "required": true, + "type": "integer" + }, + { + "description": "学校办学类型,传上一级节点的xxbxlxm", + "in": "formData", + "name": "xxbxlxm", "required": true, "type": "string" }, @@ -8955,13 +9393,16 @@ } } }, - "summary": "修改职务信息", + "summary": "增加职务信息", "tags": [ "职务" ], "x-emptylimit": [ - "id", "nodeName", + "parentId", + "areaLevel", + "orgType", + "xxbxlxm", "sortId" ], "x-intlimit": [ @@ -8976,7 +9417,7 @@ ], "x-lengthlimit": [ { - "id": "36,36" + "parentId": "36,36" }, { "nodeName": "2,30" @@ -8990,45 +9431,24 @@ ] } }, - "/base/position/AddPositionInfo": { + "/base/position/UpdatePositionInfo": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加职务信息", + "description": "修改职务信息", "parameters": [ { - "description": "职务名称", - "in": "formData", - "name": "nodeName", - "required": true, - "type": "string" - }, - { - "description": "上级节点ID", + "description": "职务ID", "in": "formData", - "name": "parentId", + "name": "id", "required": true, "type": "string" }, { - "description": "区域级别,传上一级节点的area_level", - "in": "formData", - "name": "areaLevel", - "required": true, - "type": "integer" - }, - { - "description": "单位类型,传上一级节点的org_type", - "in": "formData", - "name": "orgType", - "required": true, - "type": "integer" - }, - { - "description": "学校办学类型,传上一级节点的xxbxlxm", + "description": "职务名称", "in": "formData", - "name": "xxbxlxm", + "name": "nodeName", "required": true, "type": "string" }, @@ -9051,16 +9471,13 @@ } } }, - "summary": "增加职务信息", + "summary": "修改职务信息", "tags": [ "职务" ], "x-emptylimit": [ + "id", "nodeName", - "parentId", - "areaLevel", - "orgType", - "xxbxlxm", "sortId" ], "x-intlimit": [ @@ -9075,7 +9492,7 @@ ], "x-lengthlimit": [ { - "parentId": "36,36" + "id": "36,36" }, { "nodeName": "2,30" @@ -9267,12 +9684,12 @@ ] } }, - "/base/area/AddGovArea": { + "/base/area/DeleteGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "增加行政区划信息", + "description": "删除行政区划信息", "parameters": [ { "description": "区域代码", @@ -9280,27 +9697,6 @@ "name": "areaCode", "required": true, "type": "string" - }, - { - "description": "区域名称", - "in": "formData", - "name": "areaName", - "required": true, - "type": "string" - }, - { - "description": "上级代码", - "in": "formData", - "name": "masterCode", - "required": true, - "type": "string" - }, - { - "description": "区域类型", - "in": "formData", - "name": "areaTypeId", - "required": true, - "type": "integer" } ], "produces": [ @@ -9314,28 +9710,16 @@ } } }, - "summary": "增加行政区划信息", + "summary": "删除行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaTypeId", - "areaCode", - "areaName", - "masterCode" - ], - "x-intlimit": [ - "areaTypeId" + "areaCode" ], "x-lengthlimit": [ { "areaCode": "6,6" - }, - { - "masterCode": "6,6" - }, - { - "areaName": "3,50" } ], "x-rolelimit": [ @@ -9422,19 +9806,40 @@ ] } }, - "/base/area/GetGovArea": { - "get": { + "/base/area/UpdateGovArea": { + "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "获取行政区划信息(单条)", + "description": "修改行政区划信息", "parameters": [ { - "description": "行政区划码", - "in": "query", + "description": "区域代码", + "in": "formData", "name": "areaCode", "required": true, "type": "string" + }, + { + "description": "区域名称", + "in": "formData", + "name": "areaName", + "required": true, + "type": "string" + }, + { + "description": "上级代码", + "in": "formData", + "name": "masterCode", + "required": true, + "type": "string" + }, + { + "description": "区域类型", + "in": "formData", + "name": "areaTypeId", + "required": true, + "type": "integer" } ], "produces": [ @@ -9448,19 +9853,28 @@ } } }, - "summary": "获取行政区划信息(单条)", + "summary": "修改行政区划信息", "tags": [ "行政区划" ], "x-emptylimit": [ - "areaCode" + "areaTypeId", + "areaCode", + "areaName", + "masterCode" ], "x-intlimit": [ - "areaCode" + "areaTypeId" ], "x-lengthlimit": [ { "areaCode": "6,6" + }, + { + "masterCode": "6,6" + }, + { + "areaName": "3:50" } ], "x-rolelimit": [ @@ -9474,16 +9888,16 @@ ] } }, - "/base/area/DeleteGovArea": { - "post": { + "/base/area/GetGovArea": { + "get": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "删除行政区划信息", + "description": "获取行政区划信息(单条)", "parameters": [ { - "description": "区域代码", - "in": "formData", + "description": "行政区划码", + "in": "query", "name": "areaCode", "required": true, "type": "string" @@ -9500,13 +9914,16 @@ } } }, - "summary": "删除行政区划信息", + "summary": "获取行政区划信息(单条)", "tags": [ "行政区划" ], "x-emptylimit": [ "areaCode" ], + "x-intlimit": [ + "areaCode" + ], "x-lengthlimit": [ { "areaCode": "6,6" @@ -9523,12 +9940,12 @@ ] } }, - "/base/area/UpdateGovArea": { + "/base/area/AddGovArea": { "post": { "consumes": [ "application/x-www-form-urlencoded" ], - "description": "修改行政区划信息", + "description": "增加行政区划信息", "parameters": [ { "description": "区域代码", @@ -9570,7 +9987,7 @@ } } }, - "summary": "修改行政区划信息", + "summary": "增加行政区划信息", "tags": [ "行政区划" ], @@ -9591,7 +10008,7 @@ "masterCode": "6,6" }, { - "areaName": "3:50" + "areaName": "3,50" } ], "x-rolelimit": [ diff --git a/dsBaseWeb/docs/swagger.yaml b/dsBaseWeb/docs/swagger.yaml index e95651ee..430be657 100644 --- a/dsBaseWeb/docs/swagger.yaml +++ b/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 diff --git a/dsBaseWeb/main.go b/dsBaseWeb/main.go index 29f84361..71f24c64 100644 --- a/dsBaseWeb/main.go +++ b/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")