From c44344cb1c062a3c9111251d6a8c39f178fff9b0 Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Thu, 10 Jul 2025 17:59:13 +0800 Subject: [PATCH] push --- .../hfkj/dao/EnTransportCompanyCarMapper.java | 29 +++++---- .../dao/EnTransportCompanyCarSqlProvider.java | 14 +++++ .../hfkj/entity/EnTransportCompanyCar.java | 17 ++++++ .../entity/EnTransportCompanyCarExample.java | 61 +++++++++++++++++++ 4 files changed, 108 insertions(+), 13 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarMapper.java b/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarMapper.java index 9c3ca20..1a0c7ac 100644 --- a/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarMapper.java +++ b/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarMapper.java @@ -42,19 +42,19 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper "insert into en_transport_company_car (transport_id, car_no, ", "car_type, credentials_img, ", "person, contact_info, ", - "`status`, create_user, ", - "create_user_name, create_time, ", - "update_user, update_user_name, ", - "update_time, ext_1, ", - "ext_2, ext_3)", + "oil_tank_capacity, `status`, ", + "create_user, create_user_name, ", + "create_time, update_user, ", + "update_user_name, update_time, ", + "ext_1, ext_2, ext_3)", "values (#{transportId,jdbcType=BIGINT}, #{carNo,jdbcType=VARCHAR}, ", "#{carType,jdbcType=INTEGER}, #{credentialsImg,jdbcType=VARCHAR}, ", "#{person,jdbcType=VARCHAR}, #{contactInfo,jdbcType=VARCHAR}, ", - "#{status,jdbcType=INTEGER}, #{createUser,jdbcType=BIGINT}, ", - "#{createUserName,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ", - "#{updateUser,jdbcType=BIGINT}, #{updateUserName,jdbcType=VARCHAR}, ", - "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{oilTankCapacity,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ", + "#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ", + "#{createTime,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=BIGINT}, ", + "#{updateUserName,jdbcType=VARCHAR}, #{updateTime,jdbcType=TIMESTAMP}, ", + "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(EnTransportCompanyCar record); @@ -72,6 +72,7 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper @Result(column="credentials_img", property="credentialsImg", jdbcType=JdbcType.VARCHAR), @Result(column="person", property="person", jdbcType=JdbcType.VARCHAR), @Result(column="contact_info", property="contactInfo", jdbcType=JdbcType.VARCHAR), + @Result(column="oil_tank_capacity", property="oilTankCapacity", jdbcType=JdbcType.DECIMAL), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT), @Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR), @@ -87,9 +88,9 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper @Select({ "select", - "id, transport_id, car_no, car_type, credentials_img, person, contact_info, `status`, ", - "create_user, create_user_name, create_time, update_user, update_user_name, update_time, ", - "ext_1, ext_2, ext_3", + "id, transport_id, car_no, car_type, credentials_img, person, contact_info, oil_tank_capacity, ", + "`status`, create_user, create_user_name, create_time, update_user, update_user_name, ", + "update_time, ext_1, ext_2, ext_3", "from en_transport_company_car", "where id = #{id,jdbcType=BIGINT}" }) @@ -101,6 +102,7 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper @Result(column="credentials_img", property="credentialsImg", jdbcType=JdbcType.VARCHAR), @Result(column="person", property="person", jdbcType=JdbcType.VARCHAR), @Result(column="contact_info", property="contactInfo", jdbcType=JdbcType.VARCHAR), + @Result(column="oil_tank_capacity", property="oilTankCapacity", jdbcType=JdbcType.DECIMAL), @Result(column="status", property="status", jdbcType=JdbcType.INTEGER), @Result(column="create_user", property="createUser", jdbcType=JdbcType.BIGINT), @Result(column="create_user_name", property="createUserName", jdbcType=JdbcType.VARCHAR), @@ -131,6 +133,7 @@ public interface EnTransportCompanyCarMapper extends EnTransportCompanyCarMapper "credentials_img = #{credentialsImg,jdbcType=VARCHAR},", "person = #{person,jdbcType=VARCHAR},", "contact_info = #{contactInfo,jdbcType=VARCHAR},", + "oil_tank_capacity = #{oilTankCapacity,jdbcType=DECIMAL},", "`status` = #{status,jdbcType=INTEGER},", "create_user = #{createUser,jdbcType=BIGINT},", "create_user_name = #{createUserName,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarSqlProvider.java b/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarSqlProvider.java index c55998c..79b3d46 100644 --- a/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/EnTransportCompanyCarSqlProvider.java @@ -52,6 +52,10 @@ public class EnTransportCompanyCarSqlProvider { sql.VALUES("contact_info", "#{contactInfo,jdbcType=VARCHAR}"); } + if (record.getOilTankCapacity() != null) { + sql.VALUES("oil_tank_capacity", "#{oilTankCapacity,jdbcType=DECIMAL}"); + } + if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -108,6 +112,7 @@ public class EnTransportCompanyCarSqlProvider { sql.SELECT("credentials_img"); sql.SELECT("person"); sql.SELECT("contact_info"); + sql.SELECT("oil_tank_capacity"); sql.SELECT("`status`"); sql.SELECT("create_user"); sql.SELECT("create_user_name"); @@ -163,6 +168,10 @@ public class EnTransportCompanyCarSqlProvider { sql.SET("contact_info = #{record.contactInfo,jdbcType=VARCHAR}"); } + if (record.getOilTankCapacity() != null) { + sql.SET("oil_tank_capacity = #{record.oilTankCapacity,jdbcType=DECIMAL}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -218,6 +227,7 @@ public class EnTransportCompanyCarSqlProvider { sql.SET("credentials_img = #{record.credentialsImg,jdbcType=VARCHAR}"); sql.SET("person = #{record.person,jdbcType=VARCHAR}"); sql.SET("contact_info = #{record.contactInfo,jdbcType=VARCHAR}"); + sql.SET("oil_tank_capacity = #{record.oilTankCapacity,jdbcType=DECIMAL}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("create_user = #{record.createUser,jdbcType=BIGINT}"); sql.SET("create_user_name = #{record.createUserName,jdbcType=VARCHAR}"); @@ -262,6 +272,10 @@ public class EnTransportCompanyCarSqlProvider { sql.SET("contact_info = #{contactInfo,jdbcType=VARCHAR}"); } + if (record.getOilTankCapacity() != null) { + sql.SET("oil_tank_capacity = #{oilTankCapacity,jdbcType=DECIMAL}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/EnTransportCompanyCar.java b/service/src/main/java/com/hfkj/entity/EnTransportCompanyCar.java index 7653cf1..754b810 100644 --- a/service/src/main/java/com/hfkj/entity/EnTransportCompanyCar.java +++ b/service/src/main/java/com/hfkj/entity/EnTransportCompanyCar.java @@ -1,6 +1,7 @@ package com.hfkj.entity; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Date; /** @@ -48,6 +49,11 @@ public class EnTransportCompanyCar implements Serializable { */ private String contactInfo; + /** + * 油罐容量 + */ + private BigDecimal oilTankCapacity; + /** * 状态1:上班 2 下班 0 删除 */ @@ -156,6 +162,14 @@ public class EnTransportCompanyCar implements Serializable { this.contactInfo = contactInfo; } + public BigDecimal getOilTankCapacity() { + return oilTankCapacity; + } + + public void setOilTankCapacity(BigDecimal oilTankCapacity) { + this.oilTankCapacity = oilTankCapacity; + } + public Integer getStatus() { return status; } @@ -255,6 +269,7 @@ public class EnTransportCompanyCar implements Serializable { && (this.getCredentialsImg() == null ? other.getCredentialsImg() == null : this.getCredentialsImg().equals(other.getCredentialsImg())) && (this.getPerson() == null ? other.getPerson() == null : this.getPerson().equals(other.getPerson())) && (this.getContactInfo() == null ? other.getContactInfo() == null : this.getContactInfo().equals(other.getContactInfo())) + && (this.getOilTankCapacity() == null ? other.getOilTankCapacity() == null : this.getOilTankCapacity().equals(other.getOilTankCapacity())) && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus())) && (this.getCreateUser() == null ? other.getCreateUser() == null : this.getCreateUser().equals(other.getCreateUser())) && (this.getCreateUserName() == null ? other.getCreateUserName() == null : this.getCreateUserName().equals(other.getCreateUserName())) @@ -278,6 +293,7 @@ public class EnTransportCompanyCar implements Serializable { result = prime * result + ((getCredentialsImg() == null) ? 0 : getCredentialsImg().hashCode()); result = prime * result + ((getPerson() == null) ? 0 : getPerson().hashCode()); result = prime * result + ((getContactInfo() == null) ? 0 : getContactInfo().hashCode()); + result = prime * result + ((getOilTankCapacity() == null) ? 0 : getOilTankCapacity().hashCode()); result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode()); result = prime * result + ((getCreateUser() == null) ? 0 : getCreateUser().hashCode()); result = prime * result + ((getCreateUserName() == null) ? 0 : getCreateUserName().hashCode()); @@ -304,6 +320,7 @@ public class EnTransportCompanyCar implements Serializable { sb.append(", credentialsImg=").append(credentialsImg); sb.append(", person=").append(person); sb.append(", contactInfo=").append(contactInfo); + sb.append(", oilTankCapacity=").append(oilTankCapacity); sb.append(", status=").append(status); sb.append(", createUser=").append(createUser); sb.append(", createUserName=").append(createUserName); diff --git a/service/src/main/java/com/hfkj/entity/EnTransportCompanyCarExample.java b/service/src/main/java/com/hfkj/entity/EnTransportCompanyCarExample.java index c163504..1b8633f 100644 --- a/service/src/main/java/com/hfkj/entity/EnTransportCompanyCarExample.java +++ b/service/src/main/java/com/hfkj/entity/EnTransportCompanyCarExample.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; @@ -585,6 +586,66 @@ public class EnTransportCompanyCarExample { return (Criteria) this; } + public Criteria andOilTankCapacityIsNull() { + addCriterion("oil_tank_capacity is null"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityIsNotNull() { + addCriterion("oil_tank_capacity is not null"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityEqualTo(BigDecimal value) { + addCriterion("oil_tank_capacity =", value, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityNotEqualTo(BigDecimal value) { + addCriterion("oil_tank_capacity <>", value, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityGreaterThan(BigDecimal value) { + addCriterion("oil_tank_capacity >", value, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityGreaterThanOrEqualTo(BigDecimal value) { + addCriterion("oil_tank_capacity >=", value, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityLessThan(BigDecimal value) { + addCriterion("oil_tank_capacity <", value, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityLessThanOrEqualTo(BigDecimal value) { + addCriterion("oil_tank_capacity <=", value, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityIn(List values) { + addCriterion("oil_tank_capacity in", values, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityNotIn(List values) { + addCriterion("oil_tank_capacity not in", values, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("oil_tank_capacity between", value1, value2, "oilTankCapacity"); + return (Criteria) this; + } + + public Criteria andOilTankCapacityNotBetween(BigDecimal value1, BigDecimal value2) { + addCriterion("oil_tank_capacity not between", value1, value2, "oilTankCapacity"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this;