From c2931ed46d16d6e01baac76c9ab97bb8b7788abf Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期三, 25 十月 2023 17:32:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate_mapper.java | 66 +++++++++++++++++++++++---------
1 files changed, 47 insertions(+), 19 deletions(-)
diff --git a/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate_mapper.java b/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate_mapper.java
index d48c679..108c247 100644
--- a/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate_mapper.java
+++ b/consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate_mapper.java
@@ -33,7 +33,6 @@
public static final String Classification = "classification";
public static final String States = "states";
public static final String CategoryId = "category_id";
- public static final String Unit = "unit";
public static final String FAgencyId = "f_agency_id";
public static final String SAgencyId = "s_agency_id";
public static final String TAgencyId = "t_agency_id";
@@ -42,6 +41,9 @@
public static final String AgencyId = "agency_id";
public static final String AgencyName = "agency_name";
public static final String CreateDate = "create_date";
+ public static final String DTime = "d_time";
+ public static final String DUserId = "d_user_id";
+ public static final String DUserName = "d_user_name";
/**
* 榛樿鏋勯�犲嚱鏁�
@@ -70,9 +72,6 @@
if (baseGoodsTemplate.isset_categoryId) {
this.setCategoryId(baseGoodsTemplate.getCategoryId());
}
- if (baseGoodsTemplate.isset_unit) {
- this.setUnit(baseGoodsTemplate.getUnit());
- }
if (baseGoodsTemplate.isset_fAgencyId) {
this.setFAgencyId(baseGoodsTemplate.getFAgencyId());
}
@@ -96,6 +95,15 @@
}
if (baseGoodsTemplate.isset_createDate) {
this.setCreateDate(baseGoodsTemplate.getCreateDate());
+ }
+ if (baseGoodsTemplate.isset_dTime) {
+ this.setDTime(baseGoodsTemplate.getDTime());
+ }
+ if (baseGoodsTemplate.isset_dUserId) {
+ this.setDUserId(baseGoodsTemplate.getDUserId());
+ }
+ if (baseGoodsTemplate.isset_dUserName) {
+ this.setDUserName(baseGoodsTemplate.getDUserName());
}
// 鍘绘帀锛�2022-09-07
// this.setDatabaseName_(base_goods_template.getDatabaseName_());
@@ -145,7 +153,6 @@
ib.set(Classification, this.getClassification(), this.isset_classification);
ib.set(States, this.getStates(), this.isset_states);
ib.set(CategoryId, this.getCategoryId(), this.isset_categoryId);
- ib.set(Unit, this.getUnit(), this.isset_unit);
ib.set(FAgencyId, this.getFAgencyId(), this.isset_fAgencyId);
ib.set(SAgencyId, this.getSAgencyId(), this.isset_sAgencyId);
ib.set(TAgencyId, this.getTAgencyId(), this.isset_tAgencyId);
@@ -154,6 +161,9 @@
ib.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ib.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ib.set(CreateDate, this.getCreateDate(), this.isset_createDate);
+ ib.set(DTime, this.getDTime(), this.isset_dTime);
+ ib.set(DUserId, this.getDUserId(), this.isset_dUserId);
+ ib.set(DUserName, this.getDUserName(), this.isset_dUserName);
return ib.genMapSql();
}
@@ -168,7 +178,6 @@
ub.set(Classification, this.getClassification(), this.isset_classification);
ub.set(States, this.getStates(), this.isset_states);
ub.set(CategoryId, this.getCategoryId(), this.isset_categoryId);
- ub.set(Unit, this.getUnit(), this.isset_unit);
ub.set(FAgencyId, this.getFAgencyId(), this.isset_fAgencyId);
ub.set(SAgencyId, this.getSAgencyId(), this.isset_sAgencyId);
ub.set(TAgencyId, this.getTAgencyId(), this.isset_tAgencyId);
@@ -177,6 +186,9 @@
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(CreateDate, this.getCreateDate(), this.isset_createDate);
+ ub.set(DTime, this.getDTime(), this.isset_dTime);
+ ub.set(DUserId, this.getDUserId(), this.isset_dUserId);
+ ub.set(DUserName, this.getDUserName(), this.isset_dUserName);
ub.where(this.getPkName_(), this.getPkValue_());
return ub.genMapSql();
}
@@ -192,7 +204,6 @@
ub.set(Classification, this.getClassification(), this.isset_classification);
ub.set(States, this.getStates(), this.isset_states);
ub.set(CategoryId, this.getCategoryId(), this.isset_categoryId);
- ub.set(Unit, this.getUnit(), this.isset_unit);
ub.set(FAgencyId, this.getFAgencyId(), this.isset_fAgencyId);
ub.set(SAgencyId, this.getSAgencyId(), this.isset_sAgencyId);
ub.set(TAgencyId, this.getTAgencyId(), this.isset_tAgencyId);
@@ -201,6 +212,9 @@
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(CreateDate, this.getCreateDate(), this.isset_createDate);
+ ub.set(DTime, this.getDTime(), this.isset_dTime);
+ ub.set(DUserId, this.getDUserId(), this.isset_dUserId);
+ ub.set(DUserName, this.getDUserName(), this.isset_dUserName);
return ub.genMapSql(where, parameters);
}
@@ -215,7 +229,6 @@
ub.set(Classification, this.getClassification(), this.isset_classification);
ub.set(States, this.getStates(), this.isset_states);
ub.set(CategoryId, this.getCategoryId(), this.isset_categoryId);
- ub.set(Unit, this.getUnit(), this.isset_unit);
ub.set(FAgencyId, this.getFAgencyId(), this.isset_fAgencyId);
ub.set(SAgencyId, this.getSAgencyId(), this.isset_sAgencyId);
ub.set(TAgencyId, this.getTAgencyId(), this.isset_tAgencyId);
@@ -224,6 +237,9 @@
ub.set(AgencyId, this.getAgencyId(), this.isset_agencyId);
ub.set(AgencyName, this.getAgencyName(), this.isset_agencyName);
ub.set(CreateDate, this.getCreateDate(), this.isset_createDate);
+ ub.set(DTime, this.getDTime(), this.isset_dTime);
+ ub.set(DUserId, this.getDUserId(), this.isset_dUserId);
+ ub.set(DUserName, this.getDUserName(), this.isset_dUserName);
return ub.genArraySql(where, parameters);
}
@@ -271,7 +287,7 @@
*/
@Override
public SqlAndParameters<Map<String, Object>> getSelectSql_(String where, Map<String, Object> parameters) {
- return new SqlAndParameters<>("select id, goods_code, goods_name, classification, states, category_id, unit, f_agency_id, s_agency_id, t_agency_id, parent_agency_id, agency_level, agency_id, agency_name, create_date from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, goods_code, goods_name, classification, states, category_id, f_agency_id, s_agency_id, t_agency_id, parent_agency_id, agency_level, agency_id, agency_name, create_date, d_time, d_user_id, d_user_name from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -279,7 +295,7 @@
*/
@Override
public SqlAndParameters<Object[]> getSelectSql_(String where, Object[] parameters) {
- return new SqlAndParameters<>("select id, goods_code, goods_name, classification, states, category_id, unit, f_agency_id, s_agency_id, t_agency_id, parent_agency_id, agency_level, agency_id, agency_name, create_date from " + this.getTableName_() + " " + where, parameters);
+ return new SqlAndParameters<>("select id, goods_code, goods_name, classification, states, category_id, f_agency_id, s_agency_id, t_agency_id, parent_agency_id, agency_level, agency_id, agency_name, create_date, d_time, d_user_id, d_user_name from " + this.getTableName_() + " " + where, parameters);
}
/**
@@ -326,11 +342,7 @@
}
columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.Classification);
if (columnIndex > 0) {
- if (rs.getBigDecimal(columnIndex) == null) {
- base_goods_template.setClassification(null);
- } else {
- base_goods_template.setClassification(rs.getInt(columnIndex));
- }
+ base_goods_template.setClassification(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.States);
if (columnIndex > 0) {
@@ -347,10 +359,6 @@
} else {
base_goods_template.setCategoryId(rs.getLong(columnIndex));
}
- }
- columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.Unit);
- if (columnIndex > 0) {
- base_goods_template.setUnit(rs.getString(columnIndex));
}
columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.FAgencyId);
if (columnIndex > 0) {
@@ -412,6 +420,26 @@
base_goods_template.setCreateDate(rs.getLong(columnIndex));
}
}
+ columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.DTime);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ base_goods_template.setDTime(null);
+ } else {
+ base_goods_template.setDTime(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.DUserId);
+ if (columnIndex > 0) {
+ if (rs.getBigDecimal(columnIndex) == null) {
+ base_goods_template.setDUserId(null);
+ } else {
+ base_goods_template.setDUserId(rs.getLong(columnIndex));
+ }
+ }
+ columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.DUserName);
+ if (columnIndex > 0) {
+ base_goods_template.setDUserName(rs.getString(columnIndex));
+ }
return base_goods_template;
}
}
--
Gitblit v1.9.1