allied-creation / document · 提交

转到一个项目

作者 tangxuhui
提交 e1f8645c40e9f22f08d8876f8276fe8da76a6903 2 个父辈 34b59412 b8a2a6ec

Merge branch 'master' of http://gitlab.fjmaimaimai.com/allied-creation/document

内嵌 并排对比
正在显示 31 个修改的文件 包含 137 行增加 和 92 行删除
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: contractUndertaker
  5 + description: 共创合约承接人
  6 + type:
  7 + schema: user
@@ -4,4 +4,4 @@ metadata: @@ -4,4 +4,4 @@ metadata:
4 name: cooperationContractReferrer 4 name: cooperationContractReferrer
5 description: 合约推荐人 5 description: 合约推荐人
6 type: 6 type:
7 - schema: any 7 + schema: user
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: cooperationContractRelevant 4 + name: cooperationContractRelevants
5 description: 共创合约相关人 5 description: 共创合约相关人
6 type: 6 type:
7 - array: any 7 + array: user
@@ -4,4 +4,4 @@ metadata: @@ -4,4 +4,4 @@ metadata:
4 name: cooperationContractSalesman 4 name: cooperationContractSalesman
5 description: 共创合约业务员 5 description: 共创合约业务员
6 type: 6 type:
7 - schema: any 7 + schema: user
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: cooperationContractUndertakerType
  5 + description: 共创合约承接对象，1员工，2共创用户，3公开
  6 + type:
  7 + array: int32
@@ -4,4 +4,4 @@ metadata: @@ -4,4 +4,4 @@ metadata:
4 name: cooperationContractUndertakers 4 name: cooperationContractUndertakers
5 description: 共创合约承接人列表 5 description: 共创合约承接人列表
6 type: 6 type:
7 - array: any 7 + array: user
@@ -4,4 +4,4 @@ metadata: @@ -4,4 +4,4 @@ metadata:
4 name: cooperationMode 4 name: cooperationMode
5 description: 共创模式 5 description: 共创模式
6 type: 6 type:
7 - schema: any 7 + schema: cooperationMode
@@ -12,7 +12,9 @@ metadata: @@ -12,7 +12,9 @@ metadata:
12 required: true 12 required: true
13 - ref: cooperationContractNumber 13 - ref: cooperationContractNumber
14 required: true 14 required: true
15 - - ref: userId 15 + - ref: contractUndertaker
  16 + required: true
  17 + - ref: organization
16 required: true 18 required: true
17 - ref: updatedAt 19 - ref: updatedAt
18 required: true 20 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: cooperationContract
  5 + description: 共创项目合约实体
  6 + attributes:
  7 + - ref: cooperationContractId
  8 + required: true
  9 + - ref: cooperationContractDescription
  10 + required: true
  11 + - ref: cooperationContractName
  12 + required: true
  13 + - ref: cooperationContractNumber
  14 + required: true
  15 + - ref: cooperationContractReferrer
  16 + required: true
  17 + - ref: cooperationContractSalesman
  18 + required: true
  19 + - ref: cooperationContractUndertakerType
  20 + required: true
  21 + - ref: cooperationContractSponsor
  22 + required: true
  23 + - ref: cooperationMode
  24 + required: true
  25 + - ref: createdAt
  26 + required: true
  27 + - ref: deletedAt
  28 + required: true
  29 + - ref: updatedAt
  30 + required: true
