diff --git a/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelMapper.java b/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelMapper.java index b302acc..bb07324 100644 --- a/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelMapper.java +++ b/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelMapper.java @@ -39,13 +39,15 @@ public interface EnSerCompanySgRelMapper extends EnSerCompanySgRelMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into en_ser_company_sg_rel (company_id, segment_id, ", + "insert into en_ser_company_sg_rel (company_id, company_name, ", + "segment_name, segment_id, ", "`status`, create_user, ", "create_user_name, create_time, ", "update_user, update_user_name, ", "update_time, ext_1, ", "ext_2, ext_3)", - "values (#{companyId,jdbcType=BIGINT}, #{segmentId,jdbcType=BIGINT}, ", + "values (#{companyId,jdbcType=BIGINT}, #{companyName,jdbcType=VARCHAR}, ", + "#{segmentName,jdbcType=VARCHAR}, #{segmentId,jdbcType=BIGINT}, ", "#{status,jdbcType=INTEGER}, #{createUser,jdbcType=BIGINT}, ", "#{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateUser,jdbcType=BIGINT}, #{updateUserName,jdbcType=VARCHAR}, ", @@ -63,6 +65,8 @@ public interface EnSerCompanySgRelMapper extends EnSerCompanySgRelMapperExt { @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), + @Result(column="segment_name", property="segmentName", jdbcType=JdbcType.VARCHAR), @Result(column="segment_id", property="segmentId", jdbcType=JdbcType.BIGINT), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT), @@ -79,14 +83,17 @@ public interface EnSerCompanySgRelMapper extends EnSerCompanySgRelMapperExt { @Select({ "select", - "id, company_id, segment_id, `status`, create_user, create_user_name, create_time, ", - "update_user, update_user_name, update_time, ext_1, ext_2, ext_3", + "id, company_id, company_name, segment_name, segment_id, `status`, create_user, ", + "create_user_name, create_time, update_user, update_user_name, update_time, ext_1, ", + "ext_2, ext_3", "from en_ser_company_sg_rel", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="company_id", property="companyId", jdbcType=JdbcType.BIGINT), + @Result(column="company_name", property="companyName", jdbcType=JdbcType.VARCHAR), + @Result(column="segment_name", property="segmentName", jdbcType=JdbcType.VARCHAR), @Result(column="segment_id", property="segmentId", jdbcType=JdbcType.BIGINT), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT), @@ -113,6 +120,8 @@ public interface EnSerCompanySgRelMapper extends EnSerCompanySgRelMapperExt { @Update({ "update en_ser_company_sg_rel", "set company_id = #{companyId,jdbcType=BIGINT},", + "company_name = #{companyName,jdbcType=VARCHAR},", + "segment_name = #{segmentName,jdbcType=VARCHAR},", "segment_id = #{segmentId,jdbcType=BIGINT},", "`status` = #{status,jdbcType=INTEGER},", "create_user = #{createUser,jdbcType=BIGINT},", diff --git a/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelSqlProvider.java b/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelSqlProvider.java index 54d95b1..f04832c 100644 --- a/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/EnSerCompanySgRelSqlProvider.java @@ -32,6 +32,14 @@ public class EnSerCompanySgRelSqlProvider { sql.VALUES("company_id", "#{companyId,jdbcType=BIGINT}"); } + if (record.getCompanyName() != null) { + sql.VALUES("company_name", "#{companyName,jdbcType=VARCHAR}"); + } + + if (record.getSegmentName() != null) { + sql.VALUES("segment_name", "#{segmentName,jdbcType=VARCHAR}"); + } + if (record.getSegmentId() != null) { sql.VALUES("segment_id", "#{segmentId,jdbcType=BIGINT}"); } @@ -87,6 +95,8 @@ public class EnSerCompanySgRelSqlProvider { sql.SELECT("id"); } sql.SELECT("company_id"); + sql.SELECT("company_name"); + sql.SELECT("segment_name"); sql.SELECT("segment_id"); sql.SELECT("`status`"); sql.SELECT("create_user"); @@ -123,6 +133,14 @@ public class EnSerCompanySgRelSqlProvider { sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); } + if (record.getCompanyName() != null) { + sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); + } + + if (record.getSegmentName() != null) { + sql.SET("segment_name = #{record.segmentName,jdbcType=VARCHAR}"); + } + if (record.getSegmentId() != null) { sql.SET("segment_id = #{record.segmentId,jdbcType=BIGINT}"); } @@ -177,6 +195,8 @@ public class EnSerCompanySgRelSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("company_id = #{record.companyId,jdbcType=BIGINT}"); + sql.SET("company_name = #{record.companyName,jdbcType=VARCHAR}"); + sql.SET("segment_name = #{record.segmentName,jdbcType=VARCHAR}"); sql.SET("segment_id = #{record.segmentId,jdbcType=BIGINT}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("create_user = #{record.createUser,jdbcType=BIGINT}"); @@ -202,6 +222,14 @@ public class EnSerCompanySgRelSqlProvider { sql.SET("company_id = #{companyId,jdbcType=BIGINT}"); } + if (record.getCompanyName() != null) { + sql.SET("company_name = #{companyName,jdbcType=VARCHAR}"); + } + + if (record.getSegmentName() != null) { + sql.SET("segment_name = #{segmentName,jdbcType=VARCHAR}"); + } + if (record.getSegmentId() != null) { sql.SET("segment_id = #{segmentId,jdbcType=BIGINT}"); } diff --git a/service/src/main/java/com/hfkj/entity/EnSerCompanySgRel.java b/service/src/main/java/com/hfkj/entity/EnSerCompanySgRel.java index 75629af..2765f37 100644 --- a/service/src/main/java/com/hfkj/entity/EnSerCompanySgRel.java +++ b/service/src/main/java/com/hfkj/entity/EnSerCompanySgRel.java @@ -23,6 +23,16 @@ public class EnSerCompanySgRel implements Serializable { */ private Long companyId; + /** + * 公司名称 + */ + private String companyName; + + /** + * 项目段名称 + */ + private String segmentName; + /** * 项目ID */ @@ -96,6 +106,22 @@ public class EnSerCompanySgRel implements Serializable { this.companyId = companyId; } + public String getCompanyName() { + return companyName; + } + + public void setCompanyName(String companyName) { + this.companyName = companyName; + } + + public String getSegmentName() { + return segmentName; + } + + public void setSegmentName(String segmentName) { + this.segmentName = segmentName; + } + public Long getSegmentId() { return segmentId; } @@ -198,6 +224,8 @@ public class EnSerCompanySgRel implements Serializable { EnSerCompanySgRel other = (EnSerCompanySgRel) that; return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) && (this.getCompanyId() == null ? other.getCompanyId() == null : this.getCompanyId().equals(other.getCompanyId())) + && (this.getCompanyName() == null ? other.getCompanyName() == null : this.getCompanyName().equals(other.getCompanyName())) + && (this.getSegmentName() == null ? other.getSegmentName() == null : this.getSegmentName().equals(other.getSegmentName())) && (this.getSegmentId() == null ? other.getSegmentId() == null : this.getSegmentId().equals(other.getSegmentId())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser())) @@ -217,6 +245,8 @@ public class EnSerCompanySgRel implements Serializable { int result = 1; result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getCompanyId() == null) ? 0 : getCompanyId().hashCode()); + result = prime * result + ((getCompanyName() == null) ? 0 : getCompanyName().hashCode()); + result = prime * result + ((getSegmentName() == null) ? 0 : getSegmentName().hashCode()); result = prime * result + ((getSegmentId() == null) ? 0 : getSegmentId().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getCreateUser() == null) ? 0 : getCreateUser().hashCode()); @@ -239,6 +269,8 @@ public class EnSerCompanySgRel implements Serializable { sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); sb.append(", companyId=").append(companyId); + sb.append(", companyName=").append(companyName); + sb.append(", segmentName=").append(segmentName); sb.append(", segmentId=").append(segmentId); sb.append(", status=").append(status); sb.append(", createUser=").append(createUser); diff --git a/service/src/main/java/com/hfkj/entity/EnSerCompanySgRelExample.java b/service/src/main/java/com/hfkj/entity/EnSerCompanySgRelExample.java index e34ced9..8d15f8b 100644 --- a/service/src/main/java/com/hfkj/entity/EnSerCompanySgRelExample.java +++ b/service/src/main/java/com/hfkj/entity/EnSerCompanySgRelExample.java @@ -245,6 +245,146 @@ public class EnSerCompanySgRelExample { return (Criteria) this; } + public Criteria andCompanyNameIsNull() { + addCriterion("company_name is null"); + return (Criteria) this; + } + + public Criteria andCompanyNameIsNotNull() { + addCriterion("company_name is not null"); + return (Criteria) this; + } + + public Criteria andCompanyNameEqualTo(String value) { + addCriterion("company_name =", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotEqualTo(String value) { + addCriterion("company_name <>", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThan(String value) { + addCriterion("company_name >", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameGreaterThanOrEqualTo(String value) { + addCriterion("company_name >=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThan(String value) { + addCriterion("company_name <", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLessThanOrEqualTo(String value) { + addCriterion("company_name <=", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameLike(String value) { + addCriterion("company_name like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotLike(String value) { + addCriterion("company_name not like", value, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameIn(List values) { + addCriterion("company_name in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotIn(List values) { + addCriterion("company_name not in", values, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameBetween(String value1, String value2) { + addCriterion("company_name between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andCompanyNameNotBetween(String value1, String value2) { + addCriterion("company_name not between", value1, value2, "companyName"); + return (Criteria) this; + } + + public Criteria andSegmentNameIsNull() { + addCriterion("segment_name is null"); + return (Criteria) this; + } + + public Criteria andSegmentNameIsNotNull() { + addCriterion("segment_name is not null"); + return (Criteria) this; + } + + public Criteria andSegmentNameEqualTo(String value) { + addCriterion("segment_name =", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameNotEqualTo(String value) { + addCriterion("segment_name <>", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameGreaterThan(String value) { + addCriterion("segment_name >", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameGreaterThanOrEqualTo(String value) { + addCriterion("segment_name >=", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameLessThan(String value) { + addCriterion("segment_name <", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameLessThanOrEqualTo(String value) { + addCriterion("segment_name <=", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameLike(String value) { + addCriterion("segment_name like", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameNotLike(String value) { + addCriterion("segment_name not like", value, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameIn(List values) { + addCriterion("segment_name in", values, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameNotIn(List values) { + addCriterion("segment_name not in", values, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameBetween(String value1, String value2) { + addCriterion("segment_name between", value1, value2, "segmentName"); + return (Criteria) this; + } + + public Criteria andSegmentNameNotBetween(String value1, String value2) { + addCriterion("segment_name not between", value1, value2, "segmentName"); + return (Criteria) this; + } + public Criteria andSegmentIdIsNull() { addCriterion("segment_id is null"); return (Criteria) this;