allied-creation / document · 提交

转到一个项目

作者 陈志颖
提交 2b1eff5717684c3989a62f822dedbbb9966c5014 2 个父辈 b96c5ff4 9556aa60

Merge branch 'dev'

内嵌 并排对比
正在显示 58 个修改的文件 包含 309 行增加 和 46 行删除
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsExpense
  5 + description: 分红支出
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsExpenseByTypes
  5 + description: 具体分红类型支出
  6 + type:
  7 + array: dividendsExpenseByType
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsExpenseByType
  5 + description: 具体分红类型支出
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsTypeName
  5 + description: 分红类型名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderAmount
  5 + description: 具体成交类型的订单金额
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderTypeName
  5 + description: 成交订单类型名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderAmount
  5 + description: 成交订单金额
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderAmountByTypes
  5 + description: 具体订单类型的金额明细
  6 + type:
  7 + array: orderAmountByType
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: organizationId 4 + name: orgId
5 description: 组织机构ID 5 description: 组织机构ID
6 type: 6 type:
7 primitive: int64 7 primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orgName
  5 + description: 组织名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: code
  5 + description: 返回码
  6 + type:
  7 + primitive: int32
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: msg
  5 + description: 返回信息
  6 + type:
  7 + primitive: int32
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: goodAmount
  5 + description: 共创产品总金额统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: goodName
  5 + description: 共创产品名称
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: goodRatio
  5 + description: 共创产品在TOP5中的占比统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: rank
  5 + description: 共创产品TOP5排名
  6 + type:
  7 + primitive: int32
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: cooperationPeople
  5 + description: 共创人数统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsEstimate
  5 + description: 分红预算统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderAmount
  5 + description: 订单金额统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: cooperationTime
  5 + description: 共创时间
  6 + type:
  7 + primitive: datetime
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: cooperationTypes
  5 + description: 合伙类型，即共创模式
  6 + type:
  7 + array: cooperationMode
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsDetails
  5 + description: 分红明细
  6 + type:
  7 + schema: dividendsDetails
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderDetails
  5 + description: 订单明细
  6 + type:
  7 + schema: orderDetails
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: userName
  5 + description: 共创人员姓名
  6 + type:
  7 + primitive: string
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: creditAccount
  5 + description: 本月账期结算统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: dividendsEstimate
  5 + description: 本月分红预算统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: orderAmount
  5 + description: 本月订单金额统计
  6 + type:
  7 + primitive: float64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: contractSum
  5 + description: 共创合约总数统计
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: cooperationUserCount
  5 + description: 共创用户数统计
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: projectSum
  5 + description: 共创项目总数统计
  6 + type:
  7 + primitive: int64
  1 +version: v1
  2 +kind: Attribute
  3 +metadata:
  4 + name: projectOverview
  5 + description: 项目概览
  6 + type:
  7 + schema: projectOverview
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: organization 4 + name: org
5 description: 用户所属组织机构 5 description: 用户所属组织机构
6 type: 6 type:
7 - schema: organization 7 + schema: org
1 version: v1 1 version: v1
2 kind: Attribute 2 kind: Attribute
3 metadata: 3 metadata:
4 - name: organizations 4 + name: orgs
5 description: 关联的组织机构 5 description: 关联的组织机构
6 type: 6 type:
7 - array: organization 7 + array: org
@@ -16,8 +16,8 @@ metadata: @@ -16,8 +16,8 @@ metadata:
16 required: true 16 required: true
17 - ref: cooperationMode 17 - ref: cooperationMode
18 required: true 18 required: true
19 - - ref: organization  
20 - description: 数据关联组织机构 19 + - ref: org
  20 + description: 数据所属组织机构
21 required: true 21 required: true
22 - ref: companyId 22 - ref: companyId
23 required: true 23 required: true
@@ -24,8 +24,8 @@ metadata: @@ -24,8 +24,8 @@ metadata:
24 required: true 24 required: true
25 - ref: cooperationProjectNumber 25 - ref: cooperationProjectNumber
26 required: true 26 required: true
27 - - ref: organization  
28 - description: 数据关联组织机构 27 + - ref: org
  28 + description: 数据所属组织机构
29 required: true 29 required: true
30 - ref: companyId 30 - ref: companyId
31 required: true 31 required: true
@@ -25,8 +25,8 @@ metadata: @@ -25,8 +25,8 @@ metadata:
25 - ref: status 25 - ref: status
26 description: 合约状态，1启用，2禁用 26 description: 合约状态，1启用，2禁用
27 required: true 27 required: true
28 - - ref: organization  
29 - description: 数据关联组织机构 28 + - ref: org
  29 + description: 数据所属组织机构
30 required: true 30 required: true
31 - ref: companyId 31 - ref: companyId
32 required: true 32 required: true
@@ -15,8 +15,8 @@ metadata: @@ -15,8 +15,8 @@ metadata:
15 - ref: status 15 - ref: status
16 description: 共创模式状态，1启用，2禁用 16 description: 共创模式状态，1启用，2禁用
17 required: true 17 required: true
18 - - ref: organization  
19 - description: 数据关联组织机构 18 + - ref: org
  19 + description: 数据所属组织机构
