allied-creation / document · 提交

转到一个项目

作者 yangfu
提交 0af2c4b955ba595e7da46762cad222cdf7a5f4e8 2 个父辈 bd5e3df2 e786c932

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

内嵌 并排对比
正在显示 57 个修改的文件 包含 136 行增加 和 54 行删除
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: accounted
  5 + description: 已结算
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: paid
  5 + description: 已支付
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: toBeAccounted
  5 + description: 待结算
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: annualDividendsExpense
  5 + description: 分红支出-年度分红支出
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsExpenseDetails
  5 + description: 企业分红支出明细
  6 + type:
  7 + schema: dividendsExpenseDetails
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: quarterDividendsExpense
  5 + description: 分红支出-季度分红支出
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: totalDividendsExpense
  5 + description: 合约分红-全部分红支出
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dividendsExpenseDetails
  5 + description: 企业分红支出明细
  6 + attributes:
  7 + - ref: toBeAccounted
  8 + required: true
  9 + - ref: accounted
  10 + required: true
  11 + - ref: paid
  12 + required: true
@@ -19,6 +19,11 @@ metadata: @@ -19,6 +19,11 @@ metadata:
19 required: true 19 required: true
20 - ref: userId 20 - ref: userId
21 required: true 21 required: true
  22 + - name: matchWord
  23 + description: 查询关键词
  24 + required: false
  25 + type:
  26 + primitive: string
22 result: 27 result:
23 - name: contractUndertakerFeedbacks 28 - name: contractUndertakerFeedbacks
24 type: 29 type:
@@ -3,7 +3,7 @@ kind: Method @@ -3,7 +3,7 @@ kind: Method
3 metadata: 3 metadata:
4 name: searchCooperationGoodsStatistics 4 name: searchCooperationGoodsStatistics
5 type: query 5 type: query
6 - description: 返回共创产品统计数据 6 + description: 返回企业共创产品统计数据
7 payload: 7 payload:
8 - name: rankingType 8 - name: rankingType
9 description: 排行榜类型，1月榜，2年榜 3总榜，默认展示年榜 9 description: 排行榜类型，1月榜，2年榜 3总榜，默认展示年榜
@@ -11,7 +11,11 @@ metadata: @@ -11,7 +11,11 @@ metadata:
11 primitive: int32 11 primitive: int32
12 required: false 12 required: false
13 - ref: companyId 13 - ref: companyId
14 - required: true 14 + description: 企业ID，企业和组织id二选一
  15 + required: false
  16 + - ref: orgId
  17 + description: 组织机构id，组织和企业id二选一
  18 + required: false
15 - ref: userId 19 - ref: userId
16 required: true 20 required: true
17 - ref: pageSize 21 - ref: pageSize
@@ -3,10 +3,14 @@ kind: Method @@ -3,10 +3,14 @@ kind: Method
3 metadata: 3 metadata:
4 name: searchCooperationModeStatistics 4 name: searchCooperationModeStatistics
5 type: query 5 type: query
6 - description: 返回共创模式数据统计 6 + description: 返回企业共创模式数据统计
7 payload: 7 payload:
8 - ref: companyId 8 - ref: companyId
9 - required: true 9 + description: 企业id，企业和组织二选一
  10 + required: false
  11 + - ref: orgId
  12 + description: 组织id，组织和企业二选一
  13 + required: false
10 - ref: userId 14 - ref: userId
11 required: true 15 required: true
12 result: 16 result:
@@ -3,10 +3,14 @@ kind: Method @@ -3,10 +3,14 @@ kind: Method
3 metadata: 3 metadata:
4 name: searchCooperationPersonStatistics 4 name: searchCooperationPersonStatistics
5 type: query 5 type: query
6 - description: 返回共创人员信息统计 6 + description: 返回企业共创人员信息统计
7 payload: 7 payload:
8 - ref: companyId 8 - ref: companyId
9 - required: true 9 + description: 查看的目标公司id，公司和组织入参二选一
  10 + required: false
  11 + - ref: orgId
  12 + description: 查看的目标组织id，组织和公司入参二选一
  13 + required: false
10 - ref: userId 14 - ref: userId
11 required: true 15 required: true
12 result: 16 result:
@@ -15,8 +15,18 @@ metadata: @@ -15,8 +15,18 @@ metadata:
15 required: true 15 required: true
16 - ref: userId 16 - ref: userId
17 required: true 17 required: true
  18 + - name: period
  19 + description: 结算周期，按年“2021”或者按月结算”2021-07“
  20 + type:
  21 + primitive: datetime
  22 + required: false
