diff --git a/hai-service/src/main/java/com/hai/dao/HighRefundAuditMapper.java b/hai-service/src/main/java/com/hai/dao/HighRefundAuditMapper.java index a98a8e56..1538bf9f 100644 --- a/hai-service/src/main/java/com/hai/dao/HighRefundAuditMapper.java +++ b/hai-service/src/main/java/com/hai/dao/HighRefundAuditMapper.java @@ -42,17 +42,19 @@ public interface HighRefundAuditMapper extends HighRefundAuditMapperExt { "insert into high_refund_audit (refund_source, refund_price, ", "pay_type, source_order_no, ", "pay_time, created_user_id, ", - "created_time, updated_user_id, ", + "created_time, created_user_name, ", + "updated_user_id, updated_user_name, ", "updated_time, remark, ", - "`status`, ext_1, ext_2, ", - "ext_3)", + "`status`, compan_id, ", + "ext_1, ext_2, ext_3)", "values (#{refundSource,jdbcType=INTEGER}, #{refundPrice,jdbcType=DECIMAL}, ", "#{payType,jdbcType=INTEGER}, #{sourceOrderNo,jdbcType=VARCHAR}, ", "#{payTime,jdbcType=TIMESTAMP}, #{createdUserId,jdbcType=INTEGER}, ", - "#{createdTime,jdbcType=TIMESTAMP}, #{updatedUserId,jdbcType=INTEGER}, ", + "#{createdTime,jdbcType=TIMESTAMP}, #{createdUserName,jdbcType=VARCHAR}, ", + "#{updatedUserId,jdbcType=INTEGER}, #{updatedUserName,jdbcType=VARCHAR}, ", "#{updatedTime,jdbcType=TIMESTAMP}, #{remark,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ", - "#{ext3,jdbcType=VARCHAR})" + "#{status,jdbcType=INTEGER}, #{companId,jdbcType=INTEGER}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(HighRefundAudit record); @@ -71,10 +73,13 @@ public interface HighRefundAuditMapper extends HighRefundAuditMapperExt { @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER), @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="created_user_name", property="createdUserName", jdbcType=JdbcType.VARCHAR), @Result(column="updated_user_id", property="updatedUserId", jdbcType=JdbcType.INTEGER), + @Result(column="updated_user_name", property="updatedUserName", jdbcType=JdbcType.VARCHAR), @Result(column="updated_time", property="updatedTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="compan_id", property="companId", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) @@ -84,8 +89,8 @@ public interface HighRefundAuditMapper extends HighRefundAuditMapperExt { @Select({ "select", "id, refund_source, refund_price, pay_type, source_order_no, pay_time, created_user_id, ", - "created_time, updated_user_id, updated_time, remark, `status`, ext_1, ext_2, ", - "ext_3", + "created_time, created_user_name, updated_user_id, updated_user_name, updated_time, ", + "remark, `status`, compan_id, ext_1, ext_2, ext_3", "from high_refund_audit", "where id = #{id,jdbcType=INTEGER}" }) @@ -98,10 +103,13 @@ public interface HighRefundAuditMapper extends HighRefundAuditMapperExt { @Result(column="pay_time", property="payTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="created_user_id", property="createdUserId", jdbcType=JdbcType.INTEGER), @Result(column="created_time", property="createdTime", jdbcType=JdbcType.TIMESTAMP), + @Result(column="created_user_name", property="createdUserName", jdbcType=JdbcType.VARCHAR), @Result(column="updated_user_id", property="updatedUserId", jdbcType=JdbcType.INTEGER), + @Result(column="updated_user_name", property="updatedUserName", jdbcType=JdbcType.VARCHAR), @Result(column="updated_time", property="updatedTime", jdbcType=JdbcType.TIMESTAMP), @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), + @Result(column="compan_id", property="companId", jdbcType=JdbcType.INTEGER), @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR), @Result(column="ext_2", property="ext2", jdbcType=JdbcType.VARCHAR), @Result(column="ext_3", property="ext3", jdbcType=JdbcType.VARCHAR) @@ -126,10 +134,13 @@ public interface HighRefundAuditMapper extends HighRefundAuditMapperExt { "pay_time = #{payTime,jdbcType=TIMESTAMP},", "created_user_id = #{createdUserId,jdbcType=INTEGER},", "created_time = #{createdTime,jdbcType=TIMESTAMP},", + "created_user_name = #{createdUserName,jdbcType=VARCHAR},", "updated_user_id = #{updatedUserId,jdbcType=INTEGER},", + "updated_user_name = #{updatedUserName,jdbcType=VARCHAR},", "updated_time = #{updatedTime,jdbcType=TIMESTAMP},", "remark = #{remark,jdbcType=VARCHAR},", "`status` = #{status,jdbcType=INTEGER},", + "compan_id = #{companId,jdbcType=INTEGER},", "ext_1 = #{ext1,jdbcType=VARCHAR},", "ext_2 = #{ext2,jdbcType=VARCHAR},", "ext_3 = #{ext3,jdbcType=VARCHAR}", diff --git a/hai-service/src/main/java/com/hai/dao/HighRefundAuditSqlProvider.java b/hai-service/src/main/java/com/hai/dao/HighRefundAuditSqlProvider.java index cab688ac..4fc859c3 100644 --- a/hai-service/src/main/java/com/hai/dao/HighRefundAuditSqlProvider.java +++ b/hai-service/src/main/java/com/hai/dao/HighRefundAuditSqlProvider.java @@ -56,10 +56,18 @@ public class HighRefundAuditSqlProvider { sql.VALUES("created_time", "#{createdTime,jdbcType=TIMESTAMP}"); } + if (record.getCreatedUserName() != null) { + sql.VALUES("created_user_name", "#{createdUserName,jdbcType=VARCHAR}"); + } + if (record.getUpdatedUserId() != null) { sql.VALUES("updated_user_id", "#{updatedUserId,jdbcType=INTEGER}"); } + if (record.getUpdatedUserName() != null) { + sql.VALUES("updated_user_name", "#{updatedUserName,jdbcType=VARCHAR}"); + } + if (record.getUpdatedTime() != null) { sql.VALUES("updated_time", "#{updatedTime,jdbcType=TIMESTAMP}"); } @@ -72,6 +80,10 @@ public class HighRefundAuditSqlProvider { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } + if (record.getCompanId() != null) { + sql.VALUES("compan_id", "#{companId,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.VALUES("ext_1", "#{ext1,jdbcType=VARCHAR}"); } @@ -101,10 +113,13 @@ public class HighRefundAuditSqlProvider { sql.SELECT("pay_time"); sql.SELECT("created_user_id"); sql.SELECT("created_time"); + sql.SELECT("created_user_name"); sql.SELECT("updated_user_id"); + sql.SELECT("updated_user_name"); sql.SELECT("updated_time"); sql.SELECT("remark"); sql.SELECT("`status`"); + sql.SELECT("compan_id"); sql.SELECT("ext_1"); sql.SELECT("ext_2"); sql.SELECT("ext_3"); @@ -157,10 +172,18 @@ public class HighRefundAuditSqlProvider { sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}"); } + if (record.getCreatedUserName() != null) { + sql.SET("created_user_name = #{record.createdUserName,jdbcType=VARCHAR}"); + } + if (record.getUpdatedUserId() != null) { sql.SET("updated_user_id = #{record.updatedUserId,jdbcType=INTEGER}"); } + if (record.getUpdatedUserName() != null) { + sql.SET("updated_user_name = #{record.updatedUserName,jdbcType=VARCHAR}"); + } + if (record.getUpdatedTime() != null) { sql.SET("updated_time = #{record.updatedTime,jdbcType=TIMESTAMP}"); } @@ -173,6 +196,10 @@ public class HighRefundAuditSqlProvider { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } + if (record.getCompanId() != null) { + sql.SET("compan_id = #{record.companId,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); } @@ -201,10 +228,13 @@ public class HighRefundAuditSqlProvider { sql.SET("pay_time = #{record.payTime,jdbcType=TIMESTAMP}"); sql.SET("created_user_id = #{record.createdUserId,jdbcType=INTEGER}"); sql.SET("created_time = #{record.createdTime,jdbcType=TIMESTAMP}"); + sql.SET("created_user_name = #{record.createdUserName,jdbcType=VARCHAR}"); sql.SET("updated_user_id = #{record.updatedUserId,jdbcType=INTEGER}"); + sql.SET("updated_user_name = #{record.updatedUserName,jdbcType=VARCHAR}"); sql.SET("updated_time = #{record.updatedTime,jdbcType=TIMESTAMP}"); sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); + sql.SET("compan_id = #{record.companId,jdbcType=INTEGER}"); sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}"); sql.SET("ext_2 = #{record.ext2,jdbcType=VARCHAR}"); sql.SET("ext_3 = #{record.ext3,jdbcType=VARCHAR}"); @@ -246,10 +276,18 @@ public class HighRefundAuditSqlProvider { sql.SET("created_time = #{createdTime,jdbcType=TIMESTAMP}"); } + if (record.getCreatedUserName() != null) { + sql.SET("created_user_name = #{createdUserName,jdbcType=VARCHAR}"); + } + if (record.getUpdatedUserId() != null) { sql.SET("updated_user_id = #{updatedUserId,jdbcType=INTEGER}"); } + if (record.getUpdatedUserName() != null) { + sql.SET("updated_user_name = #{updatedUserName,jdbcType=VARCHAR}"); + } + if (record.getUpdatedTime() != null) { sql.SET("updated_time = #{updatedTime,jdbcType=TIMESTAMP}"); } @@ -262,6 +300,10 @@ public class HighRefundAuditSqlProvider { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } + if (record.getCompanId() != null) { + sql.SET("compan_id = #{companId,jdbcType=INTEGER}"); + } + if (record.getExt1() != null) { sql.SET("ext_1 = #{ext1,jdbcType=VARCHAR}"); } diff --git a/hai-service/src/main/java/com/hai/entity/HighRefundAudit.java b/hai-service/src/main/java/com/hai/entity/HighRefundAudit.java index b9d9d34c..5133b74e 100644 --- a/hai-service/src/main/java/com/hai/entity/HighRefundAudit.java +++ b/hai-service/src/main/java/com/hai/entity/HighRefundAudit.java @@ -20,7 +20,7 @@ public class HighRefundAudit implements Serializable { private Integer id; /** - * 退款来源 1:话费退款 + * 退款来源 1:话费 */ private Integer refundSource; @@ -54,11 +54,21 @@ public class HighRefundAudit implements Serializable { */ private Date createdTime; + /** + * 创建人名称 + */ + private String createdUserName; + /** * 更新人 */ private Integer updatedUserId; + /** + * 更新人名称 + */ + private String updatedUserName; + /** * 更新时间 */ @@ -74,6 +84,11 @@ public class HighRefundAudit implements Serializable { */ private Integer status; + /** + * 公司id + */ + private Integer companId; + /** * 额外字段 */ @@ -155,6 +170,14 @@ public class HighRefundAudit implements Serializable { this.createdTime = createdTime; } + public String getCreatedUserName() { + return createdUserName; + } + + public void setCreatedUserName(String createdUserName) { + this.createdUserName = createdUserName; + } + public Integer getUpdatedUserId() { return updatedUserId; } @@ -163,6 +186,14 @@ public class HighRefundAudit implements Serializable { this.updatedUserId = updatedUserId; } + public String getUpdatedUserName() { + return updatedUserName; + } + + public void setUpdatedUserName(String updatedUserName) { + this.updatedUserName = updatedUserName; + } + public Date getUpdatedTime() { return updatedTime; } @@ -187,6 +218,14 @@ public class HighRefundAudit implements Serializable { this.status = status; } + public Integer getCompanId() { + return companId; + } + + public void setCompanId(Integer companId) { + this.companId = companId; + } + public String getExt1() { return ext1; } @@ -231,10 +270,13 @@ public class HighRefundAudit implements Serializable { && (this.getPayTime() == null ? other.getPayTime() == null : this.getPayTime().equals(other.getPayTime())) && (this.getCreatedUserId() == null ? other.getCreatedUserId() == null : this.getCreatedUserId().equals(other.getCreatedUserId())) && (this.getCreatedTime() == null ? other.getCreatedTime() == null : this.getCreatedTime().equals(other.getCreatedTime())) + && (this.getCreatedUserName() == null ? other.getCreatedUserName() == null : this.getCreatedUserName().equals(other.getCreatedUserName())) && (this.getUpdatedUserId() == null ? other.getUpdatedUserId() == null : this.getUpdatedUserId().equals(other.getUpdatedUserId())) + && (this.getUpdatedUserName() == null ? other.getUpdatedUserName() == null : this.getUpdatedUserName().equals(other.getUpdatedUserName())) && (this.getUpdatedTime() == null ? other.getUpdatedTime() == null : this.getUpdatedTime().equals(other.getUpdatedTime())) && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) + && (this.getCompanId() == null ? other.getCompanId() == null : this.getCompanId().equals(other.getCompanId())) && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1())) && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2())) && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3())); @@ -252,10 +294,13 @@ public class HighRefundAudit implements Serializable { result = prime * result + ((getPayTime() == null) ? 0 : getPayTime().hashCode()); result = prime * result + ((getCreatedUserId() == null) ? 0 : getCreatedUserId().hashCode()); result = prime * result + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode()); + result = prime * result + ((getCreatedUserName() == null) ? 0 : getCreatedUserName().hashCode()); result = prime * result + ((getUpdatedUserId() == null) ? 0 : getUpdatedUserId().hashCode()); + result = prime * result + ((getUpdatedUserName() == null) ? 0 : getUpdatedUserName().hashCode()); result = prime * result + ((getUpdatedTime() == null) ? 0 : getUpdatedTime().hashCode()); result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); + result = prime * result + ((getCompanId() == null) ? 0 : getCompanId().hashCode()); result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode()); result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode()); result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode()); @@ -276,10 +321,13 @@ public class HighRefundAudit implements Serializable { sb.append(", payTime=").append(payTime); sb.append(", createdUserId=").append(createdUserId); sb.append(", createdTime=").append(createdTime); + sb.append(", createdUserName=").append(createdUserName); sb.append(", updatedUserId=").append(updatedUserId); + sb.append(", updatedUserName=").append(updatedUserName); sb.append(", updatedTime=").append(updatedTime); sb.append(", remark=").append(remark); sb.append(", status=").append(status); + sb.append(", companId=").append(companId); sb.append(", ext1=").append(ext1); sb.append(", ext2=").append(ext2); sb.append(", ext3=").append(ext3); diff --git a/hai-service/src/main/java/com/hai/entity/HighRefundAuditExample.java b/hai-service/src/main/java/com/hai/entity/HighRefundAuditExample.java index fc40a43d..145b940e 100644 --- a/hai-service/src/main/java/com/hai/entity/HighRefundAuditExample.java +++ b/hai-service/src/main/java/com/hai/entity/HighRefundAuditExample.java @@ -616,6 +616,76 @@ public class HighRefundAuditExample { return (Criteria) this; } + public Criteria andCreatedUserNameIsNull() { + addCriterion("created_user_name is null"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameIsNotNull() { + addCriterion("created_user_name is not null"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameEqualTo(String value) { + addCriterion("created_user_name =", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameNotEqualTo(String value) { + addCriterion("created_user_name <>", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameGreaterThan(String value) { + addCriterion("created_user_name >", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameGreaterThanOrEqualTo(String value) { + addCriterion("created_user_name >=", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameLessThan(String value) { + addCriterion("created_user_name <", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameLessThanOrEqualTo(String value) { + addCriterion("created_user_name <=", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameLike(String value) { + addCriterion("created_user_name like", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameNotLike(String value) { + addCriterion("created_user_name not like", value, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameIn(List values) { + addCriterion("created_user_name in", values, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameNotIn(List values) { + addCriterion("created_user_name not in", values, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameBetween(String value1, String value2) { + addCriterion("created_user_name between", value1, value2, "createdUserName"); + return (Criteria) this; + } + + public Criteria andCreatedUserNameNotBetween(String value1, String value2) { + addCriterion("created_user_name not between", value1, value2, "createdUserName"); + return (Criteria) this; + } + public Criteria andUpdatedUserIdIsNull() { addCriterion("updated_user_id is null"); return (Criteria) this; @@ -676,6 +746,76 @@ public class HighRefundAuditExample { return (Criteria) this; } + public Criteria andUpdatedUserNameIsNull() { + addCriterion("updated_user_name is null"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameIsNotNull() { + addCriterion("updated_user_name is not null"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameEqualTo(String value) { + addCriterion("updated_user_name =", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameNotEqualTo(String value) { + addCriterion("updated_user_name <>", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameGreaterThan(String value) { + addCriterion("updated_user_name >", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameGreaterThanOrEqualTo(String value) { + addCriterion("updated_user_name >=", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameLessThan(String value) { + addCriterion("updated_user_name <", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameLessThanOrEqualTo(String value) { + addCriterion("updated_user_name <=", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameLike(String value) { + addCriterion("updated_user_name like", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameNotLike(String value) { + addCriterion("updated_user_name not like", value, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameIn(List values) { + addCriterion("updated_user_name in", values, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameNotIn(List values) { + addCriterion("updated_user_name not in", values, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameBetween(String value1, String value2) { + addCriterion("updated_user_name between", value1, value2, "updatedUserName"); + return (Criteria) this; + } + + public Criteria andUpdatedUserNameNotBetween(String value1, String value2) { + addCriterion("updated_user_name not between", value1, value2, "updatedUserName"); + return (Criteria) this; + } + public Criteria andUpdatedTimeIsNull() { addCriterion("updated_time is null"); return (Criteria) this; @@ -866,6 +1006,66 @@ public class HighRefundAuditExample { return (Criteria) this; } + public Criteria andCompanIdIsNull() { + addCriterion("compan_id is null"); + return (Criteria) this; + } + + public Criteria andCompanIdIsNotNull() { + addCriterion("compan_id is not null"); + return (Criteria) this; + } + + public Criteria andCompanIdEqualTo(Integer value) { + addCriterion("compan_id =", value, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdNotEqualTo(Integer value) { + addCriterion("compan_id <>", value, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdGreaterThan(Integer value) { + addCriterion("compan_id >", value, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdGreaterThanOrEqualTo(Integer value) { + addCriterion("compan_id >=", value, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdLessThan(Integer value) { + addCriterion("compan_id <", value, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdLessThanOrEqualTo(Integer value) { + addCriterion("compan_id <=", value, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdIn(List values) { + addCriterion("compan_id in", values, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdNotIn(List values) { + addCriterion("compan_id not in", values, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdBetween(Integer value1, Integer value2) { + addCriterion("compan_id between", value1, value2, "companId"); + return (Criteria) this; + } + + public Criteria andCompanIdNotBetween(Integer value1, Integer value2) { + addCriterion("compan_id not between", value1, value2, "companId"); + return (Criteria) this; + } + public Criteria andExt1IsNull() { addCriterion("ext_1 is null"); return (Criteria) this;