diff --git a/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordMapper.java b/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordMapper.java index a132209..55a0458 100644 --- a/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordMapper.java @@ -40,12 +40,14 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco @Insert({ "insert into bs_cornucopia_lottery_record (lottery_no, lottery_time, ", - "`type`, type_name, ", + "`type`, proportion, ", + "gold_coin, type_name, ", "config_msg, create_time, ", "update_time, `status`, ", "ext_1, ext_2, ext_3)", "values (#{lotteryNo,jdbcType=VARCHAR}, #{lotteryTime,jdbcType=TIMESTAMP}, ", - "#{type,jdbcType=INTEGER}, #{typeName,jdbcType=VARCHAR}, ", + "#{type,jdbcType=INTEGER}, #{proportion,jdbcType=DECIMAL}, ", + "#{goldCoin,jdbcType=DECIMAL}, #{typeName,jdbcType=VARCHAR}, ", "#{configMsg,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" @@ -63,6 +65,8 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco @Result(column="lottery_no", property="lotteryNo", jdbcType=JdbcType.VARCHAR), @Result(column="lottery_time", property="lotteryTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="proportion", property="proportion", jdbcType=JdbcType.DECIMAL), + @Result(column="gold_coin", property="goldCoin", jdbcType=JdbcType.DECIMAL), @Result(column="type_name", property="typeName", jdbcType=JdbcType.VARCHAR), @Result(column="config_msg", property="configMsg", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -76,8 +80,8 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco @Select({ "select", - "id, lottery_no, lottery_time, `type`, type_name, config_msg, create_time, update_time, ", - "`status`, ext_1, ext_2, ext_3", + "id, lottery_no, lottery_time, `type`, proportion, gold_coin, type_name, config_msg, ", + "create_time, update_time, `status`, ext_1, ext_2, ext_3", "from bs_cornucopia_lottery_record", "where id = #{id,jdbcType=BIGINT}" }) @@ -86,6 +90,8 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco @Result(column="lottery_no", property="lotteryNo", jdbcType=JdbcType.VARCHAR), @Result(column="lottery_time", property="lotteryTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER), + @Result(column="proportion", property="proportion", jdbcType=JdbcType.DECIMAL), + @Result(column="gold_coin", property="goldCoin", jdbcType=JdbcType.DECIMAL), @Result(column="type_name", property="typeName", jdbcType=JdbcType.VARCHAR), @Result(column="config_msg", property="configMsg", jdbcType=JdbcType.VARCHAR), @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP), @@ -111,6 +117,8 @@ public interface BsCornucopiaLotteryRecordMapper extends BsCornucopiaLotteryReco "set lottery_no = #{lotteryNo,jdbcType=VARCHAR},", "lottery_time = #{lotteryTime,jdbcType=TIMESTAMP},", "`type` = #{type,jdbcType=INTEGER},", + "proportion = #{proportion,jdbcType=DECIMAL},", + "gold_coin = #{goldCoin,jdbcType=DECIMAL},", "type_name = #{typeName,jdbcType=VARCHAR},", "config_msg = #{configMsg,jdbcType=VARCHAR},", "create_time = #{createTime,jdbcType=TIMESTAMP},", diff --git a/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordSqlProvider.java index 2a1a9f7..8b3be87 100644 --- a/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsCornucopiaLotteryRecordSqlProvider.java @@ -40,6 +40,14 @@ public class BsCornucopiaLotteryRecordSqlProvider { sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); } + if (record.getProportion() != null) { + sql.VALUES("proportion", "#{proportion,jdbcType=DECIMAL}"); + } + + if (record.getGoldCoin() != null) { + sql.VALUES("gold_coin", "#{goldCoin,jdbcType=DECIMAL}"); + } + if (record.getTypeName() != null) { sql.VALUES("type_name", "#{typeName,jdbcType=VARCHAR}"); } @@ -85,6 +93,8 @@ public class BsCornucopiaLotteryRecordSqlProvider { sql.SELECT("lottery_no"); sql.SELECT("lottery_time"); sql.SELECT("`type`"); + sql.SELECT("proportion"); + sql.SELECT("gold_coin"); sql.SELECT("type_name"); sql.SELECT("config_msg"); sql.SELECT("create_time"); @@ -126,6 +136,14 @@ public class BsCornucopiaLotteryRecordSqlProvider { sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); } + if (record.getProportion() != null) { + sql.SET("proportion = #{record.proportion,jdbcType=DECIMAL}"); + } + + if (record.getGoldCoin() != null) { + sql.SET("gold_coin = #{record.goldCoin,jdbcType=DECIMAL}"); + } + if (record.getTypeName() != null) { sql.SET("type_name = #{record.typeName,jdbcType=VARCHAR}"); } @@ -170,6 +188,8 @@ public class BsCornucopiaLotteryRecordSqlProvider { sql.SET("lottery_no = #{record.lotteryNo,jdbcType=VARCHAR}"); sql.SET("lottery_time = #{record.lotteryTime,jdbcType=TIMESTAMP}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); + sql.SET("proportion = #{record.proportion,jdbcType=DECIMAL}"); + sql.SET("gold_coin = #{record.goldCoin,jdbcType=DECIMAL}"); sql.SET("type_name = #{record.typeName,jdbcType=VARCHAR}"); sql.SET("config_msg = #{record.configMsg,jdbcType=VARCHAR}"); sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}"); @@ -200,6 +220,14 @@ public class BsCornucopiaLotteryRecordSqlProvider { sql.SET("`type` = #{type,jdbcType=INTEGER}"); } + if (record.getProportion() != null) { + sql.SET("proportion = #{proportion,jdbcType=DECIMAL}"); + } + + if (record.getGoldCoin() != null) { + sql.SET("gold_coin = #{goldCoin,jdbcType=DECIMAL}"); + } + if (record.getTypeName() != null) { sql.SET("type_name = #{typeName,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecord.java b/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecord.java index 2230dfc..ac3377e 100644 --- a/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecord.java +++ b/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecord.java @@ -1,6 +1,7 @@ package com.hfkj.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -33,6 +34,16 @@ public class BsCornucopiaLotteryRecord implements Serializable { */ private Integer type; + /** + * 比例 + */ + private BigDecimal proportion; + + /** + * 投入总元宝 + */ + private BigDecimal goldCoin; + /** * 类型名称 */ @@ -107,6 +118,22 @@ public class BsCornucopiaLotteryRecord implements Serializable { this.type = type; } + public BigDecimal getProportion() { + return proportion; + } + + public void setProportion(BigDecimal proportion) { + this.proportion = proportion; + } + + public BigDecimal getGoldCoin() { + return goldCoin; + } + + public void setGoldCoin(BigDecimal goldCoin) { + this.goldCoin = goldCoin; + } + public String getTypeName() { return typeName; } @@ -187,6 +214,8 @@ public class BsCornucopiaLotteryRecord implements Serializable { && (this.getLotteryNo() == null ? other.getLotteryNo() == null : this.getLotteryNo().equals(other.getLotteryNo())) && (this.getLotteryTime() == null ? other.getLotteryTime() == null : this.getLotteryTime().equals(other.getLotteryTime())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) + && (this.getProportion() == null ? other.getProportion() == null : this.getProportion().equals(other.getProportion())) + && (this.getGoldCoin() == null ? other.getGoldCoin() == null : this.getGoldCoin().equals(other.getGoldCoin())) && (this.getTypeName() == null ? other.getTypeName() == null : this.getTypeName().equals(other.getTypeName())) && (this.getConfigMsg() == null ? other.getConfigMsg() == null : this.getConfigMsg().equals(other.getConfigMsg())) && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime())) @@ -205,6 +234,8 @@ public class BsCornucopiaLotteryRecord implements Serializable { result = prime * result + ((getLotteryNo() == null) ? 0 : getLotteryNo().hashCode()); result = prime * result + ((getLotteryTime() == null) ? 0 : getLotteryTime().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); + result = prime * result + ((getProportion() == null) ? 0 : getProportion().hashCode()); + result = prime * result + ((getGoldCoin() == null) ? 0 : getGoldCoin().hashCode()); result = prime * result + ((getTypeName() == null) ? 0 : getTypeName().hashCode()); result = prime * result + ((getConfigMsg() == null) ? 0 : getConfigMsg().hashCode()); result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode()); @@ -226,6 +257,8 @@ public class BsCornucopiaLotteryRecord implements Serializable { sb.append(", lotteryNo=").append(lotteryNo); sb.append(", lotteryTime=").append(lotteryTime); sb.append(", type=").append(type); + sb.append(", proportion=").append(proportion); + sb.append(", goldCoin=").append(goldCoin); sb.append(", typeName=").append(typeName); sb.append(", configMsg=").append(configMsg); sb.append(", createTime=").append(createTime); diff --git a/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecordExample.java b/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecordExample.java index 397526a..9d53a15 100644 --- a/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecordExample.java +++ b/service/src/main/java/com/hfkj/entity/BsCornucopiaLotteryRecordExample.java @@ -1,5 +1,6 @@ package com.hfkj.entity; +import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -375,6 +376,126 @@ public class BsCornucopiaLotteryRecordExample { return (Criteria) this; } + public Criteria andProportionIsNull() { + addCriterion("proportion is null"); + return (Criteria) this; + } + + public Criteria andProportionIsNotNull() { + addCriterion("proportion is not null"); + return (Criteria) this; + } + + public Criteria andProportionEqualTo(BigDecimal value) { + addCriterion("proportion =", value, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionNotEqualTo(BigDecimal value) { + addCriterion("proportion <>", value, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionGreaterThan(BigDecimal value) { + addCriterion("proportion >", value, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("proportion >=", value, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionLessThan(BigDecimal value) { + addCriterion("proportion <", value, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionLessThanOrEqualTo(BigDecimal value) { + addCriterion("proportion <=", value, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionIn(List values) { + addCriterion("proportion in", values, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionNotIn(List values) { + addCriterion("proportion not in", values, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("proportion between", value1, value2, "proportion"); + return (Criteria) this; + } + + public Criteria andProportionNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("proportion not between", value1, value2, "proportion"); + return (Criteria) this; + } + + public Criteria andGoldCoinIsNull() { + addCriterion("gold_coin is null"); + return (Criteria) this; + } + + public Criteria andGoldCoinIsNotNull() { + addCriterion("gold_coin is not null"); + return (Criteria) this; + } + + public Criteria andGoldCoinEqualTo(BigDecimal value) { + addCriterion("gold_coin =", value, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinNotEqualTo(BigDecimal value) { + addCriterion("gold_coin <>", value, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinGreaterThan(BigDecimal value) { + addCriterion("gold_coin >", value, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("gold_coin >=", value, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinLessThan(BigDecimal value) { + addCriterion("gold_coin <", value, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinLessThanOrEqualTo(BigDecimal value) { + addCriterion("gold_coin <=", value, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinIn(List values) { + addCriterion("gold_coin in", values, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinNotIn(List values) { + addCriterion("gold_coin not in", values, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gold_coin between", value1, value2, "goldCoin"); + return (Criteria) this; + } + + public Criteria andGoldCoinNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("gold_coin not between", value1, value2, "goldCoin"); + return (Criteria) this; + } + public Criteria andTypeNameIsNull() { addCriterion("type_name is null"); return (Criteria) this;