Переглянути джерело

1.修复查询款项信息报错
2.新增资产-提成申报相关流程基础信息

GouGengquan 1 рік тому
батько
коміт
a1c222cce8

+ 1 - 0
dao/src/main/resources/mapper/AssetsMapper.xml

@@ -621,6 +621,7 @@
                  LEFT JOIN finance_invoice ON finance_invoice.order_fund_id = order_fund.id
         WHERE order_fund.business_id = #{id}
           AND order_fund.deleted = 0
+          AND business_type = 'ASSET_BUSINESS'
     </select>
 
     <!--根据业务类型与取号类型获取业务取号信息-->

+ 6 - 0
domain/src/main/java/com/dayou/enums/MainBusinessEnum.java

@@ -20,9 +20,15 @@ public enum MainBusinessEnum implements CodeMsgEnumInterface<String,String> {
     COMMISSION_DECLARE_MAJOR_MARKET("COMMISSION_DECLARE_MAJOR_MARKET","大中型-提成申报-市场人员"),
 
     COMMISSION_DECLARE_MAJOR_EVALUATE("COMMISSION_DECLARE_MAJOR_EVALUATE","大中型-提成申报-评估人员"),
+
+    COMMISSION_DECLARE_ASSET_MARKET("COMMISSION_DECLARE_MAJOR_MARKET","资产-提成申报-市场人员"),
+
+    COMMISSION_DECLARE_ASSET_EVALUATE("COMMISSION_DECLARE_MAJOR_EVALUATE","资产-提成申报-评估人员"),
+
     FINANCE_MANAGEMENT("FINANCE_MANAGEMENT","财务管理"),
 
     SETTING_MANAGEMENT("SETTING_MANAGEMENT","综合设置"),
+
     ALL_BUSINESS("ALL_BUSINESS","全局业务"),
     ;
 

+ 2 - 0
domain/src/main/java/com/dayou/enums/workflow/WorkflowNodeEnum.java

@@ -74,6 +74,8 @@ public enum WorkflowNodeEnum implements CodeMsgEnumInterface<String,String>{
 
         TOP_MANAGER_CHECK("总经理审批","TOP_MANAGER_CHECK"),
 
+        GROUP_LEADER_CHECK("组长审批", "GROUP_LEADER_CHECK");
+
         ;