From ddaf74466d92dffb9ba8242a071f151f9a7e0e41 Mon Sep 17 00:00:00 2001 From: luqingyang <lqy5492@163.com> Date: 星期二, 31 十月 2023 17:04:35 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-) diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java index 140478d..d56e971 100644 --- a/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java +++ b/consum-model-pojo/src/main/java/com/consum/model/po/LWarehouseFlow_mapper.java @@ -28,6 +28,7 @@ // 涓婚敭 public static final String Id = "id"; // 鏅�氬睘鎬� + public static final String WarehouseType = "warehouse_type"; public static final String WarehouseId = "warehouse_id"; public static final String WarehouseName = "warehouse_name"; public static final String ThisType = "this_type"; @@ -49,6 +50,9 @@ this.setId(lWarehouseFlow.getId()); } //鏅�氬睘鎬� + if (lWarehouseFlow.isset_warehouseType) { + this.setWarehouseType(lWarehouseFlow.getWarehouseType()); + } if (lWarehouseFlow.isset_warehouseId) { this.setWarehouseId(lWarehouseFlow.getWarehouseId()); } @@ -116,6 +120,7 @@ public SqlAndParameters<Map<String, Object>> getInsertSql_() { InsertBuilder ib = new InsertBuilder(this.getTableName_()); ib.set(Id, this.getId()); + ib.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType); ib.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ib.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName); ib.set(ThisType, this.getThisType(), this.isset_thisType); @@ -133,6 +138,7 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_() { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); + ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName); ub.set(ThisType, this.getThisType(), this.isset_thisType); @@ -151,6 +157,7 @@ @Override public SqlAndParameters<Map<String, Object>> getUpdateSql_(String where, Map<String, Object> parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); + ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName); ub.set(ThisType, this.getThisType(), this.isset_thisType); @@ -168,6 +175,7 @@ @Override public SqlAndParameters<Object[]> getUpdateSql_(String where, Object[] parameters) { UpdateBuilder ub = new UpdateBuilder(this.getTableName_()); + ub.set(WarehouseType, this.getWarehouseType(), this.isset_warehouseType); ub.set(WarehouseId, this.getWarehouseId(), this.isset_warehouseId); ub.set(WarehouseName, this.getWarehouseName(), this.isset_warehouseName); ub.set(ThisType, this.getThisType(), this.isset_thisType); @@ -223,7 +231,7 @@ */ @Override public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) { - return new SqlAndParameters<>("select id, warehouse_id, warehouse_name, this_type, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters); + return new SqlAndParameters<>("select id, warehouse_type, warehouse_id, warehouse_name, this_type, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters); } /** @@ -231,7 +239,7 @@ */ @Override public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) { - return new SqlAndParameters<>("select id, warehouse_id, warehouse_name, this_type, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters); + return new SqlAndParameters<>("select id, warehouse_type, warehouse_id, warehouse_name, this_type, business_type, business_form_id, operator_id, operator_name, deal_time from " + this.getTableName_() + " " + where, parameters); } /** @@ -268,6 +276,14 @@ l_warehouse_flow.setId(rs.getLong(columnIndex)); } //鏅�氬睘鎬� + columnIndex = resultSetUtils.findColumn(rs, LWarehouseFlow_mapper.WarehouseType); + if (columnIndex > 0) { + if (rs.getBigDecimal(columnIndex) == null) { + l_warehouse_flow.setWarehouseType(null); + } else { + l_warehouse_flow.setWarehouseType(rs.getInt(columnIndex)); + } + } columnIndex = resultSetUtils.findColumn(rs, LWarehouseFlow_mapper.WarehouseId); if (columnIndex > 0) { if (rs.getBigDecimal(columnIndex) == null) { -- Gitblit v1.9.1