其他收入、支出，加是否为业务单据字段

src/main/java/com/dk/mdm/mapper/mac/OtherPayableMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        payable_id, payable_no, object_type, object_id, org_id, staff_id, sum_amt_payable, acc_item_id, acc_date, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id
+        payable_id, payable_no, object_type, business_type, object_id, org_id, staff_id, sum_amt_payable, acc_item_id, acc_date, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -13,6 +13,7 @@
         <id column="payable_id" property="payableId"/>
             <result column="payable_no" property="payableNo"/>
             <result column="object_type" property="objectType"/>
+            <result column="business_type" property="businessType"/>
             <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
             <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
             <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
@@ -32,6 +33,7 @@
         <id column="payable_id" property="payableId"/>
             <result column="payable_no" property="payableNo"/>
             <result column="object_type" property="objectType"/>
+            <result column="business_type" property="businessType"/>
             <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
             <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
             <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
@@ -56,6 +58,9 @@
             <if test="objectType != null and objectType != ''">
                 AND t.object_type = #{objectType}
             </if>
+            <if test="businessType != null and businessType != ''">
+                AND t.business_type = #{businessType}
+            </if>
             <if test="objectId != null and objectId != ''">
                 AND t.object_id = #{objectId}
             </if>
@@ -122,6 +127,7 @@
         SELECT t.payable_id,
                t.payable_no,
                t.object_type,
+               t.business_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "objectTypeName",
                t.object_id,
                supplier.sup_code    as "supCode",
@@ -171,6 +177,7 @@
         SELECT t.payable_id,
                t.payable_no,
                t.object_type,
+               t.business_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "objectTypeName",
                t.object_id,
                supplier.sup_code    as "supCode",
@@ -223,6 +230,7 @@
         <trim suffixOverrides=",">
             payable_no,
             object_type,
+            business_type,
             object_id,
             org_id,
             staff_id,
@@ -243,6 +251,7 @@
             <trim suffixOverrides=",">
                 #{item.payableNo},
                 #{item.objectType},
+                #{item.businessType},
                 #{item.objectId}::uuid,
                 #{item.orgId}::uuid,
                 #{item.staffId}::uuid,

src/main/java/com/dk/mdm/mapper/mac/OtherReceivableMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        receivable_id, receivable_no, object_type, object_id, org_id, staff_id, sum_amt_receivable, acc_item_id, acc_date, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id
+        receivable_id, receivable_no, object_type, business_type, object_id, org_id, staff_id, sum_amt_receivable, acc_item_id, acc_date, remarks, annex_paths, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -13,6 +13,7 @@
         <id column="receivable_id" property="receivableId"/>
             <result column="receivable_no" property="receivableNo"/>
             <result column="object_type" property="objectType"/>
+            <result column="business_type" property="businessType"/>
             <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
             <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
             <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
@@ -32,6 +33,7 @@
         <id column="receivable_id" property="receivableId"/>
             <result column="receivable_no" property="receivableNo"/>
             <result column="object_type" property="objectType"/>
+            <result column="business_type" property="businessType"/>
             <result column="object_id" property="objectId" typeHandler="UuidTypeHandler"/>
             <result column="org_id" property="orgId" typeHandler="UuidTypeHandler"/>
             <result column="staff_id" property="staffId" typeHandler="UuidTypeHandler"/>
@@ -56,6 +58,9 @@
             <if test="objectType != null and objectType != ''">
                 AND t.object_type = #{objectType}
             </if>
+            <if test="businessType != null and businessType != ''">
+                AND t.business_type = #{businessType}
+            </if>
             <if test="objectId != null and objectId != ''">
                 AND t.object_id = #{objectId}
             </if>
@@ -125,6 +130,7 @@
         SELECT t.receivable_id,
                t.receivable_no,
                t.object_type,
+               t.business_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "objectTypeName",
                t.object_id,
                tmc.cus_code         as "cusCode",
@@ -177,6 +183,7 @@
         SELECT t.receivable_id,
                t.receivable_no,
                t.object_type,
+               t.business_type,
                sys.f_get_name_i18n(tdk1.kind_name_i18n, #{i18n}) as "objectTypeName",
                t.object_id,
                tmc.cus_id         as "cusId",
@@ -231,6 +238,7 @@
         <trim suffixOverrides=",">
             receivable_no,
             object_type,
+            business_type,
             object_id,
             org_id,
             staff_id,
@@ -250,6 +258,7 @@
             <trim suffixOverrides=",">
                 #{item.receivableNo},
                 #{item.objectType},
+                #{item.businessType},
                 #{item.objectId}::uuid,
                 #{item.orgId}::uuid,
                 #{item.staffId}::uuid,

src/main/java/com/dk/mdm/model/pojo/mac/OtherPayable.java

@@ -66,6 +66,14 @@ public class OtherPayable extends PageInfo<OtherPayable> implements Serializable
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/pojo/mac/OtherReceivable.java

@@ -65,6 +65,14 @@ public class OtherReceivable extends PageInfo<OtherReceivable> implements Serial
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/query/mac/OtherPayableQuery.java

@@ -68,6 +68,14 @@ public class OtherPayableQuery extends PageInfo<OtherPayableQuery> implements Se
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/query/mac/OtherReceivableQuery.java

@@ -68,6 +68,14 @@ public class OtherReceivableQuery extends PageInfo<OtherReceivableQuery> impleme
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/response/mac/OtherPayableResponse.java

@@ -67,6 +67,14 @@ public class OtherPayableResponse extends PageInfo<OtherPayableResponse> impleme
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/response/mac/OtherReceivableResponse.java

@@ -74,6 +74,14 @@ public class OtherReceivableResponse extends PageInfo<OtherReceivableResponse> i
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/vo/mac/OtherPayableVO.java

@@ -68,6 +68,14 @@ public class OtherPayableVO extends PageInfo<OtherPayableVO> implements Serializ
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")

src/main/java/com/dk/mdm/model/vo/mac/OtherReceivableVO.java

@@ -68,6 +68,14 @@ public class OtherReceivableVO extends PageInfo<OtherReceivableVO> implements Se
 
 
     /**
+     * 是否为业务单据 (0：期初 1：业务)
+     */
+    @Excel(name = "是否为业务单据 (0：期初 1：业务)")
+    @ApiModelProperty(value = "是否为业务单据 (0：期初 1：业务)")
+    private Integer businessType;
+
+
+    /**
      * 账务对象ID (账务对象)
      */
     @Excel(name = "账务对象ID (账务对象)")