18 result: 23 result:
19 - name: creditAccounts 24 - name: creditAccounts
20 type: 25 type:
21 array: creditAccount 26 array: creditAccount
22 required: true 27 required: true
  28 + - name: sum
  29 + description: 本月结算或本年度结算
  30 + type:
  31 + primitive: float64
  32 + required: true
@@ -6,7 +6,11 @@ metadata: @@ -6,7 +6,11 @@ metadata:
6 description: 返回共创企业本月分红统计 6 description: 返回共创企业本月分红统计
7 payload: 7 payload:
8 - ref: companyId 8 - ref: companyId
9 - required: true 9 + description: 企业id，企业和组织二选一
  10 + required: false
  11 + - ref: orgId
  12 + description: 组织id，组织和企业二选一
  13 + required: false
10 - ref: userId 14 - ref: userId
11 required: true 15 required: true
12 result: 16 result:
@@ -3,10 +3,14 @@ kind: Method @@ -3,10 +3,14 @@ kind: Method
3 metadata: 3 metadata:
4 name: searchProjectOverviewStatistics 4 name: searchProjectOverviewStatistics
5 type: query 5 type: query
6 - description: 返回共创项目概览统计 6 + description: 返回共创企业项目概览统计
7 payload: 7 payload:
8 - ref: companyId 8 - ref: companyId
9 - required: true 9 + description: 企业id，企业和组织二选一
  10 + required: false
  11 + - ref: orgId
  12 + description: 组织id，组织和企业二选一
  13 + required: false
10 - ref: userId 14 - ref: userId
11 required: true 15 required: true
12 result: 16 result:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: appCooperationApplication 4 service: appCooperationApplication
5 - path: /app/cooperation-applications 5 + path: /v1/app/cooperation-applications
6 endpoints: 6 endpoints:
7 - method: createCooperationApplication 7 - method: createCooperationApplication
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: appCooperationProject 4 service: appCooperationProject
5 - path: /app/cooperation-projects 5 + path: /v1/app/cooperation-projects
6 endpoints: 6 endpoints:
7 - method: createCooperationProject 7 - method: createCooperationProject
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: appLoginAccess 4 service: appLoginAccess
5 - path: /app/auth 5 + path: /v1/app/auth
6 endpoints: 6 endpoints:
7 - method: loginByAccount 7 - method: loginByAccount
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: appUsers 4 service: appUsers
5 - path: /app/users 5 + path: /v1/app/users
6 endpoints: 6 endpoints:
7 - method: registCommonUser 7 - method: registCommonUser
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: contractChangeLog 4 service: contractChangeLog
5 - path: /web/contract-change-logs 5 + path: /v1/web/contract-change-logs
6 endpoints: 6 endpoints:
7 - method: listContractChangeLog 7 - method: listContractChangeLog
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: cooperationApplication 4 service: cooperationApplication
5 - path: /web/cooperation-applications 5 + path: /v1/web/cooperation-applications
6 endpoints: 6 endpoints:
7 - method: createCooperationApplication 7 - method: createCooperationApplication
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: cooperationContract 4 service: cooperationContract
5 - path: /web/cooperation-contracts 5 + path: /v1/web/cooperation-contracts
6 endpoints: 6 endpoints:
7 - method: createCooperationContract 7 - method: createCooperationContract
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: cooperationMode 4 service: cooperationMode
5 - path: /web/cooperation-modes 5 + path: /v1/web/cooperation-modes
6 endpoints: 6 endpoints:
7 - method: createCooperationMode 7 - method: createCooperationMode
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: cooperationProject 4 service: cooperationProject
5 - path: /web/cooperation-projects 5 + path: /v1/web/cooperation-projects
6 endpoints: 6 endpoints:
7 - method: createCooperationProject 7 - method: createCooperationProject
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: dividendsEstimate 4 service: dividendsEstimate
5 - path: /web/dividends-estimate 5 + path: /v1/web/dividends-estimate
6 endpoints: 6 endpoints:
7 - method: createDividendsEstimate 7 - method: createDividendsEstimate
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: dividendsOrder 4 service: dividendsOrder
5 - path: /web/dividends-order 5 + path: /v1/web/dividends-order
6 endpoints: 6 endpoints:
7 - method: createDividendsOrder 7 - method: createDividendsOrder
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: dividendsReturnedOrder 4 service: dividendsReturnedOrder
5 - path: /web/dividends-returned-order 5 + path: /v1/web/dividends-returned-order
6 endpoints: 6 endpoints:
7 - method: createDividendsReturnedOrder 7 - method: createDividendsReturnedOrder
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: loginAccess 4 service: loginAccess
5 - path: /web/auth 5 + path: /v1/web/auth
6 endpoints: 6 endpoints:
7 - method: loginByAccount 7 - method: loginByAccount
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: menu 4 service: menu
5 - path: /web/menus 5 + path: /v1/web/menus
6 endpoints: 6 endpoints:
7 - method: menuList 7 - method: menuList
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: noticeSetting 4 service: noticeSetting
5 - path: /web/notice-setting 5 + path: /v1/web/notice-setting
6 endpoints: 6 endpoints:
7 - method: noticeSettingList 7 - method: noticeSettingList
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: orgs 4 service: orgs
5 - path: /web/orgs 5 + path: /v1/web/orgs
6 endpoints: 6 endpoints:
7 - method: orgAdd 7 - method: orgAdd
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: roles 4 service: roles
5 - path: /web/roles 5 + path: /v1/web/roles
6 endpoints: 6 endpoints:
7 - method: roleAdd 7 - method: roleAdd
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: contractUndertakerFeedback 4 service: contractUndertakerFeedback
5 - path: /web/contract-undertaker-feedbacks 5 + path: /v1/web/contract-undertaker-feedbacks
6 endpoints: 6 endpoints:
7 - method: createContractUndertakerFeedback 7 - method: createContractUndertakerFeedback
8 route: 8 route:
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: HttpApi 2 kind: HttpApi
3 metadata: 3 metadata:
4 service: users 4 service: users
5 - path: /web/users 5 + path: /v1/web/users
6 endpoints: 6 endpoints:
7 - method: companyUserAdd 7 - method: companyUserAdd
8 route: 8 route:
@@ -6,8 +6,10 @@ metadata: @@ -6,8 +6,10 @@ metadata:
6 attributes: 6 attributes:
7 - ref: contractUndertaker 7 - ref: contractUndertaker
8 required: true 8 required: true
9 - - ref: feedbackAttachment  
10 - required: true 9 + - name: feedbackAttachment
  10 + description: 附件
  11 + type:
  12 + array: attachment