20 required: true 20 required: true
21 - ref: companyId 21 - ref: companyId
22 required: true 22 required: true
@@ -21,8 +21,8 @@ metadata: @@ -21,8 +21,8 @@ metadata:
21 required: true 21 required: true
22 - ref: cooperationProjectUndertakerType 22 - ref: cooperationProjectUndertakerType
23 required: true 23 required: true
24 - - ref: organization  
25 - description: 数据关联组织机构 24 + - ref: org
  25 + description: 数据所属组织机构
26 required: true 26 required: true
27 - ref: companyId 27 - ref: companyId
28 required: true 28 required: true
@@ -29,8 +29,8 @@ metadata: @@ -29,8 +29,8 @@ metadata:
29 - ref: paymentDocumentAttachment 29 - ref: paymentDocumentAttachment
30 description: 支付凭证附件 30 description: 支付凭证附件
31 required: true 31 required: true
32 - - ref: organization  
33 - description: 数据关联组织机构 32 + - ref: org
  33 + description: 数据所属组织机构
34 required: true 34 required: true
35 - ref: companyId 35 - ref: companyId
36 required: true 36 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dividendsDetails
  5 + description: 分红明细
  6 + attributes:
  7 + - ref: dividendsExpense
  8 + required: true
  9 + - ref: dividendsExpenseByTypes
  10 + required: true
@@ -25,8 +25,8 @@ metadata: @@ -25,8 +25,8 @@ metadata:
25 required: true 25 required: true
26 - ref: dividendsUser 26 - ref: dividendsUser
27 required: true 27 required: true
28 - - ref: organization  
29 - description: 数据关联组织机构 28 + - ref: org
  29 + description: 数据所属组织机构
30 required: true 30 required: true
31 - ref: companyId 31 - ref: companyId
32 required: true 32 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: dividendsExpenseByType
  5 + description: 具体分红类型支出
  6 + attributes:
  7 + - ref: dividendsExpenseByType
  8 + required: true
  9 + - ref: dividendsTypeName
  10 + required: true
@@ -21,8 +21,8 @@ metadata: @@ -21,8 +21,8 @@ metadata:
21 required: true 21 required: true
22 - ref: dividendsIncentivesStageStart 22 - ref: dividendsIncentivesStageStart
23 required: true 23 required: true
24 - - ref: organization  
25 - description: 数据关联组织机构 24 + - ref: org
  25 + description: 数据所属组织机构
26 required: true 26 required: true
27 - ref: companyId 27 - ref: companyId
28 required: true 28 required: true
@@ -25,8 +25,8 @@ metadata: @@ -25,8 +25,8 @@ metadata:
25 - ref: customerName 25 - ref: customerName
26 description: 客户姓名 26 description: 客户姓名
27 required: true 27 required: true
28 - - ref: organization  
29 - description: 数据关联组织机构 28 + - ref: org
  29 + description: 数据所属组织机构
30 required: true 30 required: true
31 - ref: companyId 31 - ref: companyId
32 required: true 32 required: true
@@ -32,8 +32,8 @@ metadata: @@ -32,8 +32,8 @@ metadata:
32 required: true 32 required: true
33 - ref: dividendTime 33 - ref: dividendTime
34 required: true 34 required: true
35 - - ref: organization  
36 - description: 数据关联组织机构 35 + - ref: org
  36 + description: 数据所属组织机构
37 required: true 37 required: true
38 - ref: companyId 38 - ref: companyId
39 required: true 39 required: true
@@ -23,8 +23,8 @@ metadata: @@ -23,8 +23,8 @@ metadata:
23 required: true 23 required: true
24 - ref: salesmanPercentage 24 - ref: salesmanPercentage
25 required: true 25 required: true
26 - - ref: organization  
27 - description: 数据关联组织机构 26 + - ref: org
  27 + description: 数据所属组织机构
28 required: true 28 required: true
29 - ref: companyId 29 - ref: companyId
30 required: true 30 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: orderAmountByType
  5 + description: 具体成交类型的订单明细
  6 + attributes:
  7 + - ref: orderAmount
  8 + required: true
  9 + - ref: orderTypeName
  10 + required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: orderDetails
  5 + description: 订单明细
  6 + attributes:
  7 + - ref: orderAmount
  8 + required: true
  9 + - ref: orderAmountByTypes
  10 + required: true
