Compare commits

...

2 Commits

Author SHA1 Message Date
袁野 2338a969c1 1 2 weeks ago
袁野 c02d4b85b9 1 2 weeks ago
  1. 24
      service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java
  2. 14
      service/src/main/java/com/hfkj/dao/EnOilManagementSqlProvider.java
  3. 16
      service/src/main/java/com/hfkj/entity/EnOilManagement.java
  4. 60
      service/src/main/java/com/hfkj/entity/EnOilManagementExample.java

@ -39,18 +39,26 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
int deleteByPrimaryKey(Long id); int deleteByPrimaryKey(Long id);
@Insert({ @Insert({
"insert into en_oil_management (`type`, transport_car_id, ", "insert into en_oil_management (oil_depots_id, `type`, ",
"transport_car_no, oil_type, ", "transport_car_id, transport_car_no, ",
"supplier, num, before_num, ", "oil_type, supplier, ",
"num, before_num, ",
"change_num, remark, ", "change_num, remark, ",
"img, sign_img, `status`, ", "img, sign_img, `status`, ",
"create_user, create_user_name, ", "create_user, create_user_name, ",
"create_time, update_user, ", "create_time, update_user, ",
"update_user_name, update_time, ", "update_user_name, update_time, ",
"ext_1, ext_2, ext_3)", "ext_1, ext_2, ext_3)",
<<<<<<< HEAD
"values (#{oilDepotsId,jdbcType=BIGINT}, #{type,jdbcType=INTEGER}, ",
"#{transportCarId,jdbcType=BIGINT}, #{transportCarNo,jdbcType=VARCHAR}, ",
"#{oilType,jdbcType=INTEGER}, #{supplier,jdbcType=VARCHAR}, ",
"#{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ",
=======
"values (#{type,jdbcType=INTEGER}, #{transportCarId,jdbcType=BIGINT}, ", "values (#{type,jdbcType=INTEGER}, #{transportCarId,jdbcType=BIGINT}, ",
"#{transportCarNo,jdbcType=VARCHAR}, #{oilType,jdbcType=INTEGER}, ", "#{transportCarNo,jdbcType=VARCHAR}, #{oilType,jdbcType=INTEGER}, ",
"#{supplier,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ", "#{supplier,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ",
>>>>>>> 0d53478356273b9edc2a9c765bde3c6ddf2ac177
"#{changeNum,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, ", "#{changeNum,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, ",
"#{img,jdbcType=VARCHAR}, #{signImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ", "#{img,jdbcType=VARCHAR}, #{signImg,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, ",
"#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ", "#{createUser,jdbcType=BIGINT}, #{createUserName,jdbcType=VARCHAR}, ",
@ -68,6 +76,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
@SelectProvider(type=EnOilManagementSqlProvider.class, method="selectByExample") @SelectProvider(type=EnOilManagementSqlProvider.class, method="selectByExample")
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="oil_depots_id", property="oilDepotsId", jdbcType=JdbcType.BIGINT),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT), @Result(column="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT),
@Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR), @Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR),
@ -94,14 +103,20 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
@Select({ @Select({
"select", "select",
<<<<<<< HEAD
"id, oil_depots_id, `type`, transport_car_id, transport_car_no, oil_type, supplier, ",
"num, before_num, change_num, remark, img, sign_img, `status`, create_user, create_user_name, ",
=======
"id, `type`, transport_car_id, transport_car_no, oil_type, supplier, num, before_num, ", "id, `type`, transport_car_id, transport_car_no, oil_type, supplier, num, before_num, ",
"change_num, remark, img, sign_img, `status`, create_user, create_user_name, ", "change_num, remark, img, sign_img, `status`, create_user, create_user_name, ",
>>>>>>> 0d53478356273b9edc2a9c765bde3c6ddf2ac177
"create_time, update_user, update_user_name, update_time, ext_1, ext_2, ext_3", "create_time, update_user, update_user_name, update_time, ext_1, ext_2, ext_3",
"from en_oil_management", "from en_oil_management",
"where id = #{id,jdbcType=BIGINT}" "where id = #{id,jdbcType=BIGINT}"
}) })
@Results({ @Results({
@Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true), @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
@Result(column="oil_depots_id", property="oilDepotsId", jdbcType=JdbcType.BIGINT),
@Result(column="type", property="type", jdbcType=JdbcType.INTEGER), @Result(column="type", property="type", jdbcType=JdbcType.INTEGER),
@Result(column="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT), @Result(column="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT),
@Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR), @Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR),
@ -137,7 +152,8 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt {
@Update({ @Update({
"update en_oil_management", "update en_oil_management",
"set `type` = #{type,jdbcType=INTEGER},", "set oil_depots_id = #{oilDepotsId,jdbcType=BIGINT},",
"`type` = #{type,jdbcType=INTEGER},",
"transport_car_id = #{transportCarId,jdbcType=BIGINT},", "transport_car_id = #{transportCarId,jdbcType=BIGINT},",
"transport_car_no = #{transportCarNo,jdbcType=VARCHAR},", "transport_car_no = #{transportCarNo,jdbcType=VARCHAR},",
"oil_type = #{oilType,jdbcType=INTEGER},", "oil_type = #{oilType,jdbcType=INTEGER},",

@ -28,6 +28,10 @@ public class EnOilManagementSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.INSERT_INTO("en_oil_management"); sql.INSERT_INTO("en_oil_management");
if (record.getOilDepotsId() != null) {
sql.VALUES("oil_depots_id", "#{oilDepotsId,jdbcType=BIGINT}");
}
if (record.getType() != null) { if (record.getType() != null) {
sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); sql.VALUES("`type`", "#{type,jdbcType=INTEGER}");
} }
@ -122,6 +126,7 @@ public class EnOilManagementSqlProvider {
} else { } else {
sql.SELECT("id"); sql.SELECT("id");
} }
sql.SELECT("oil_depots_id");
sql.SELECT("`type`"); sql.SELECT("`type`");
sql.SELECT("transport_car_id"); sql.SELECT("transport_car_id");
sql.SELECT("transport_car_no"); sql.SELECT("transport_car_no");
@ -164,6 +169,10 @@ public class EnOilManagementSqlProvider {
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
} }
if (record.getOilDepotsId() != null) {
sql.SET("oil_depots_id = #{record.oilDepotsId,jdbcType=BIGINT}");
}
if (record.getType() != null) { if (record.getType() != null) {
sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
} }
@ -257,6 +266,7 @@ public class EnOilManagementSqlProvider {
sql.UPDATE("en_oil_management"); sql.UPDATE("en_oil_management");
sql.SET("id = #{record.id,jdbcType=BIGINT}"); sql.SET("id = #{record.id,jdbcType=BIGINT}");
sql.SET("oil_depots_id = #{record.oilDepotsId,jdbcType=BIGINT}");
sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); sql.SET("`type` = #{record.type,jdbcType=INTEGER}");
sql.SET("transport_car_id = #{record.transportCarId,jdbcType=BIGINT}"); sql.SET("transport_car_id = #{record.transportCarId,jdbcType=BIGINT}");
sql.SET("transport_car_no = #{record.transportCarNo,jdbcType=VARCHAR}"); sql.SET("transport_car_no = #{record.transportCarNo,jdbcType=VARCHAR}");
@ -288,6 +298,10 @@ public class EnOilManagementSqlProvider {
SQL sql = new SQL(); SQL sql = new SQL();
sql.UPDATE("en_oil_management"); sql.UPDATE("en_oil_management");
if (record.getOilDepotsId() != null) {
sql.SET("oil_depots_id = #{oilDepotsId,jdbcType=BIGINT}");
}
if (record.getType() != null) { if (record.getType() != null) {
sql.SET("`type` = #{type,jdbcType=INTEGER}"); sql.SET("`type` = #{type,jdbcType=INTEGER}");
} }

@ -19,6 +19,11 @@ public class EnOilManagement implements Serializable {
*/ */
private Long id; private Long id;
/**
* 油库ID
*/
private Long oilDepotsId;
/** /**
* 类型1:出库 2:入库 * 类型1:出库 2:入库
*/ */
@ -134,6 +139,14 @@ public class EnOilManagement implements Serializable {
this.id = id; this.id = id;
} }
public Long getOilDepotsId() {
return oilDepotsId;
}
public void setOilDepotsId(Long oilDepotsId) {
this.oilDepotsId = oilDepotsId;
}
public Integer getType() { public Integer getType() {
return type; return type;
} }
@ -315,6 +328,7 @@ public class EnOilManagement implements Serializable {
} }
EnOilManagement other = (EnOilManagement) that; EnOilManagement other = (EnOilManagement) that;
return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId())) return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
&& (this.getOilDepotsId() == null ? other.getOilDepotsId() == null : this.getOilDepotsId().equals(other.getOilDepotsId()))
&& (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType())) && (this.getType() == null ? other.getType() == null : this.getType().equals(other.getType()))
&& (this.getTransportCarId() == null ? other.getTransportCarId() == null : this.getTransportCarId().equals(other.getTransportCarId())) && (this.getTransportCarId() == null ? other.getTransportCarId() == null : this.getTransportCarId().equals(other.getTransportCarId()))
&& (this.getTransportCarNo() == null ? other.getTransportCarNo() == null : this.getTransportCarNo().equals(other.getTransportCarNo())) && (this.getTransportCarNo() == null ? other.getTransportCarNo() == null : this.getTransportCarNo().equals(other.getTransportCarNo()))
@ -343,6 +357,7 @@ public class EnOilManagement implements Serializable {
final int prime = 31; final int prime = 31;
int result = 1; int result = 1;
result = prime * result + ((getId() == null) ? 0 : getId().hashCode()); result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + ((getOilDepotsId() == null) ? 0 : getOilDepotsId().hashCode());
result = prime * result + ((getType() == null) ? 0 : getType().hashCode()); result = prime * result + ((getType() == null) ? 0 : getType().hashCode());
result = prime * result + ((getTransportCarId() == null) ? 0 : getTransportCarId().hashCode()); result = prime * result + ((getTransportCarId() == null) ? 0 : getTransportCarId().hashCode());
result = prime * result + ((getTransportCarNo() == null) ? 0 : getTransportCarNo().hashCode()); result = prime * result + ((getTransportCarNo() == null) ? 0 : getTransportCarNo().hashCode());
@ -374,6 +389,7 @@ public class EnOilManagement implements Serializable {
sb.append(" ["); sb.append(" [");
sb.append("Hash = ").append(hashCode()); sb.append("Hash = ").append(hashCode());
sb.append(", id=").append(id); sb.append(", id=").append(id);
sb.append(", oilDepotsId=").append(oilDepotsId);
sb.append(", type=").append(type); sb.append(", type=").append(type);
sb.append(", transportCarId=").append(transportCarId); sb.append(", transportCarId=").append(transportCarId);
sb.append(", transportCarNo=").append(transportCarNo); sb.append(", transportCarNo=").append(transportCarNo);

@ -186,6 +186,66 @@ public class EnOilManagementExample {
return (Criteria) this; return (Criteria) this;
} }
public Criteria andOilDepotsIdIsNull() {
addCriterion("oil_depots_id is null");
return (Criteria) this;
}
public Criteria andOilDepotsIdIsNotNull() {
addCriterion("oil_depots_id is not null");
return (Criteria) this;
}
public Criteria andOilDepotsIdEqualTo(Long value) {
addCriterion("oil_depots_id =", value, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdNotEqualTo(Long value) {
addCriterion("oil_depots_id <>", value, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdGreaterThan(Long value) {
addCriterion("oil_depots_id >", value, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdGreaterThanOrEqualTo(Long value) {
addCriterion("oil_depots_id >=", value, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdLessThan(Long value) {
addCriterion("oil_depots_id <", value, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdLessThanOrEqualTo(Long value) {
addCriterion("oil_depots_id <=", value, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdIn(List<Long> values) {
addCriterion("oil_depots_id in", values, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdNotIn(List<Long> values) {
addCriterion("oil_depots_id not in", values, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdBetween(Long value1, Long value2) {
addCriterion("oil_depots_id between", value1, value2, "oilDepotsId");
return (Criteria) this;
}
public Criteria andOilDepotsIdNotBetween(Long value1, Long value2) {
addCriterion("oil_depots_id not between", value1, value2, "oilDepotsId");
return (Criteria) this;
}
public Criteria andTypeIsNull() { public Criteria andTypeIsNull() {
addCriterion("`type` is null"); addCriterion("`type` is null");
return (Criteria) this; return (Criteria) this;

Loading…
Cancel
Save