fubin 1 yıl önce
ebeveyn
işleme
43ba4de37d

+ 8 - 36
src/main/java/com/dk/mdm/mapper/mst/MoneyAccountItemMapper.xml

@@ -5,7 +5,7 @@
     <!-- 通用设置 -->
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
-        item_id, mac_id, flow_type, invoice_id, amt_inflow, acc_date, remarks, make_staff, make_time, flg_valid, cp_id, op_create_time, op_create_user_id, op_update_time, op_update_user_id, op_app_code, op_timestamp, op_db_user
+        item_id, mac_id, flow_type, invoice_id, amt_inflow, acc_date, remarks, make_staff, make_time, flg_valid, cp_id
     </sql>
 
     <!-- 通用查询映射结果 -->
@@ -21,13 +21,6 @@
                 <result column="make_time" property="makeTime" typeHandler="TimestampTypeHandler"/>
                 <result column="flg_valid" property="flgValid"/>
                 <result column="cp_id" property="cpId"/>
-                <result column="op_create_time" property="opCreateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_create_user_id" property="opCreateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_update_time" property="opUpdateTime" typeHandler="TimestampTypeHandler"/>
-                <result column="op_update_user_id" property="opUpdateUserId" typeHandler="UuidTypeHandler"/>
-                <result column="op_app_code" property="opAppCode"/>
-                <result column="op_timestamp" property="opTimestamp" typeHandler="TimestampTypeHandler"/>
-                <result column="op_db_user" property="opDbUser"/>
     </resultMap>
 
     <!-- 通用条件列 -->
@@ -63,27 +56,6 @@
             <if test="cpId != null">
                 AND cp_id = #{cpId}
             </if>
-            <if test="opCreateTime != null">
-                AND op_create_time = #{opCreateTime}
-            </if>
-            <if test="opCreateUserId != null and opCreateUserId != ''">
-                AND op_create_user_id = #{opCreateUserId}
-            </if>
-            <if test="opUpdateTime != null">
-                AND op_update_time = #{opUpdateTime}
-            </if>
-            <if test="opUpdateUserId != null and opUpdateUserId != ''">
-                AND op_update_user_id = #{opUpdateUserId}
-            </if>
-            <if test="opAppCode != null and opAppCode != ''">
-                AND op_app_code = #{opAppCode}
-            </if>
-            <if test="opTimestamp != null">
-                AND op_timestamp = #{opTimestamp}
-            </if>
-            <if test="opDbUser != null and opDbUser != ''">
-                AND op_db_user = #{opDbUser}
-            </if>
         </where>
     </sql>
 
@@ -99,7 +71,7 @@
     <select id="selectByCond" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         <include refid="Condition"/>
         <if test="pageSize != null and currentPage != null and pageSize != 0 and currentPage != 0">
             limit #{end} offset #{start}
@@ -110,7 +82,7 @@
     <select id="countByCond" resultType="Long">
         SELECT
         count(1)
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         <include refid="Condition"/>
     </select>
 
@@ -118,7 +90,7 @@
     <select id="selectById" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         WHERE item_id = #{id}::uuid
     </select>
 
@@ -126,7 +98,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         WHERE item_id = #{id}::uuid
         for update
     </select>
@@ -135,7 +107,7 @@
     <select id="selectByInvoiceIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         WHERE invoice_id = #{id}::uuid
         for update
     </select>
@@ -144,13 +116,13 @@
     <select id="selectByIdsForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account_item
+        FROM dkic_b.t_mst_money_account_item
         <include refid="idsForeach"/>
         for update
     </select>
 
     <insert id="insertBatch">
-        insert into t_mst_money_account_item
+        insert into dkic_b.t_mst_money_account_item
         (
         <trim suffixOverrides=",">
             mac_id,

+ 1 - 1
src/main/java/com/dk/mdm/mapper/mst/MoneyAccountMapper.xml

@@ -226,7 +226,7 @@
     <select id="selectByIdForUpdate" resultMap="BaseResultMap">
         SELECT
         <include refid="Base_Column_List"/>
-        FROM t_mst_money_account
+        FROM dkic_b.t_mst_money_account
         WHERE mac_id = #{id}::uuid
         for update
     </select>

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/Account.java

@@ -30,7 +30,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("账款对象")
-@TableName(value = "t_mac_account", autoResultMap = true)
+@TableName(value = "t_mac_account", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:账款对象", description="表名:t_mac_account")
 public class Account extends PageInfo<Account> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/AccountItem.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("账务明细")
-@TableName(value = "t_mac_account_item", autoResultMap = true)
+@TableName(value = "t_mac_account_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:账务明细", description="表名:t_mac_account_item")
 public class AccountItem extends PageInfo<AccountItem> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/MacTransfer.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金转账")
-@TableName(value = "t_mac_transfer", autoResultMap = true)
+@TableName(value = "t_mac_transfer", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:资金转账", description="表名:t_mac_transfer")
 public class MacTransfer extends PageInfo<MacTransfer> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/MacTransferItem.java

@@ -28,7 +28,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金转账明细")
-@TableName(value = "t_mac_transfer_item", autoResultMap = true)
+@TableName(value = "t_mac_transfer_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:资金转账明细", description="表名:t_mac_transfer_item")
 public class MacTransferItem extends PageInfo<MacTransferItem> implements Serializable {
 

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

@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他支出单")
-@TableName(value = "t_mac_other_payable", autoResultMap = true)
+@TableName(value = "t_mac_other_payable", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:其他支出单", description="表名:t_mac_other_payable")
 public class OtherPayable extends PageInfo<OtherPayable> implements Serializable {
 

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

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他支出明细")
-@TableName(value = "t_mac_other_payable_item", autoResultMap = true)
+@TableName(value = "t_mac_other_payable_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:其他支出明细", description="表名:t_mac_other_payable_item")
 public class OtherPayableItem extends PageInfo<OtherPayableItem> implements Serializable {
 

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

@@ -31,7 +31,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他收入单")
-@TableName(value = "t_mac_other_receivable", autoResultMap = true)
+@TableName(value = "t_mac_other_receivable", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:其他收入单", description="表名:t_mac_other_receivable")
 public class OtherReceivable extends PageInfo<OtherReceivable> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/OtherReceivableItem.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("其他收入明细")
-@TableName(value = "t_mac_other_receivable_item", autoResultMap = true)
+@TableName(value = "t_mac_other_receivable_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:其他收入明细", description="表名:t_mac_other_receivable_item")
 public class OtherReceivableItem extends PageInfo<OtherReceivableItem> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/RecPay.java

@@ -32,7 +32,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("收付款单")
-@TableName(value = "t_mac_rec_pay", autoResultMap = true)
+@TableName(value = "t_mac_rec_pay", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:收付款单", description="表名:t_mac_rec_pay")
 public class RecPay extends PageInfo<RecPay> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/RecPayHandleItem.java

@@ -28,7 +28,7 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("账务冲抵明细")
-@TableName(value = "t_mac_rec_pay_handle_item", autoResultMap = true)
+@TableName(value = "t_mac_rec_pay_handle_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:账务冲抵明细", description="表名:t_mac_rec_pay_handle_item")
 public class RecPayHandleItem extends PageInfo<RecPayHandleItem> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mac/RecPayItem.java

@@ -31,7 +31,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("收付款单明细")
-@TableName(value = "t_mac_rec_pay_item", autoResultMap = true)
+@TableName(value = "t_mac_rec_pay_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:收付款单明细", description="表名:t_mac_rec_pay_item")
 public class RecPayItem extends PageInfo<RecPayItem> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/mst/MoneyAccount.java

@@ -29,7 +29,7 @@ import java.time.LocalDate;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金账户")
-@TableName(value = "t_mst_money_account", autoResultMap = true)
+@TableName(value = "t_mst_money_account", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:资金账户", description="表名:t_mst_money_account")
 public class MoneyAccount extends PageInfo<MoneyAccount> implements Serializable {
 

+ 1 - 64
src/main/java/com/dk/mdm/model/pojo/mst/MoneyAccountItem.java

@@ -29,7 +29,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("资金流水明细")
-@TableName(value = "t_mst_money_account_item", autoResultMap = true)
+@TableName(value = "t_mst_money_account_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:资金流水明细", description="表名:t_mst_money_account_item")
 public class MoneyAccountItem extends PageInfo<MoneyAccountItem> implements Serializable {
 
@@ -134,69 +134,6 @@ public class MoneyAccountItem extends PageInfo<MoneyAccountItem> implements Seri
     private Integer cpId;
 
 
-    /**
-     * 创建时间 (触发器自动处理)
-     */
-    @Excel(name = "创建时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "创建时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opCreateTime;
-
-
-    /**
-     * 创建用户 (触发器自动处理)
-     */
-    @Excel(name = "创建用户 (触发器自动处理)")
-    @ApiModelProperty(value = "创建用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opCreateUserId;
-
-
-    /**
-     * 修改时间 (触发器自动处理)
-     */
-    @Excel(name = "修改时间 (触发器自动处理)", format = "yyyy-MM-dd HH:mm:ss", width = 20)
-    @ApiModelProperty(value = "修改时间 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opUpdateTime;
-
-
-    /**
-     * 修改用户 (触发器自动处理)
-     */
-    @Excel(name = "修改用户 (触发器自动处理)")
-    @ApiModelProperty(value = "修改用户 (触发器自动处理)")
-    @TableField(typeHandler = UuidTypeHandler.class)
-    private String opUpdateUserId;
-
-
-    /**
-     * 数据操作应用 (触发器自动处理)
-     */
-    @Excel(name = "数据操作应用 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作应用 (触发器自动处理)")
-    private String opAppCode;
-
-
-    /**
-     * 数据时间戳 (触发器自动处理)
-     */
-    @Excel(name = "数据时间戳 (触发器自动处理)")
-    @ApiModelProperty(value = "数据时间戳 (触发器自动处理)")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    @TableField(typeHandler = TimestampTypeHandler.class)
-    private LocalDateTime opTimestamp;
-
-
-    /**
-     * 数据操作数据库用户 (触发器自动处理)
-     */
-    @Excel(name = "数据操作数据库用户 (触发器自动处理)")
-    @ApiModelProperty(value = "数据操作数据库用户 (触发器自动处理)")
-    private String opDbUser;
-
 
     private static final long serialVersionUID = 1L;
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/sale/MultiOwner.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("多业务归属")
-@TableName(value = "t_psi_multi_owner", autoResultMap = true)
+@TableName(value = "t_psi_multi_owner", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:多业务归属", description="表名:t_psi_multi_owner")
 public class MultiOwner extends PageInfo<MultiOwner> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/sale/Order.java

@@ -31,7 +31,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("销售订单")
-@TableName(value = "t_psi_order", autoResultMap = true)
+@TableName(value = "t_psi_order", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:销售订单", description="表名:t_psi_order")
 public class Order extends PageInfo<Order> implements Serializable {
 

+ 1 - 1
src/main/java/com/dk/mdm/model/pojo/sale/OrderItem.java

@@ -30,7 +30,7 @@ import java.time.LocalDateTime;
 @EqualsAndHashCode(callSuper = true)
 @Accessors(chain = true)
 @ExportTitle("销售明细")
-@TableName(value = "t_psi_order_item", autoResultMap = true)
+@TableName(value = "t_psi_order_item", autoResultMap = true, schema = "dkic_b")
 @ApiModel(value="实体类:销售明细", description="表名:t_psi_order_item")
 public class OrderItem extends PageInfo<OrderItem> implements Serializable {