hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/order_yy' into order_yy

Browse Source
dev-discount
袁野 2 years ago
parent 2b7bd11c52 728e0cb33d
commit 17d7c9cee4
4 changed files with 42 additions and 52 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 16
      hai-service/src/main/java/com/hai/dao/BsMsgUserMapper.java
  2. 16
      hai-service/src/main/java/com/hai/dao/BsMsgUserSqlProvider.java
  3. 12
      hai-service/src/main/java/com/hai/entity/BsMsgUser.java
  4. 50
      hai-service/src/main/java/com/hai/entity/BsMsgUserExample.java

16
hai-service/src/main/java/com/hai/dao/BsMsgUserMapper.java
Unescape View File

@ -44,9 +44,9 @@ public interface BsMsgUserMapper extends BsMsgUserMapperExt {
"where_check, check_time, ",
"create_time, update_time, ",
"ext_1, ext_2, ext_3)",
"values (#{msgId,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, ",
"values (#{msgId,jdbcType=BIGINT}, #{userId,jdbcType=BIGINT}, ",
"#{userName,jdbcType=VARCHAR}, #{userPhone,jdbcType=VARCHAR}, ",
"#{whereCheck,jdbcType=BIGINT}, #{checkTime,jdbcType=TIMESTAMP}, ",
"#{whereCheck,jdbcType=BIT}, #{checkTime,jdbcType=TIMESTAMP}, ",
"#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
"#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
})
@ -60,11 +60,11 @@ public interface BsMsgUserMapper extends BsMsgUserMapperExt {
@SelectProvider(type=BsMsgUserSqlProvider.class, method="selectByExample")
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="msg_id", property="msgId", jdbcType=JdbcType.VARCHAR),
@Result(column="msg_id", property="msgId", jdbcType=JdbcType.BIGINT),
@Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR),
@Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
@Result(column="where_check", property="whereCheck", jdbcType=JdbcType.BIGINT),
@Result(column="where_check", property="whereCheck", jdbcType=JdbcType.BIT),
@Result(column="check_time", property="checkTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -83,11 +83,11 @@ public interface BsMsgUserMapper extends BsMsgUserMapperExt {
})
@Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="msg_id", property="msgId", jdbcType=JdbcType.VARCHAR),
@Result(column="msg_id", property="msgId", jdbcType=JdbcType.BIGINT),
@Result(column="user_id", property="userId", jdbcType=JdbcType.BIGINT),
@Result(column="user_name", property="userName", jdbcType=JdbcType.VARCHAR),
@Result(column="user_phone", property="userPhone", jdbcType=JdbcType.VARCHAR),
@Result(column="where_check", property="whereCheck", jdbcType=JdbcType.BIGINT),
@Result(column="where_check", property="whereCheck", jdbcType=JdbcType.BIT),
@Result(column="check_time", property="checkTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -108,11 +108,11 @@ public interface BsMsgUserMapper extends BsMsgUserMapperExt {
@Update({
"update bs_msg_user",
"set msg_id = #{msgId,jdbcType=VARCHAR},",
"set msg_id = #{msgId,jdbcType=BIGINT},",
"user_id = #{userId,jdbcType=BIGINT},",
"user_name = #{userName,jdbcType=VARCHAR},",
"user_phone = #{userPhone,jdbcType=VARCHAR},",
"where_check = #{whereCheck,jdbcType=BIGINT},",
"where_check = #{whereCheck,jdbcType=BIT},",
"check_time = #{checkTime,jdbcType=TIMESTAMP},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",

16
hai-service/src/main/java/com/hai/dao/BsMsgUserSqlProvider.java
Unescape View File

@ -29,7 +29,7 @@ public class BsMsgUserSqlProvider {
sql.INSERT_INTO("bs_msg_user");
if (record.getMsgId() != null) {
sql.VALUES("msg_id", "#{msgId,jdbcType=VARCHAR}");
sql.VALUES("msg_id", "#{msgId,jdbcType=BIGINT}");
}
if (record.getUserId() != null) {
@ -45,7 +45,7 @@ public class BsMsgUserSqlProvider {
}
if (record.getWhereCheck() != null) {
sql.VALUES("where_check", "#{whereCheck,jdbcType=BIGINT}");
sql.VALUES("where_check", "#{whereCheck,jdbcType=BIT}");
}
if (record.getCheckTime() != null) {
@ -115,7 +115,7 @@ public class BsMsgUserSqlProvider {
}
if (record.getMsgId() != null) {
sql.SET("msg_id = #{record.msgId,jdbcType=VARCHAR}");
sql.SET("msg_id = #{record.msgId,jdbcType=BIGINT}");
}
if (record.getUserId() != null) {
@ -131,7 +131,7 @@ public class BsMsgUserSqlProvider {
}
if (record.getWhereCheck() != null) {
sql.SET("where_check = #{record.whereCheck,jdbcType=BIGINT}");
sql.SET("where_check = #{record.whereCheck,jdbcType=BIT}");
}
if (record.getCheckTime() != null) {
@ -167,11 +167,11 @@ public class BsMsgUserSqlProvider {
sql.UPDATE("bs_msg_user");
sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("msg_id = #{record.msgId,jdbcType=VARCHAR}");
sql.SET("msg_id = #{record.msgId,jdbcType=BIGINT}");
sql.SET("user_id = #{record.userId,jdbcType=BIGINT}");
sql.SET("user_name = #{record.userName,jdbcType=VARCHAR}");
sql.SET("user_phone = #{record.userPhone,jdbcType=VARCHAR}");
sql.SET("where_check = #{record.whereCheck,jdbcType=BIGINT}");
sql.SET("where_check = #{record.whereCheck,jdbcType=BIT}");
sql.SET("check_time = #{record.checkTime,jdbcType=TIMESTAMP}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@ -189,7 +189,7 @@ public class BsMsgUserSqlProvider {
sql.UPDATE("bs_msg_user");
if (record.getMsgId() != null) {
sql.SET("msg_id = #{msgId,jdbcType=VARCHAR}");
sql.SET("msg_id = #{msgId,jdbcType=BIGINT}");
}
if (record.getUserId() != null) {
@ -205,7 +205,7 @@ public class BsMsgUserSqlProvider {
}
if (record.getWhereCheck() != null) {
sql.SET("where_check = #{whereCheck,jdbcType=BIGINT}");
sql.SET("where_check = #{whereCheck,jdbcType=BIT}");
}
if (record.getCheckTime() != null) {

12
hai-service/src/main/java/com/hai/entity/BsMsgUser.java
Unescape View File

@ -21,7 +21,7 @@ public class BsMsgUser implements Serializable {
/**
* 站内信id
*/
private String msgId;
private Long msgId;
/**
* 用户id
@ -41,7 +41,7 @@ public class BsMsgUser implements Serializable {
/**
* 是否查看
*/
private Long whereCheck;
private Boolean whereCheck;
/**
* 查看时间
@ -83,11 +83,11 @@ public class BsMsgUser implements Serializable {
this.id = id;
}
public String getMsgId() {
public Long getMsgId() {
return msgId;
}
public void setMsgId(String msgId) {
public void setMsgId(Long msgId) {
this.msgId = msgId;
}
@ -115,11 +115,11 @@ public class BsMsgUser implements Serializable {
this.userPhone = userPhone;
}
public Long getWhereCheck() {
public Boolean getWhereCheck() {
return whereCheck;
}
public void setWhereCheck(Long whereCheck) {
public void setWhereCheck(Boolean whereCheck) {
this.whereCheck = whereCheck;
}

50
hai-service/src/main/java/com/hai/entity/BsMsgUserExample.java
Unescape View File

@ -195,62 +195,52 @@ public class BsMsgUserExample {
return (Criteria) this;
}
public Criteria andMsgIdEqualTo(String value) {
public Criteria andMsgIdEqualTo(Long value) {
addCriterion("msg_id =", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdNotEqualTo(String value) {
public Criteria andMsgIdNotEqualTo(Long value) {
addCriterion("msg_id <>", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdGreaterThan(String value) {
public Criteria andMsgIdGreaterThan(Long value) {
addCriterion("msg_id >", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdGreaterThanOrEqualTo(String value) {
public Criteria andMsgIdGreaterThanOrEqualTo(Long value) {
addCriterion("msg_id >=", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdLessThan(String value) {
public Criteria andMsgIdLessThan(Long value) {
addCriterion("msg_id <", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdLessThanOrEqualTo(String value) {
public Criteria andMsgIdLessThanOrEqualTo(Long value) {
addCriterion("msg_id <=", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdLike(String value) {
addCriterion("msg_id like", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdNotLike(String value) {
addCriterion("msg_id not like", value, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdIn(List<String> values) {
public Criteria andMsgIdIn(List<Long> values) {
addCriterion("msg_id in", values, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdNotIn(List<String> values) {
public Criteria andMsgIdNotIn(List<Long> values) {
addCriterion("msg_id not in", values, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdBetween(String value1, String value2) {
public Criteria andMsgIdBetween(Long value1, Long value2) {
addCriterion("msg_id between", value1, value2, "msgId");
return (Criteria) this;
}
public Criteria andMsgIdNotBetween(String value1, String value2) {
public Criteria andMsgIdNotBetween(Long value1, Long value2) {
addCriterion("msg_id not between", value1, value2, "msgId");
return (Criteria) this;
}
@ -465,52 +455,52 @@ public class BsMsgUserExample {
return (Criteria) this;
}
public Criteria andWhereCheckEqualTo(Long value) {
public Criteria andWhereCheckEqualTo(Boolean value) {
addCriterion("where_check =", value, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckNotEqualTo(Long value) {
public Criteria andWhereCheckNotEqualTo(Boolean value) {
addCriterion("where_check <>", value, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckGreaterThan(Long value) {
public Criteria andWhereCheckGreaterThan(Boolean value) {
addCriterion("where_check >", value, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckGreaterThanOrEqualTo(Long value) {
public Criteria andWhereCheckGreaterThanOrEqualTo(Boolean value) {
addCriterion("where_check >=", value, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckLessThan(Long value) {
public Criteria andWhereCheckLessThan(Boolean value) {
addCriterion("where_check <", value, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckLessThanOrEqualTo(Long value) {
public Criteria andWhereCheckLessThanOrEqualTo(Boolean value) {
addCriterion("where_check <=", value, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckIn(List<Long> values) {
public Criteria andWhereCheckIn(List<Boolean> values) {
addCriterion("where_check in", values, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckNotIn(List<Long> values) {
public Criteria andWhereCheckNotIn(List<Boolean> values) {
addCriterion("where_check not in", values, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckBetween(Long value1, Long value2) {
public Criteria andWhereCheckBetween(Boolean value1, Boolean value2) {
addCriterion("where_check between", value1, value2, "whereCheck");
return (Criteria) this;
}
public Criteria andWhereCheckNotBetween(Long value1, Long value2) {
public Criteria andWhereCheckNotBetween(Boolean value1, Boolean value2) {
addCriterion("where_check not between", value1, value2, "whereCheck");
return (Criteria) this;
}

Write Preview
Loading…
Cancel
Save