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

+version: v1
+kind: HttpApi
+metadata:
+  service: cooperationMode
+  path: /cooperation-modes
+  endpoints: 
+  - method: createCooperationMode
+    route:
+      post: /  
+  - method: updateCooperationMode
+    route:
+      put: /{cooperationModeId}
+  - method: getCooperationMode
+    route:
+      get: /{cooperationModeId}
+  - method: removeCooperationMode
+    route:
+      delete: /{cooperationModeId}
+  - method: listCooperationMode
+    route:
+      get: /
+    params:
+      - name: offset
+      - name: limit

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationApplicant
+  description: 共创申请人
+  type: 
+    schema: user

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationAttachment
+  description: 共创申请描述附件
+  type: 
+    array: string

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationDescription
+  description: 共创申请描述
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationId
+  description: 共创申请ID
+  type: 
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationStatus
+  description: 共创申请审核状态，1待审核，2已同意，3已拒绝
+  type: 
+    primitive: int32

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationVerifier
+  description: 共创申请审核人
+  type: 
+    schema: user

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationVerifyDescription
+  description: 共创申请审核描述
+  type: 
+    primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplicationVerifyTime
+  description: 共创申请审核时间
+  type: 
+    primitive: datetime

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationApplyTime
+  description: 共创申请时间
+  type: 
+    primitive: datetime

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractDescription
+  name: cooperationContractDescription
   description: 共创合约描述
   type: 
     primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractId
+  name: cooperationContractId
   description: 共创合约ID
   type: 
     primitive: int64

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractIncentivesRules
+  name: cooperationContractIncentivesRules
   description: 共创合约激励规则列表
   type: 
     array: any

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractName
+  name: cooperationContractName
   description: 共创合约名称
   type: 
     primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractNumber
+  name: cooperationContractNumber
   description: 共创合约编号
   type: 
     primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractReferrer
+  name: cooperationContractReferrer
   description: 合约推荐人
   type: 
     schema: any

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

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractSalesman
+  name: cooperationContractSalesman
   description: 共创合约业务员
   type: 
     schema: any

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractSponsor
+  name: cooperationContractSponsor
   description: 共创合约发起人
   type: 
     schema: user

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractUndertakers
+  name: cooperationContractUndertakers
   description: 共创合约承接人列表
   type: 
     array: any

 version: v1
 kind: Attribute
 metadata:
-  name: creationMode
+  name: cooperationMode
   description: 共创模式
   type: 
     schema: any

 version: v1
 kind: Attribute
 metadata:
-  name: creationContractChangeLogId
+  name: cooperationContractChangeLogId
   description: 合约变更记录ID
   type: 
     primitive: int64

 version: v1
 kind: Attribute
 metadata:
-  name: creationModeId
+  name: cooperationModeId
   description: 共创模式ID
   type: 
     primitive: int64

 version: v1
 kind: Attribute
 metadata:
-  name: creationModeName
+  name: cooperationModeName
   description: 共创模式名称
   type: 
     primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationModeNumber
-  description: 共创模式编码
+  name: cooperationModeNumber
+  description: 共创模式编码，手动输入，唯一确定
   type: 
     primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectDescription
+  name: cooperationProjectDescription
   description: 共创项目描述
   type: 
     primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectId
+  name: cooperationProjectId
   description: 共创项目ID
   type: 
     primitive: int64

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectName
+  name: cooperationProjectName
   description: 共创项目名称
   type: 
     primitive: string

+version: v1
+kind: Attribute
+metadata:
+  name: cooperationProjectNumber
+  description: 共创项目编号，自生成，生成规则：XM+6位年月日+#+3位流水，例XM210601#001
+  type: 
+    primitive: string

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectPublishTime
+  name: cooperationProjectPublishTime
   description: 共创项目发布时间
   type: 
     primitive: datetime

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectPublisher
+  name: cooperationProjectPublisher
   description: 共创项目发布人
   type: 
     schema: user

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectSponsor
+  name: cooperationProjectSponsor
   description: 共创项目发起人
   type: 
     schema: user

 version: v1
 kind: Attribute
 metadata:
-  name: creationProjectUndertakerType
-  description: 共创项目承接对象，1员工，2共创用户
+  name: cooperationProjectUndertakerType
+  description: 共创项目承接对象，1员工，2共创用户，3公开
   type: 
     primitive: int32

 version: v1
 kind: Project
 metadata:
-  name: allied-creation-cochron
+  name: allied-creation-cooperation
   description: 天联共创
   version: 1.0.0
-  repository: gitlab.fjmaimaimai.com/allied-creation/allied-creation-cochron
+  repository: gitlab.fjmaimaimai.com/allied-creation/allied-creation-cooperation
   contact:
     name: 陈志颖
     email: steve.d.chan@qq.com

@@ -10,7 +10,13 @@ metadata:
     required: true
   - ref: feedbackContent
     required: true
-  - ref: creationContractNumber
+  - ref: cooperationContractNumber
     required: true
   - ref: userId
     required: true
+  - ref: updatedAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: createdAt
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: cooperationApplication
+  description: 共创申请实体
+  attributes:
+  - ref: cooperationApplicationId
+    required: true
+  - ref: cooperationApplicationApplicant
+    required: true
+  - ref: cooperationApplicationAttachment
+    required: true
+  - ref: cooperationApplicationDescription
+    required: true
+  - ref: cooperationApplicationStatus
+    required: true
+  - ref: cooperationApplicationVerifier
+    required: true
+  - ref: cooperationApplicationVerifyDescription
+    required: true
+  - ref: cooperationApplicationVerifyTime
+    required: true
+  - ref: cooperationApplyTime
+    required: true
+  - ref: cooperationProjectId
+    required: true
+  - ref: createdAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: updatedAt
+    required: true

 version: v1
 kind: Schema
 metadata:
-  name: creationProject
-  description: 共创项目实体
+  name: cooperationMode
+  description: 共创模式实体
   attributes:
-  - ref: creationProjectDescription
+  - ref: cooperationModeId
     required: true
-  - ref: creationProjectId
+  - ref: cooperationModeNumber
+    description: 模式编码，唯一确定
     required: true
-  - ref: creationProjectName
+  - ref: cooperationModeName
+    description: 模式名称，唯一确定
     required: true
-  - ref: creationProjectPublishTime
-    required: true
-  - ref: creationProjectPublisher
-    required: true
-  - ref: creationProjectSponsor
+  - ref: status
+    description: 共创模式状态，1启用，2禁用
     required: true
-  - ref: creationProjectUndertakerType
+  - ref: remarks
     required: true
   - ref: operator
     required: true
   - ref: operateTime
     required: true
-  - ref: status
+  - ref: updatedAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: createdAt
     required: true

+version: v1
+kind: Schema
+metadata:
+  name: cooperationProject
+  description: 共创项目实体
+  attributes:
+  - ref: cooperationProjectId
+    required: true
+  - ref: cooperationProjectNumber
+    description: 共创项目编号
+    required: true
+  - ref: cooperationProjectDescription
+    required: true
+  - ref: cooperationProjectName
+    required: true
+  - ref: cooperationProjectPublishTime
+    required: true
+  - ref: cooperationProjectPublisher
+    required: true
+  - ref: cooperationProjectSponsor
+    required: true
+  - ref: cooperationProjectUndertakerType
+    required: true
+  - ref: operator
+    required: true
+  - ref: operateTime
+    required: true
+  - ref: status
+    description: 共创项目状态，1招标中，2结束
+    required: true
+  - ref: updatedAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: createdAt
+    required: true

@@ -18,3 +18,9 @@ metadata:
     required: true
   - ref: dividendsIncentivesStageStart
     required: true
+  - ref: updatedAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: createdAt
+    required: true

@@ -20,3 +20,9 @@ metadata:
     required: true
   - ref: salesmanPercentage
     required: true
+  - ref: updatedAt
+    required: true
+  - ref: deletedAt
+    required: true
+  - ref: createdAt
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: createCooperationMode
+  type: command
+  description: 创建共创模式服务
+  payload:
+  result:
+  - name: cooperationMode
+    type: 
+      schema: cooperationMode
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: getCooperationMode
+  type: query
+  description: 返回共创模式服务
+  payload:
+  - ref: cooperationModeId
+    required: true
+  result:
+  - name: cooperationMode
+    type: 
+      schema: cooperationMode
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: listCooperationMode
+  type: query
+  description: 返回共创模式服务列表
+  payload:
+  - ref: offset
+    required: true
+  - ref: limit
+    required: true
+  result:
+  - ref: count
+    required: true 
+  - name: cooperationModes
+    type: 
+      array: cooperationMode
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: removeCooperationMode
+  type: command
+  description: 移除共创模式服务
+  payload:
+  - ref: cooperationModeId
+    required: true
+  result:
+  - name: cooperationMode
+    type: 
+      schema: cooperationMode
+    required: true