11 - ref: feedbackContent 13 - ref: feedbackContent
12 required: true 14 required: true
13 - ref: feedbackId 15 - ref: feedbackId
@@ -22,7 +22,3 @@ metadata: @@ -22,7 +22,3 @@ metadata:
22 required: true 22 required: true
23 - ref: cooperationApplyTime 23 - ref: cooperationApplyTime
24 required: true 24 required: true
25 - - ref: cooperationProjectId  
26 - required: true  
27 - - ref: cooperationProjectNumber  
28 - required: true  
@@ -22,10 +22,10 @@ metadata: @@ -22,10 +22,10 @@ metadata:
22 - ref: cooperationContractNumber 22 - ref: cooperationContractNumber
23 required: true 23 required: true
24 - name: participator 24 - name: participator
25 - description: 参与人uid，包括承接人、推荐人、关联业务员 25 + description: 参与人
26 required: true 26 required: true
27 type: 27 type:
28 - array: int64 28 + schema: usersBase
29 - ref: paymentDocumentAttachment 29 - ref: paymentDocumentAttachment
30 description: 支付凭证附件 30 description: 支付凭证附件
31 required: true 31 required: true
@@ -33,8 +33,6 @@ metadata: @@ -33,8 +33,6 @@ metadata:
33 description: 数据关联组织机构 33 description: 数据关联组织机构
34 type: 34 type:
35 schema: orgs 35 schema: orgs
36 - - ref: companyId  
37 - required: true  
38 - ref: operator 36 - ref: operator
39 required: true 37 required: true
40 - ref: operateTime 38 - ref: operateTime
@@ -4,16 +4,12 @@ metadata: @@ -4,16 +4,12 @@ metadata:
4 name: users 4 name: users
5 description: 用户基础信息 5 description: 用户基础信息
6 attributes: 6 attributes:
7 - - ref: phone  
8 - required: true  
9 - - ref: status  
10 - required: true  
11 - - ref: usersCode  
12 - required: true  
13 - - ref: usersId  
14 - required: true  
15 - - ref: usersName  
16 - required: true 7 + - name: userId
  8 + description: 用户id
  9 + - name: userInfo
  10 + description: 用户基础信息
  11 + type:
  12 + schema: usersBase
17 - name: org 13 - name: org
18 description: 用户的组织 14 description: 用户的组织
19 type: 15 type:
@@ -22,9 +18,3 @@ metadata: @@ -22,9 +18,3 @@ metadata:
22 description: 用户的部门 18 description: 用户的部门
23 type: 19 type:
24 schema: department 20 schema: department
25 - - ref: email  
26 - required: true  
27 - - ref: cooperationCompany  
28 - required: true  
29 - - ref: cooperationDeadline  
30 - required: true