@@ -2,7 +2,7 @@ version: v1 @@ -2,7 +2,7 @@ version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 name: orderGoods 4 name: orderGoods
5 - description: 订单产品对象 5 + description: 订单产品对象DTO
6 attributes: 6 attributes:
7 - ref: orderGoodAmount 7 - ref: orderGoodAmount
8 required: true 8 required: true
@@ -21,9 +21,4 @@ metadata: @@ -21,9 +21,4 @@ metadata:
21 - ref: orderGoodExpense 21 - ref: orderGoodExpense
22 description: 订单产品费用 22 description: 订单产品费用
23 required: true 23 required: true
24 - - ref: createdAt  
25 - required: true  
26 - - ref: deletedAt  
27 - required: true  
28 - - ref: updatedAt  
29 - required: true 24 +
1 version: v1 1 version: v1
2 kind: Schema 2 kind: Schema
3 metadata: 3 metadata:
4 - name: organization 4 + name: org
5 description: 组织机构值对象 5 description: 组织机构值对象
6 attributes: 6 attributes:
7 - - ref: organizationId 7 + - ref: orgId
  8 + required: true
  9 + - ref: orgName
8 required: true 10 required: true
9 - ref: companyId 11 - ref: companyId
10 required: true 12 required: true
  1 +version: v1
  2 +kind: Schema
  3 +metadata:
  4 + name: projectOverview
  5 + description: 项目概览
  6 + attributes:
  7 + - ref: contractSum
  8 + required: true
  9 + - ref: projectSum
  10 + required: true
  11 + - ref: cooperationUserCount
  12 + required: true
@@ -10,10 +10,10 @@ metadata: @@ -10,10 +10,10 @@ metadata:
10 required: true 10 required: true
11 - ref: role 11 - ref: role
12 required: true 12 required: true
13 - - ref: organizations 13 + - ref: orgs
14 description: 用户关联的组织机构 14 description: 用户关联的组织机构
15 required: true 15 required: true
16 - - ref: organization 16 + - ref: org
17 description: 用户所属的组织机构 17 description: 用户所属的组织机构
18 required: true 18 required: true
19 - ref: department 19 - ref: department
@@ -8,10 +8,10 @@ metadata: @@ -8,10 +8,10 @@ metadata:
8 required: true 8 required: true
9 - ref: userBaseId 9 - ref: userBaseId
10 required: true 10 required: true
11 - - ref: organization 11 + - ref: org
12 description: 用户所属的组织机构 12 description: 用户所属的组织机构
13 required: true 13 required: true
14 - - ref: organizations 14 + - ref: orgs
15 description: 用户关联的组织机构 15 description: 用户关联的组织机构
16 required: true 16 required: true
17 - ref: department 17 - ref: department
@@ -10,10 +10,10 @@ metadata: @@ -10,10 +10,10 @@ metadata:
10 required: true 10 required: true
11 - ref: role 11 - ref: role
12 required: true 12 required: true
13 - - ref: organizations 13 + - ref: orgs
14 description: 用户关联的组织机构 14 description: 用户关联的组织机构
15 required: true 15 required: true
16 - - ref: organization 16 + - ref: org
17 description: 用户所属的组织机构 17 description: 用户所属的组织机构
18 required: true 18 required: true
19 - ref: department 19 - ref: department
@@ -8,10 +8,10 @@ metadata: @@ -8,10 +8,10 @@ metadata:
8 required: true 8 required: true
9 - ref: userBaseId 9 - ref: userBaseId
10 required: true 10 required: true
11 - - ref: organization 11 + - ref: org
12 description: 用户所属组织机构 12 description: 用户所属组织机构
13 required: true 13 required: true
14 - - ref: organizations 14 + - ref: orgs
15 description: 用户关联的组织机构 15 description: 用户关联的组织机构
16 required: true 16 required: true
17 - ref: department 17 - ref: department
@@ -8,10 +8,10 @@ metadata: @@ -8,10 +8,10 @@ metadata:
8 required: true 8 required: true
9 - ref: userBaseId 9 - ref: userBaseId
10 required: true 10 required: true
11 - - ref: organization 11 + - ref: org
12 description: 用户所属组织机构 12 description: 用户所属组织机构
13 required: true 13 required: true
14 - - ref: organizations 14 + - ref: orgs
15 description: 用户关联的组织机构 15 description: 用户关联的组织机构
16 required: true 16 required: true
17 - ref: department 17 - ref: department
@@ -13,4 +13,5 @@ metadata: @@ -13,4 +13,5 @@ metadata:
13 - ref: userPhone 13 - ref: userPhone
14 required: true 14 required: true
15 - ref: userAccount 15 - ref: userAccount
  16 + description: 用户账号，区别于手机号，冗余字段
16 required: true 17 required: true
@@ -11,6 +11,9 @@ metadata: @@ -11,6 +11,9 @@ metadata:
11 description: 申请人姓名 11 description: 申请人姓名
12 type: 12 type:
13 primitive: string 13 primitive: string
  14 + - ref: cooperationApplicationStatus
  15 + description: 共创申请审核状态，1待审核，2已同意，3已拒绝
  16 + required: false
14 - ref: pageSize 17 - ref: pageSize
15 required: false 18 required: false
16 - ref: pageNumber 19 - ref: pageNumber