+version: v1
+kind: Method
+metadata:
+  name: updateCooperationMode
+  type: command
+  description: 更新共创模式服务
+  payload:
+  - ref: cooperationModeId
+    required: true
+  result:
+  - name: cooperationMode
+    type: 
+      schema: cooperationMode
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: cooperationMode
+  description: 共创模式服务

+version: v1
+kind: HttpApi
+metadata:
+  service: users
+  path: /users
+  endpoints:
+    - method: companyUserAdd
+      route:
+        post: /company-user
+    - method: companyUserUpdate
+      route:
+        put: /company-user
+    - method: companyUserList
+      route:
+        post: /company-user/search
+    - method: companyUserGet
+      route:
+        get: /company-user/{Id}
+    - method: companyUserEnable
+      route:
+        put: /company-user/enable
+    - method: companyUserResetPassword
+      route:
+        put: /company-user/reset-password
+    - method: cooperationUserAdd
+      route:
+        post: /cooperation-user
+    - method: cooperationUserUpdate
+      route:
+        put: /cooperation-user
+    - method: cooperationUserList
+      route:
+        post: /cooperation-user/search
+    - method: cooperationUserGet
+      route:
+        get: /cooperation-user/{Id}
+    - method: cooperationUserEnable
+      route:
+        put: /cooperation-user/enable
+    - method: cooperationUserResetPassword
+      route:
+        put: /cooperation-user/reset-password

+version: v1
+kind: Attribute
+metadata:
+  name: parentId
+  description: 父级id
+  type:
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: sort
+  description: 排序
+  type:
+    primitive: int

+version: v1
+kind: Attribute
+metadata:
+  name: companyId
+  description: 公司id
+  type:
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: parentId
+  description: 父级组织ID
+  type:
+    primitive: int64

+version: v1
+kind: Attribute
+metadata:
+  name: desc
+  description: 描述
+  type:
+    primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: companyUser
+  description: web页面上公司用户数据展示
+  attributes:
+    - name: usersId
+      description: 用户的id
+      type:
+        primitive: int64
+    - name: usersCode
+      description: 用户编号
+      type:
+        primitive: string
+    - name: usersName
+      description: 用户名称
+      type:
+        primitive: string
+    - name: organizationId
+      description: 组织机构id
+      type:
+        primitive: int64
+    - name: departmentId
+      description: 部门id
+      type:
+        primitive: int64
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: int
+    - name: phone
+      description: 手机号
+      type:
+        primitive: string
+    - name: email
+      description: 邮箱
+      type:
+        primitive: string
+    - name: usersOrg
+      description: 关联的组织机构
+      type:
+        array: org
+    - name: usersRole
+      description: 关联的组织结构
+      type:
+        array: role
+    - name: avator
+      description: 头像
+      type:
+        primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: companyUserListItem
+  description: 用户列表
+  attributes:
+    - ref: usersId
+      required: true
+    - ref: usersCode
+      required: true
+    - name: phone
+      description: 手机号
+      type:
+        primitive: string
+    - name: departmentName
+      description: 部门名称
+      type:
+        primitive: string
+    - name: orgName
+      description: 组织名称
+      type:
+        primitive: string
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: int
+    - name: enableStatusMsg
+      description: 启用状态名称
+      type:
+        primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: cooperationInfo
+  description: 共创信息
+  attributes:
+  - name: cooperationCompany
+    description: 共创公司
+    type: 
+      primitive: string
+  - name: cooperationDeadline
+    description: 共创到期时间 （yyyy-MM-dd）
+    type: 
+      primitive: datetime

+version: v1
+kind: Schema
+metadata:
+  name: cooperationUser
+  description: web页面上共创用户数据展示
+  attributes:
+    - name: usersId
+      description: 用户的id
+      type:
+        primitive: int64
+    - name: usersCode
+      description: 用户编号
+      type:
+        primitive: string
+    - name: usersName
+      description: 用户名称
+      type:
+        primitive: string
+    - name: cooperationCompany
+      description: 共创公司
+      type:
+        primitive: string
+    - name: cooperationDeadline
+      description: 共创到期时间 （yyyy-MM-dd）
+      type:
+        primitive: datetime
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: int
+    - name: email
+      description: 邮箱
+      type:
+        primitive: string

@@ -9,7 +9,7 @@ metadata:
       type:
         primitive: string
     - name: platform
-      description: 对应平台,[web,mobile]
+      description: 对应平台
       type:
         primitive: string
     - name: companyId

@@ -2,17 +2,17 @@ version: v1
 kind: Schema
 metadata:
   name: org
-  description: 组织 organization
+  description: 组织organization
   attributes:
     - ref: orgId
       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

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

