Merge branch 'dev'

@@ -4,4 +4,4 @@ metadata:
   name: annualDividendsExpense
   description: 分红支出-年度分红支出
   type: 
-    primitive: float64
+    schema: annualDividendsExpense

 version: v1
 kind: Attribute
 metadata:
-  name: dividendsExpenseDetails
+  name: dividendsExpenseDetail
   description: 企业分红支出明细
   type: 
-    schema: dividendsExpenseDetails
+    schema: dividendsExpenseDetail

@@ -4,4 +4,4 @@ metadata:
   name: quarterDividendsExpense
   description: 分红支出-季度分红支出
   type: 
-    primitive: float64
+    schema: quarterDividendsExpense

@@ -4,4 +4,4 @@ metadata:
   name: totalDividendsExpense
   description: 合约分红-全部分红支出
   type: 
-    primitive: float64
+    schema: totalDividendsExpense

+version: v1
+kind: Attribute
+metadata:
+  name: totalExpense
+  description: 总支出
+  type: 
+    primitive: float64

+version: v1
+kind: Attribute
+metadata:
+  name: code
+  description: 菜单编码
+  type: 
+    primitive: string

+version: v1
+kind: Schema
+metadata:
+  name: annualDividendsExpense
+  description: 企业年度分红总支出
+  attributes:
+  - ref: totalExpense
+    required: true
+  - ref: dividendsExpenseDetail
+    required: true

@@ -23,6 +23,7 @@ metadata:
   - ref: cooperationApplyTime
     required: true
   - ref: cooperationProjectNumber
+    description: 共创项目编号
     required: true
   - ref: org
     description: 数据所属组织机构

@@ -11,6 +11,7 @@ metadata:
   - ref: cooperationContractName
     required: true
   - ref: cooperationContractNumber
+    description: 共创合约编号
     required: true
   - ref: cooperationContractReferrer
     required: true
@@ -21,6 +22,7 @@ metadata:
   - ref: cooperationContractSponsor
     required: true
   - ref: cooperationMode
+    description: 共创模式或者合伙模式
     required: true
   - ref: status
     description: 合约状态，1启用，2禁用

@@ -7,7 +7,7 @@ metadata:
   - ref: cooperationModeId
     required: true
   - ref: cooperationModeNumber
-    description: 模式编码，唯一确定
+    description: 共创模式编码，唯一确定
     required: true
   - ref: cooperationModeName
     description: 模式名称，唯一确定

 version: v1
 kind: Schema
 metadata:
-  name: dividendsExpenseDetails
+  name: dividendsExpenseDetail
   description: 企业分红支出明细
   attributes:
   - ref: toBeAccounted

+version: v1
+kind: Schema
+metadata:
+  name: dividendsExpenseStatistics
+  description: 企业分红支出统计
+  attributes:
+  - ref: annualDividendsExpense
+    required: true
+  - ref: quarterDividendsExpense
+    required: true
+  - ref: totalDividendsExpense
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: quarterDividendsExpense
+  description: 企业季度分红支出
+  attributes:
+  - ref: totalExpense
+    required: true
+  - ref: dividendsExpenseDetail
+    required: true

+version: v1
+kind: Schema
+metadata:
+  name: totalDividendsExpense
+  description: 企业分红总支出
+  attributes:
+  - ref: totalExpense
+    required: true
+  - ref: dividendsExpenseDetail
+    required: true

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -16,6 +16,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   - name: matchWord

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -3,7 +3,7 @@ kind: Method
 metadata:
   name: agreeCooperationApplication
   type: command
-  description: 同意共创申请
+  description: 审核-同意共创申请
   payload:
   - ref: cooperationApplicationId
     required: true
@@ -11,6 +11,12 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    description: 组织机构id
+    required: true
+  - ref: code 
+    description: 菜单编码，APP端必须
+    required: true
   - ref: userId
     required: true
   result:

@@ -19,6 +19,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -19,6 +19,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -3,7 +3,7 @@ kind: Method
 metadata:
   name: rejectCooperationApplication
   type: command
-  description: 拒绝共创申请
+  description: 审核-拒绝共创申请
   payload:
   - ref: cooperationApplicationId
     required: true
@@ -11,6 +11,12 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    description: 组织机构id
+    required: true
+  - ref: code
+    description: 菜单模块编码，APP端必须
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -20,6 +20,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -19,6 +19,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -42,6 +42,8 @@ metadata:
       array: relevant
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -14,6 +14,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -25,6 +25,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -15,6 +15,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -24,6 +24,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -18,6 +18,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -24,6 +24,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   - name: period

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -18,6 +18,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -13,6 +13,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

+version: v1
+kind: Method
+metadata:
+  name: searchDividendsExpenseStatistics
+  type: query
+  description: 返回企业分红支出统计
+  payload:
+  - ref: companyId
+    required: true
+  - ref: orgId
+    required: true
+  - ref: userId
+    required: true
+  result:
+  - name: dividendsExpenseStatistics
+    type: 
+      schema: dividendsExpenseStatistics
+    required: true

+version: v1
+kind: Service
+metadata:
+  name: dividendsExpenseStatistics
+  description: 企业分红支出统计服务

@@ -21,6 +21,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -21,6 +21,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -31,6 +31,8 @@ metadata:
       array: orderGoods
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -15,6 +15,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -27,6 +27,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -25,6 +25,8 @@ metadata:
       array: orderGoods
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -15,6 +15,8 @@ metadata:
       primitive: string
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -7,6 +7,8 @@ metadata:
   payload:
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: false
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -25,6 +25,8 @@ metadata:
       array: orderGoods
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -11,6 +11,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -9,6 +9,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result:

@@ -17,6 +17,8 @@ metadata:
     required: true
   - ref: companyId
     required: true
+  - ref: orgId
+    required: true
   - ref: userId
     required: true
   result: