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

+version: v1
+kind: Attribute
+metadata:
+  name: contractUndertaker
+  description: 共创合约承接人
+  type: 
+    schema: user

@@ -4,4 +4,4 @@ metadata:
   name: cooperationContractReferrer
   description: 合约推荐人
   type: 
-    schema: any
+    schema: user

 version: v1
 kind: Attribute
 metadata:
-  name: cooperationContractRelevant
+  name: cooperationContractRelevants
   description: 共创合约相关人
   type: 
-    array: any
+    array: user

@@ -4,4 +4,4 @@ metadata:
   name: cooperationContractSalesman
   description: 共创合约业务员
   type: 
-    schema: any
+    schema: user

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationContractUndertakerType
+  description: 共创合约承接对象，1员工，2共创用户，3公开
+  type: 
+    array: int32

@@ -4,4 +4,4 @@ metadata:
   name: cooperationContractUndertakers
   description: 共创合约承接人列表
   type: 
-    array: any
+    array: user

@@ -4,4 +4,4 @@ metadata:
   name: cooperationMode
   description: 共创模式
   type: 
-    schema: any
+    schema: cooperationMode

@@ -12,7 +12,9 @@ metadata:
     required: true
   - ref: cooperationContractNumber
     required: true
-  - ref: userId
+  - ref: contractUndertaker
+    required: true
+  - ref: organization
     required: true
   - ref: updatedAt
     required: true

+version: v1
+kind: Schema
+metadata:
+  name: cooperationContract
+  description: 共创项目合约实体
+  attributes:
+  - ref: cooperationContractId
+    required: true
+  - ref: cooperationContractDescription
+    required: true
+  - ref: cooperationContractName
+    required: true
+  - ref: cooperationContractNumber
+    required: true
+  - ref: cooperationContractReferrer
+    required: true
+  - ref: cooperationContractSalesman
+    required: true
+  - ref: cooperationContractUndertakerType
+    required: true
+  - ref: cooperationContractSponsor
+    required: true
+  - ref: cooperationMode
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true

@@ -18,10 +18,7 @@ metadata:
       delete: /{companyId}
   - method: listCompany
     route:
-      get: /
-    params:
-      - name: offset
-      - name: limit
+      post: /search
   - method: listCompanyCustomizeMenus
     route:
       get: /{companyId}/customize-menus/

@@ -18,7 +18,4 @@ metadata:
         delete: /{menuId}
     - method: listMenu
       route:
-        get: /
-      params:
-        - name: offset
-        - name: limit
+        post: /search

@@ -18,15 +18,7 @@ metadata:
       delete: /{orgId}
   - method: listOrg
     route:
-      get: /
-    params:
-      - name: offset
-      - name: limit
-      - name: companyId
-      - name: orgCode
-      - name: depName
-      - name: parentId
-      - name: isOrg
+      post: /search
   - method: getOrgSubDepartment
     route:
       get: /{orgId}/sub-department

@@ -18,14 +18,7 @@ metadata:
       delete: /{roleId}
   - method: listRole
     route:
-      get: /
-    params:
-      - name: offset
-      - name: limit
-      - name: roleName
-      - name: orgName
-      - name: orgId
-      - name: inOrgIds
+      post: /search
   - method: getRoleRelatedUsers
     route:
       get: /{roleId}/related-users

@@ -18,19 +18,11 @@ metadata:
         delete: /{usersId}
     - method: listUsers
       route:
-        get: /
-      params:
-        - name: offset
-        - name: limit
-        - name: companyId
-        - name: orgId
-        - name: usersName
-        - name: depName
+        get: /search
     - method: getUsersAccessMenus
       route:
-        get: /access-menus
+        get: /{usersId}/access-menus
       params:
-        - name: usersId
         - name: menuCategory
     - method: getUsersBaseInfo
       route:
@@ -39,6 +31,7 @@ metadata:
         - name: usersId
         - name: phone
         - name: usersBaseId
+        - name: usersCode
     - method: batchAdd
       route:
         post: /batch-add
@@ -51,3 +44,6 @@ metadata:
     - method: updateUsersPhoneAuth
       route:
         put: /{usersId}/phone-auth
+    - method: updateUsersBase
+      route:
+        put: /{usersId}/users-base   

 version: v1
 kind: Attribute
 metadata:
-  name: createAt
+  name: createdAt
   description: 创建时间
   type: 
     primitive: datetime

 version: v1
 kind: Attribute
 metadata:
-  name: deleteAt
+  name: deletedAt
   description: 删除时间
   type: 
     primitive: datetime

 version: v1
 kind: Attribute
 metadata:
-  name: updateAt
+  name: updatedAt
   description: 更新时间
   type: 
     primitive: datetime

@@ -938,16 +938,16 @@ definitions:
         description: 企业id
         required:
         - companyId
-      createAt:
+      createdAt:
         type: string
         description: 创建时间
         required:
-        - createAt
-      deleteAt:
+        - createdAt
+      deletedAt:
         type: string
         description: 删除时间
         required:
-        - deleteAt
+        - deletedAt
       ext:
         $ref: '#/definitions/extRequestBody'
       isOrg:
@@ -977,11 +977,11 @@ definitions:
       parentPath:
         type: string
         description: 父级节点路径("0,11,12,")
-      updateAt:
+      updatedAt:
         type: string
         description: 更新时间
         required:
-        - updateAt
+        - updatedAt
     description: 组织 organization
   orgResponseBody:
     title: orgResponseBody
@@ -992,16 +992,16 @@ definitions:
         description: 企业id
         required:
         - companyId
-      createAt:
+      createdAt:
         type: string
         description: 创建时间
         required:
-        - createAt
-      deleteAt:
+        - createdAt
+      deletedAt:
         type: string
         description: 删除时间
         required:
-        - deleteAt
+        - deletedAt
       ext:
         $ref: '#/definitions/extResponseBody'
       isOrg:
@@ -1031,11 +1031,11 @@ definitions:
       parentPath:
         type: string
         description: 父级节点路径("0,11,12,")
-      updateAt:
+      updatedAt:
         type: string
         description: 更新时间
         required:
-        - updateAt
+        - updatedAt
     description: 组织 organization
   roleRequestBody:
     title: roleRequestBody
@@ -1054,11 +1054,11 @@ definitions:
         description: 企业id
         required:
         - companyId
-      createAt:
+      createdAt:
         type: string
         description: 创建时间
         required:
-        - createAt
+        - createdAt
       desc:
         type: integer
         description: 描述
@@ -1081,11 +1081,11 @@ definitions:
         description: 角色名称
         required:
         - roleName
-      updateAt:
+      updatedAt:
         type: string
         description: 更新时间
         required:
-        - updateAt
+        - updatedAt
     description: 角色 （base)
   roleResponseBody:
     title: roleResponseBody
@@ -1104,11 +1104,11 @@ definitions:
         description: 企业id
         required:
         - companyId
-      createAt:
+      createdAt:
         type: string
         description: 创建时间
         required:
-        - createAt
+        - createdAt
       desc:
         type: integer
         description: 描述
@@ -1131,11 +1131,11 @@ definitions:
         description: 角色名称
         required:
         - roleName
-      updateAt:
+      updatedAt:
         type: string
         description: 更新时间
         required:
-        - updateAt
+        - updatedAt
     description: 角色 （base)
   usersRequestBody:
     title: usersRequestBody
@@ -1148,11 +1148,11 @@ definitions:
         - companyId
       cooperationInfo:
         $ref: '#/definitions/cooperationInfoRequestBody'
-      createAt:
+      createdAt:
         type: string
         description: 创建时间
         required:
-        - createAt
+        - createdAt
       departmentId:
         type: integer
         description: 所属部门
@@ -1172,11 +1172,11 @@ definitions:
         type: integer
         description: 组织机构
         format: int64
-      updateAt:
+      updatedAt:
         type: string
         description: 更新时间
         required:
-        - updateAt
+        - updatedAt
       usersBaseId:
         type: integer
         description: 用户基础数据id
@@ -1219,11 +1219,11 @@ definitions:
         - companyId
       cooperationInfo:
         $ref: '#/definitions/cooperationInfoResponseBody'
-      createAt:
+      createdAt:
         type: string
         description: 创建时间
         required:
-        - createAt
+        - createdAt
       departmentId:
         type: integer
         description: 所属部门
@@ -1243,11 +1243,11 @@ definitions:
         type: integer
         description: 组织机构
         format: int64
-      updateAt:
+      updatedAt:
         type: string
         description: 更新时间
         required:
-        - updateAt
+        - updatedAt
       usersBaseId:
         type: integer
         description: 用户基础数据id

@@ -24,9 +24,9 @@ metadata:
       description: 备注信息
       type:
         primitive: string
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true
-    - ref: deleteAt
+    - ref: deletedAt
       required: true

@@ -24,9 +24,9 @@ metadata:
       description: 备注信息
       type:
         primitive: string
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true
-    - ref: deleteAt
+    - ref: deletedAt
       required: true

@@ -18,7 +18,7 @@ metadata:
       description: 公司状态
       type:
         primitive: int
-    - ref: createAt
+    - ref: createdAt
       required: false
-    - ref: updateAt
+    - ref: updatedAt
       required: false

@@ -8,11 +8,11 @@ metadata:
       required: true
     - ref: companyId
       required: true
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true
-    - ref: deleteAt
+    - ref: deletedAt
       required: true
     - ref: orgCode
       required: true

@@ -20,7 +20,7 @@ metadata:
       description: 扩展数据
       type:
         schema: ext
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true

@@ -46,7 +46,7 @@ metadata:
       description: 扩展数据
       type:
         schema: ext
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true

@@ -26,7 +26,7 @@ metadata:
       description: 账号状态 1：正常 2.禁用 3：注销
       type:
         primitive: int
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true
\ No newline at end of file

@@ -16,10 +16,10 @@ metadata:
     - ref: orgId
       required: false
     - name: inOrgIds
-      description: 匹配多个组织  1,2,3 逗号分割 inOrgIds
+      description: 匹配多个组织
       required: false
       type:
-        primitive: string
+        array: int64
   result:
     - ref: count
       required: true

+version: v1
+kind: Method
+metadata:
+  name: updateUsersBase
+  type: command
+  description: 更新用户基础数据
+  payload:
+  - ref: usersId
+    required: true
+  - ref: usersCode
+    required: true
+  - ref: usersName
+    required: true
+  - ref: avator
+    required: true
+  result:
+  - ref: code
+    required: true
+  - ref: msg
+    required: true
+  - name: users
+    type: 
+      schema: users
+    required: true