@@ -16,7 +16,7 @@ metadata:
       required: true
     - ref: desc
       required: true
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true

@@ -42,7 +42,7 @@ metadata:
       description: 启用状态(启用:1 禁用:2)
       type:
         primitive: int
-    - ref: createAt
+    - ref: createdAt
       required: true
-    - ref: updateAt
+    - ref: updatedAt
       required: true

@@ -22,7 +22,7 @@ metadata:
       description: 关联的用户 (冗余)
       type:
         array: int64
-    - ref: createAt
+    - ref: createdAt
+      required: true
+    - ref: updatedAt
       required: true
-    - ref: updateAt
-      required: true
\ No newline at end of file

 version: v1
 kind: Method
 metadata:
-  name: getUsers
+  name: companyUserGet
   type: query
-  description: 返回用户信息
+  description: 获取公司用户信息
   payload:
     - ref: usersId
       required: true
   result:
+    - name: usersId
+      description: 用户id
+      type:
+        primitive: int64
     - name: usersCode
       description: 用户编号
       type:

 version: v1
 kind: Method
 metadata:
-  name: createUsers
+  name: companyUserAdd
   type: command
-  description: 创建用户信息
+  description: 创建公司用户信息
   payload:
     - name: usersCode
       description: 用户编号

 version: v1
 kind: Method
 metadata:
-  name: enableUsers
+  name: companyUserEnable
   type: command
   description: 启用禁用用户信息
   payload:
-    - ref: usersId
-      required: true
+    - name: usersIds
+      type:
+        array: int64
     - name: enableStatus
       description: 启用状态(启用:1 禁用:2)
       type:

 version: v1
 kind: Method
 metadata:
-  name: listUsers
+  name: companyUserList
   type: query
-  description: 返回用户信息列表
+  description: 返回公司用户信息列表
   payload:
     - ref: offset
       required: true
@@ -14,5 +14,5 @@ metadata:
       required: true
     - name: userList
       type:
-        array: userListItem
+        array: companyUserListItem
       required: true

 version: v1
 kind: Method
 metadata:
-  name: batchResetPassword
+  name: companyUserResetPassword
   type: command
   description: 批量重置密码
   payload:
@@ -9,8 +9,6 @@ metadata:
       type:
         array: int64
       required: true
-    - ref: password
-      required: true
   result:
     - name: usersId
       type:

 version: v1
 kind: Method
 metadata:
-  name: updateUsers
+  name: companyUserUpdate
   type: command
-  description: 更新用户信息
+  description: 更新公司用户信息
   payload:
     - name: usersId
       type:

+version: v1
+kind: Method
+metadata:
+  name: cooperationUserAdd
+  type: command
+  description: 创建共创用户信息
+  payload:
+    - name: userinfo
+      description: 共创用户信息
+      type:
+        schema: cooperationUser
+  result:
+    - name: usersId
+      type:
+        primitive: int64
+      required: true

+version: v1
+kind: Method
+metadata:
+  name: cooperationUserEnable
+  type: command
+  description: 启用禁用用户信息
+  payload:
+    - name: usersIds
+      type:
+        array: int64
+    - name: enableStatus
+      description: 启用状态(启用:1 禁用:2)
+      type:
+        primitive: int
+  result:
+    - name: users
+      type:
+        schema: users
+      required: true

+version: v1
+kind: Method
+metadata:
+  name: cooperationUserGet
+  type: query
+  description: 获取共创用户信息
+  payload:
+    - ref: usersId
+      required: true
+  result:
+    - name: userinfo
+      description: 共创用户信息
+      type:
+        schema: cooperationUser

+version: v1
+kind: Method
+metadata:
+  name: cooperationUserList
+  type: query
+  description: 返回共创用户信息列表
+  payload:
+    - ref: offset
+      required: true
+    - ref: limit
+      required: true
+  result:
+    - ref: count
+      required: true
+    - name: userList
+      type:
+        array: cooperationUser
+      required: true

+version: v1
+kind: Method
+metadata:
+  name: cooperationUserResetPassword
+  type: command
+  description: 批量重置密码
+  payload:
+    - name: usersIds
+      type:
+        array: int64
+      required: true
+  result:
+    - name: usersId
+      type:
+        primitive: int64
+      required: true

+version: v1
+kind: Method
+metadata:
+  name: cooperationUserUpdate
+  type: command
+  description: 编辑共创用户信息
+  payload:
+    - name: userinfo
+      description: 共创用户信息
+      type:
+        schema: cooperationUser
+  result:
+    - name: usersId
+      type:
+        primitive: int64
+      required: true