fubin пре 2 година
родитељ
комит
f9da919956

+ 13 - 13
src/main/java/com/dk/mdm/mapper/mac/OtherPayableItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, payable_id, payable_type, qty_outlay, amt_outlay, remarks, flg_valid, cp_id
+        item_id, payable_id, payable_type, qty_payable, amt_payable, remarks, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -13,8 +13,8 @@
         <id column="item_id" property="itemId"/>
             <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
             <result column="payable_type" property="payableType" typeHandler="UuidTypeHandler"/>
-            <result column="qty_outlay" property="qtyOutlay"/>
-            <result column="amt_outlay" property="amtOutlay"/>
+            <result column="qty_payable" property="qtyPayable"/>
+            <result column="amt_payable" property="amtPayable"/>
             <result column="remarks" property="remarks"/>
             <result column="flg_valid" property="flgValid"/>
             <result column="cp_id" property="cpId"/>
@@ -25,8 +25,8 @@
         <id column="item_id" property="itemId"/>
             <result column="payable_id" property="payableId" typeHandler="UuidTypeHandler"/>
             <result column="payable_type" property="payableType" typeHandler="UuidTypeHandler"/>
-            <result column="qty_outlay" property="qtyOutlay"/>
-            <result column="amt_outlay" property="amtOutlay"/>
+            <result column="qty_payable" property="qtyPayable"/>
+            <result column="amt_payable" property="amtPayable"/>
             <result column="remarks" property="remarks"/>
             <result column="flg_valid" property="flgValid"/>
             <result column="cp_id" property="cpId"/>
@@ -41,11 +41,11 @@
             <if test="payableType != null and payableType != ''">
                 AND t.payable_type = #{payableType}
             </if>
-            <if test="qtyOutlay != null">
-                AND t.qty_outlay = #{qtyOutlay}
+            <if test="qtyPayable != null">
+                AND t.qty_payable = #{qtyPayable}
             </if>
-            <if test="amtOutlay != null">
-                AND t.amt_outlay = #{amtOutlay}
+            <if test="amtPayable != null">
+                AND t.amt_payable = #{amtPayable}
             </if>
             <if test="remarks != null and remarks != ''">
                 AND t.remarks = #{remarks}
@@ -127,8 +127,8 @@
         <trim suffixOverrides=",">
             payable_id,
             payable_type,
-            qty_outlay,
-            amt_outlay,
+            qty_payable,
+            amt_payable,
             remarks,
             cp_id,
             op_app_code,
@@ -140,8 +140,8 @@
             <trim suffixOverrides=",">
                 #{item.payableId}::uuid,
                 #{item.payableType}::uuid,
-                #{item.qtyOutlay},
-                #{item.amtOutlay},
+                #{item.qtyPayable},
+                #{item.amtPayable},
                 #{item.remarks},
                 #{item.cpId},
                 #{item.opAppCode},

+ 2 - 2
src/main/java/com/dk/mdm/model/pojo/mac/OtherPayableItem.java

@@ -70,7 +70,7 @@ public class OtherPayableItem extends PageInfo<OtherPayableItem> implements Seri
      */
     @Excel(name = "支出数量")
     @ApiModelProperty(value = "支出数量")
-    private BigDecimal qtyOutlay;
+    private BigDecimal qtyPayable;
 
 
     /**
@@ -78,7 +78,7 @@ public class OtherPayableItem extends PageInfo<OtherPayableItem> implements Seri
      */
     @Excel(name = "支出金额")
     @ApiModelProperty(value = "支出金额")
-    private BigDecimal amtOutlay;
+    private BigDecimal amtPayable;
 
 
     /**

+ 2 - 2
src/main/java/com/dk/mdm/model/query/mac/OtherPayableItemQuery.java

@@ -65,7 +65,7 @@ public class OtherPayableItemQuery extends PageInfo<OtherPayableItemQuery> imple
      */
     @Excel(name = "支出数量")
     @ApiModelProperty(value = "支出数量")
-    private BigDecimal qtyOutlay;
+    private BigDecimal qtyPayable;
 
 
     /**
@@ -73,7 +73,7 @@ public class OtherPayableItemQuery extends PageInfo<OtherPayableItemQuery> imple
      */
     @Excel(name = "支出金额")
     @ApiModelProperty(value = "支出金额")
-    private BigDecimal amtOutlay;
+    private BigDecimal amtPayable;
 
 
     /**

+ 2 - 2
src/main/java/com/dk/mdm/model/response/mac/OtherPayableItemResponse.java

@@ -65,7 +65,7 @@ public class OtherPayableItemResponse extends PageInfo<OtherPayableItemResponse>
      */
     @Excel(name = "支出数量")
     @ApiModelProperty(value = "支出数量")
-    private BigDecimal qtyOutlay;
+    private BigDecimal qtyPayable;
 
 
     /**
@@ -73,7 +73,7 @@ public class OtherPayableItemResponse extends PageInfo<OtherPayableItemResponse>
      */
     @Excel(name = "支出金额")
     @ApiModelProperty(value = "支出金额")
-    private BigDecimal amtOutlay;
+    private BigDecimal amtPayable;
 
 
     /**

+ 2 - 2
src/main/java/com/dk/mdm/model/vo/mac/OtherPayableItemVO.java

@@ -65,7 +65,7 @@ public class OtherPayableItemVO extends PageInfo<OtherPayableItemVO> implements
      */
     @Excel(name = "支出数量")
     @ApiModelProperty(value = "支出数量")
-    private BigDecimal qtyOutlay;
+    private BigDecimal qtyPayable;
 
 
     /**
@@ -73,7 +73,7 @@ public class OtherPayableItemVO extends PageInfo<OtherPayableItemVO> implements
      */
     @Excel(name = "支出金额")
     @ApiModelProperty(value = "支出金额")
-    private BigDecimal amtOutlay;
+    private BigDecimal amtPayable;
 
 
     /**