Merge remote-tracking branch 'origin/master'

luqingyang

2023-10-25 d2048c247c446be08598abf8e1bc11a4ea77be32

 consum-model-pojo/src/main/java/com/consum/model/po/BaseGoodsTemplate_mapper.java

@@ -41,7 +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 Type = "type";
    public static final String DTime = "d_time";
    public static final String DUserId = "d_user_id";
    public static final String DUserName = "d_user_name";

    /**
     * 默认构造函数
@@ -94,8 +96,14 @@
        if (baseGoodsTemplate.isset_createDate) {
            this.setCreateDate(baseGoodsTemplate.getCreateDate());
        }
        if (baseGoodsTemplate.isset_type) {
            this.setType(baseGoodsTemplate.getType());
        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_());
@@ -153,7 +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(Type, this.getType(), this.isset_type);
        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();
    }

@@ -176,7 +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(Type, this.getType(), this.isset_type);
        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();
    }
@@ -200,7 +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(Type, this.getType(), this.isset_type);
        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);
    }

@@ -223,7 +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(Type, this.getType(), this.isset_type);
        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, f_agency_id, s_agency_id, t_agency_id, parent_agency_id, agency_level, agency_id, agency_name, create_date, type 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, f_agency_id, s_agency_id, t_agency_id, parent_agency_id, agency_level, agency_id, agency_name, create_date, type 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);
    }

    /**
@@ -404,14 +420,26 @@
                base_goods_template.setCreateDate(rs.getLong(columnIndex));
            }
        }
        columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.Type);
        columnIndex = resultSetUtils.findColumn(rs, BaseGoodsTemplate_mapper.DTime);
        if (columnIndex > 0) {
            if (rs.getBigDecimal(columnIndex) == null) {
                base_goods_template.setType(null);
                base_goods_template.setDTime(null);
            } else {
                base_goods_template.setType(rs.getInt(columnIndex));
                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;
    }
}