@@ -18,10 +18,7 @@ metadata: @@ -18,10 +18,7 @@ metadata:
18 delete: /{companyId} 18 delete: /{companyId}
19 - method: listCompany 19 - method: listCompany
20 route: 20 route:
21 - get: /  
22 - params:  
23 - - name: offset  
24 - - name: limit 21 + post: /search
25 - method: listCompanyCustomizeMenus 22 - method: listCompanyCustomizeMenus
26 route: 23 route:
27 get: /{companyId}/customize-menus/ 24 get: /{companyId}/customize-menus/
@@ -18,7 +18,4 @@ metadata: @@ -18,7 +18,4 @@ metadata:
18 delete: /{menuId} 18 delete: /{menuId}
19 - method: listMenu 19 - method: listMenu
20 route: 20 route:
21 - get: /  
22 - params:  
23 - - name: offset  
24 - - name: limit 21 + post: /search
@@ -18,15 +18,7 @@ metadata: @@ -18,15 +18,7 @@ metadata:
18 delete: /{orgId} 18 delete: /{orgId}
19 - method: listOrg 19 - method: listOrg
20 route: 20 route:
21 - get: /  
22 - params:  
23 - - name: offset  
24 - - name: limit  
25 - - name: companyId  
26 - - name: orgCode  
27 - - name: depName  
28 - - name: parentId  
29 - - name: isOrg 21 + post: /search
30 - method: getOrgSubDepartment 22 - method: getOrgSubDepartment
31 route: 23 route:
32 get: /{orgId}/sub-department 24 get: /{orgId}/sub-department
@@ -18,14 +18,7 @@ metadata: @@ -18,14 +18,7 @@ metadata:
18 delete: /{roleId} 18 delete: /{roleId}
19 - method: listRole 19 - method: listRole
20 route: 20 route:
21 - get: /  
22 - params:  
23 - - name: offset  
24 - - name: limit  
25 - - name: roleName  
26 - - name: orgName  
27 - - name: orgId  
28 - - name: inOrgIds 21 + post: /search
29 - method: getRoleRelatedUsers 22 - method: getRoleRelatedUsers
30 route: 23 route:
31 get: /{roleId}/related-users 24 get: /{roleId}/related-users
@@ -18,19 +18,11 @@ metadata: @@ -18,19 +18,11 @@ metadata:
18 delete: /{usersId} 18 delete: /{usersId}
19 - method: listUsers 19 - method: listUsers
20 route: 20 route:
21 - get: /  
22 - params:  
23 - - name: offset  
24 - - name: limit  
25 - - name: companyId  
26 - - name: orgId  
27 - - name: usersName  
28 - - name: depName 21 + get: /search
29 - method: getUsersAccessMenus 22 - method: getUsersAccessMenus
30 route: 23 route:
31 - get: /access-menus 24 + get: /{usersId}/access-menus
32 params: 25 params:
33 - - name: usersId  
34 - name: menuCategory 26 - name: menuCategory
35 - method: getUsersBaseInfo 27 - method: getUsersBaseInfo
36 route: 28 route:
@@ -39,6 +31,7 @@ metadata: @@ -39,6 +31,7 @@ metadata:
39 - name: usersId 31 - name: usersId
40 - name: phone 32 - name: phone
41 - name: usersBaseId 33 - name: usersBaseId
  34 + - name: usersCode
42 - method: batchAdd 35 - method: batchAdd
43 route: 36 route:
44 post: /batch-add 37 post: /batch-add
@@ -51,3 +44,6 @@ metadata: @@ -51,3 +44,6 @@ metadata:
51 - method: updateUsersPhoneAuth 44 - method: updateUsersPhoneAuth
52 route: 45 route:
53 put: /{usersId}/phone-auth 46 put: /{usersId}/phone-auth
  47 + - method: updateUsersBase
  48 + route:
  49 + put: /{usersId}/users-base
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: createAt 4 + name: createdAt
5 description: 创建时间 5 description: 创建时间
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: deleteAt 4 + name: deletedAt
5 description: 删除时间 5 description: 删除时间
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: updateAt 4 + name: updatedAt
5 description: 更新时间 5 description: 更新时间
6 type: 6 type:
7 primitive: datetime 7 primitive: datetime
@@ -938,16 +938,16 @@ definitions: @@ -938,16 +938,16 @@ definitions:
938 description: 企业id 938 description: 企业id
939 required: 939 required:
940 - companyId 940 - companyId
941 - createAt: 941 + createdAt:
942 type: string 942 type: string
943 description: 创建时间 943 description: 创建时间
944 required: 944 required:
945 - - createAt  
946 - deleteAt: 945 + - createdAt
  946 + deletedAt:
947 type: string 947 type: string
948 description: 删除时间 948 description: 删除时间
949 required: 949 required:
950 - - deleteAt 950 + - deletedAt
951 ext: 951 ext:
952 $ref: '#/definitions/extRequestBody' 952 $ref: '#/definitions/extRequestBody'
953 isOrg: 953 isOrg:
@@ -977,11 +977,11 @@ definitions: @@ -977,11 +977,11 @@ definitions:
977 parentPath: 977 parentPath:
978 type: string 978 type: string
979 description: 父级节点路径("0,11,12,") 979 description: 父级节点路径("0,11,12,")
980 - updateAt: 980 + updatedAt:
981 type: string 981 type: string
982 description: 更新时间 982 description: 更新时间
983 required: 983 required:
984 - - updateAt 984 + - updatedAt
985 description: 组织 organization 985 description: 组织 organization
986 orgResponseBody: 986 orgResponseBody:
987 title: orgResponseBody 987 title: orgResponseBody
@@ -992,16 +992,16 @@ definitions: @@ -992,16 +992,16 @@ definitions:
992 description: 企业id 992 description: 企业id
993 required: 993 required:
994 - companyId 994 - companyId
995 - createAt: 995 + createdAt:
996 type: string 996 type: string
997 description: 创建时间 997 description: 创建时间
998 required: 998 required:
999 - - createAt  
1000 - deleteAt: 999 + - createdAt
  1000 + deletedAt:
1001 type: string 1001 type: string
1002 description: 删除时间 1002 description: 删除时间
1003 required: 1003 required:
1004 - - deleteAt 1004 + - deletedAt
1005 ext: 1005 ext:
1006 $ref: '#/definitions/extResponseBody' 1006 $ref: '#/definitions/extResponseBody'
1007 isOrg: 1007 isOrg:
@@ -1031,11 +1031,11 @@ definitions: @@ -1031,11 +1031,11 @@ definitions:
1031 parentPath: 1031 parentPath:
1032 type: string 1032 type: string
1033 description: 父级节点路径("0,11,12,") 1033 description: 父级节点路径("0,11,12,")
1034 - updateAt: 1034 + updatedAt:
1035 type: string 1035 type: string
1036 description: 更新时间 1036 description: 更新时间
1037 required: 1037 required:
1038 - - updateAt 1038 + - updatedAt
1039 description: 组织 organization 1039 description: 组织 organization
1040 roleRequestBody: 1040 roleRequestBody:
1041 title: roleRequestBody 1041 title: roleRequestBody
@@ -1054,11 +1054,11 @@ definitions: @@ -1054,11 +1054,11 @@ definitions:
1054 description: 企业id 1054 description: 企业id
1055 required: 1055 required:
1056 - companyId 1056 - companyId
1057 - createAt: 1057 + createdAt:
1058 type: string 1058 type: string
1059 description: 创建时间 1059 description: 创建时间
1060 required: 1060 required:
1061 - - createAt 1061 + - createdAt
1062 desc: 1062 desc:
1063 type: integer 1063 type: integer
1064 description: 描述 1064 description: 描述
@@ -1081,11 +1081,11 @@ definitions: @@ -1081,11 +1081,11 @@ definitions:
1081 description: 角色名称 1081 description: 角色名称
1082 required: 1082 required:
1083 - roleName 1083 - roleName
1084 - updateAt: 1084 + updatedAt:
1085 type: string 1085 type: string
1086 description: 更新时间 1086 description: 更新时间
1087 required: 1087 required:
1088 - - updateAt 1088 + - updatedAt
1089 description: 角色 （base) 1089 description: 角色 （base)
1090 roleResponseBody: 1090 roleResponseBody:
1091 title: roleResponseBody 1091 title: roleResponseBody
@@ -1104,11 +1104,11 @@ definitions: @@ -1104,11 +1104,11 @@ definitions:
1104 description: 企业id 1104 description: 企业id
1105 required: 1105 required:
1106 - companyId 1106 - companyId
1107 - createAt: 1107 + createdAt:
1108 type: string 1108 type: string
1109 description: 创建时间 1109 description: 创建时间
1110 required: 1110 required:
1111 - - createAt 1111 + - createdAt
1112 desc: 1112 desc:
1113 type: integer 1113 type: integer
1114 description: 描述 1114 description: 描述
@@ -1131,11 +1131,11 @@ definitions: @@ -1131,11 +1131,11 @@ definitions:
1131 description: 角色名称 1131 description: 角色名称
1132 required: 1132 required:
1133 - roleName 1133 - roleName
1134 - updateAt: 1134 + updatedAt:
1135 type: string 1135 type: string
1136 description: 更新时间 1136 description: 更新时间
1137 required: 1137 required:
1138 - - updateAt 1138 + - updatedAt
1139 description: 角色 （base) 1139 description: 角色 （base)
1140 usersRequestBody: 1140 usersRequestBody:
1141 title: usersRequestBody 1141 title: usersRequestBody
@@ -1148,11 +1148,11 @@ definitions: @@ -1148,11 +1148,11 @@ definitions:
1148 - companyId 1148 - companyId
1149 cooperationInfo: 1149 cooperationInfo:
1150 $ref: '#/definitions/cooperationInfoRequestBody' 1150 $ref: '#/definitions/cooperationInfoRequestBody'
1151 - createAt: 1151 + createdAt:
1152 type: string 1152 type: string
1153 description: 创建时间 1153 description: 创建时间
1154 required: 1154 required:
1155 - - createAt 1155 + - createdAt
1156 departmentId: 1156 departmentId:
1157 type: integer 1157 type: integer
1158 description: 所属部门 1158 description: 所属部门
@@ -1172,11 +1172,11 @@ definitions: @@ -1172,11 +1172,11 @@ definitions:
1172 type: integer 1172 type: integer
1173 description: 组织机构 1173 description: 组织机构
1174 format: int64 1174 format: int64
1175 - updateAt: 1175 + updatedAt:
1176 type: string 1176 type: string
1177 description: 更新时间 1177 description: 更新时间
1178 required: 1178 required:
1179 - - updateAt 1179 + - updatedAt
1180 usersBaseId: 1180 usersBaseId:
1181 type: integer 1181 type: integer
1182 description: 用户基础数据id 1182 description: 用户基础数据id
@@ -1219,11 +1219,11 @@ definitions: @@ -1219,11 +1219,11 @@ definitions:
1219 - companyId 1219 - companyId
1220 cooperationInfo: 1220 cooperationInfo:
1221 $ref: '#/definitions/cooperationInfoResponseBody' 1221 $ref: '#/definitions/cooperationInfoResponseBody'
1222 - createAt: 1222 + createdAt:
1223 type: string 1223 type: string
1224 description: 创建时间 1224 description: 创建时间
1225 required: 1225 required:
1226 - - createAt 1226 + - createdAt
1227 departmentId: 1227 departmentId:
1228 type: integer 1228 type: integer
1229 description: 所属部门 1229 description: 所属部门
@@ -1243,11 +1243,11 @@ definitions: @@ -1243,11 +1243,11 @@ definitions:
1243 type: integer 1243 type: integer
1244 description: 组织机构 1244 description: 组织机构
1245 format: int64 1245 format: int64
1246 - updateAt: 1246 + updatedAt:
1247 type: string 1247 type: string
1248 description: 更新时间 1248 description: 更新时间
1249 required: 1249 required:
1250 - - updateAt 1250 + - updatedAt
1251 usersBaseId: 1251 usersBaseId:
1252 type: integer 1252 type: integer
1253 description: 用户基础数据id 1253 description: 用户基础数据id
@@ -24,9 +24,9 @@ metadata: @@ -24,9 +24,9 @@ metadata:
24 description: 备注信息 24 description: 备注信息
25 type: 25 type:
26 primitive: string 26 primitive: string
27 - - ref: createAt 27 + - ref: createdAt
28 required: true 28 required: true
29 - - ref: updateAt 29 + - ref: updatedAt
30 required: true 30 required: true
31 - - ref: deleteAt 31 + - ref: deletedAt
32 required: true 32 required: true
@@ -24,9 +24,9 @@ metadata: @@ -24,9 +24,9 @@ metadata:
24 description: 备注信息 24 description: 备注信息
25 type: 25 type:
26 primitive: string 26 primitive: string
27 - - ref: createAt 27 + - ref: createdAt
28 required: true 28 required: true
29 - - ref: updateAt 29 + - ref: updatedAt
30 required: true 30 required: true
31 - - ref: deleteAt 31 + - ref: deletedAt
32 required: true 32 required: true
@@ -18,7 +18,7 @@ metadata: @@ -18,7 +18,7 @@ metadata:
18 description: 公司状态 18 description: 公司状态
19 type: 19 type:
20 primitive: int 20 primitive: int
21 - - ref: createAt 21 + - ref: createdAt
22 required: false 22 required: false
23 - - ref: updateAt 23 + - ref: updatedAt
24 required: false 24 required: false
@@ -8,11 +8,11 @@ metadata: @@ -8,11 +8,11 @@ metadata:
8 required: true 8 required: true
9 - ref: companyId 9 - ref: companyId
10 required: true 10 required: true
11 - - ref: createAt 11 + - ref: createdAt
12 required: true 12 required: true
13 - - ref: updateAt 13 + - ref: updatedAt
14 required: true 14 required: true
15 - - ref: deleteAt 15 + - ref: deletedAt
16 required: true 16 required: true
17 - ref: orgCode 17 - ref: orgCode
18 required: true 18 required: true
@@ -20,7 +20,7 @@ metadata: @@ -20,7 +20,7 @@ metadata:
20 description: 扩展数据 20 description: 扩展数据
21 type: 21 type:
22 schema: ext 22 schema: ext
23 - - ref: createAt 23 + - ref: createdAt
24 required: true 24 required: true
25 - - ref: updateAt 25 + - ref: updatedAt
26 required: true 26 required: true
@@ -46,7 +46,7 @@ metadata: @@ -46,7 +46,7 @@ metadata:
46 description: 扩展数据 46 description: 扩展数据
47 type: 47 type:
48 schema: ext 48 schema: ext
49 - - ref: createAt 49 + - ref: createdAt
50 required: true 50 required: true
51 - - ref: updateAt 51 + - ref: updatedAt
52 required: true 52 required: true
@@ -26,7 +26,7 @@ metadata: @@ -26,7 +26,7 @@ metadata:
26 description: 账号状态 1：正常 2.禁用 3：注销 26 description: 账号状态 1：正常 2.禁用 3：注销
27 type: 27 type:
28 primitive: int 28 primitive: int
29 - - ref: createAt 29 + - ref: createdAt
30 required: true 30 required: true
31 - - ref: updateAt 31 + - ref: updatedAt
32 required: true 32 required: true
@@ -16,10 +16,10 @@ metadata: @@ -16,10 +16,10 @@ metadata:
16 - ref: orgId 16 - ref: orgId
17 required: false 17 required: false
18 - name: inOrgIds 18 - name: inOrgIds
19 - description: 匹配多个组织 1,2,3 逗号分割 inOrgIds 19 + description: 匹配多个组织
20 required: false 20 required: false
21 type: 21 type:
22 - primitive: string 22 + array: int64
23 result: 23 result:
24 - ref: count 24 - ref: count
25 required: true 25 required: true
  1 +version: v1
  2 +kind: Method
  3 +metadata:
  4 + name: updateUsersBase
  5 + type: command
  6 + description: 更新用户基础数据
  7 + payload:
  8 + - ref: usersId
  9 + required: true
  10 + - ref: usersCode
  11 + required: true
  12 + - ref: usersName
  13 + required: true
  14 + - ref: avator
  15 + required: true
  16 + result:
  17 + - ref: code
  18 + required: true
  19 + - ref: msg
  20 + required: true
  21 + - name: users
  22 + type:
  23 + schema: users
  24 + required: true