From c02d4b85b9b65a70c74e4ab02bfb50c6dc4e55dd Mon Sep 17 00:00:00 2001 From: YuanYe <418471657@qq.com> Date: Thu, 31 Jul 2025 14:05:46 +0800 Subject: [PATCH] 1 --- .../com/hfkj/dao/EnOilManagementMapper.java | 48 ++++--- .../hfkj/dao/EnOilManagementSqlProvider.java | 28 ++++ .../java/com/hfkj/entity/EnOilManagement.java | 34 ++++- .../hfkj/entity/EnOilManagementExample.java | 130 ++++++++++++++++++ 4 files changed, 219 insertions(+), 21 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java b/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java index 5bf01f5..01de7cd 100644 --- a/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java +++ b/service/src/main/java/com/hfkj/dao/EnOilManagementMapper.java @@ -39,24 +39,26 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { int deleteByPrimaryKey(Long id); @Insert({ - "insert into en_oil_management (`type`, transport_car_id, ", - "transport_car_no, oil_type, ", - "supplier, num, before_num, ", + "insert into en_oil_management (oil_depots_id, `type`, ", + "transport_car_id, transport_car_no, ", + "oil_type, supplier, ", + "num, before_num, ", "change_num, remark, ", - "img, `status`, create_user, ", - "create_user_name, create_time, ", - "update_user, update_user_name, ", - "update_time, ext_1, ", - "ext_2, ext_3)", - "values (#{type,jdbcType=INTEGER}, #{transportCarId,jdbcType=BIGINT}, ", - "#{transportCarNo,jdbcType=VARCHAR}, #{oilType,jdbcType=INTEGER}, ", - "#{supplier,jdbcType=VARCHAR}, #{num,jdbcType=DECIMAL}, #{beforeNum,jdbcType=DECIMAL}, ", + "img, sign_img, `status`, ", + "create_user, create_user_name, ", + "create_time, update_user, ", + "update_user_name, update_time, ", + "ext_1, ext_2, ext_3)", + "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}, ", "#{changeNum,jdbcType=DECIMAL}, #{remark,jdbcType=VARCHAR}, ", - "#{img,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})" + "#{img,jdbcType=VARCHAR}, #{signImg,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})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(EnOilManagement record); @@ -68,6 +70,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { @SelectProvider(type=EnOilManagementSqlProvider.class, method="selectByExample") @Results({ @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="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT), @Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR), @@ -78,6 +81,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { @Result(column="change_num", property="changeNum", jdbcType=JdbcType.DECIMAL), @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), + @Result(column="sign_img", property="signImg", jdbcType=JdbcType.VARCHAR), @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), @@ -93,14 +97,15 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { @Select({ "select", - "id, `type`, transport_car_id, transport_car_no, oil_type, supplier, num, before_num, ", - "change_num, remark, img, `status`, create_user, create_user_name, create_time, ", - "update_user, update_user_name, update_time, ext_1, ext_2, ext_3", + "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, ", + "create_time, update_user, update_user_name, update_time, ext_1, ext_2, ext_3", "from en_oil_management", "where id = #{id,jdbcType=BIGINT}" }) @Results({ @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="transport_car_id", property="transportCarId", jdbcType=JdbcType.BIGINT), @Result(column="transport_car_no", property="transportCarNo", jdbcType=JdbcType.VARCHAR), @@ -111,6 +116,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { @Result(column="change_num", property="changeNum", jdbcType=JdbcType.DECIMAL), @Result(column="remark", property="remark", jdbcType=JdbcType.VARCHAR), @Result(column="img", property="img", jdbcType=JdbcType.VARCHAR), + @Result(column="sign_img", property="signImg", jdbcType=JdbcType.VARCHAR), @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), @@ -135,7 +141,8 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { @Update({ "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_no = #{transportCarNo,jdbcType=VARCHAR},", "oil_type = #{oilType,jdbcType=INTEGER},", @@ -145,6 +152,7 @@ public interface EnOilManagementMapper extends EnOilManagementMapperExt { "change_num = #{changeNum,jdbcType=DECIMAL},", "remark = #{remark,jdbcType=VARCHAR},", "img = #{img,jdbcType=VARCHAR},", + "sign_img = #{signImg,jdbcType=VARCHAR},", "`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/EnOilManagementSqlProvider.java b/service/src/main/java/com/hfkj/dao/EnOilManagementSqlProvider.java index 29715f4..36cbc50 100644 --- a/service/src/main/java/com/hfkj/dao/EnOilManagementSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/EnOilManagementSqlProvider.java @@ -28,6 +28,10 @@ public class EnOilManagementSqlProvider { SQL sql = new SQL(); sql.INSERT_INTO("en_oil_management"); + if (record.getOilDepotsId() != null) { + sql.VALUES("oil_depots_id", "#{oilDepotsId,jdbcType=BIGINT}"); + } + if (record.getType() != null) { sql.VALUES("`type`", "#{type,jdbcType=INTEGER}"); } @@ -68,6 +72,10 @@ public class EnOilManagementSqlProvider { sql.VALUES("img", "#{img,jdbcType=VARCHAR}"); } + if (record.getSignImg() != null) { + sql.VALUES("sign_img", "#{signImg,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.VALUES("`status`", "#{status,jdbcType=INTEGER}"); } @@ -118,6 +126,7 @@ public class EnOilManagementSqlProvider { } else { sql.SELECT("id"); } + sql.SELECT("oil_depots_id"); sql.SELECT("`type`"); sql.SELECT("transport_car_id"); sql.SELECT("transport_car_no"); @@ -128,6 +137,7 @@ public class EnOilManagementSqlProvider { sql.SELECT("change_num"); sql.SELECT("remark"); sql.SELECT("img"); + sql.SELECT("sign_img"); sql.SELECT("`status`"); sql.SELECT("create_user"); sql.SELECT("create_user_name"); @@ -159,6 +169,10 @@ public class EnOilManagementSqlProvider { sql.SET("id = #{record.id,jdbcType=BIGINT}"); } + if (record.getOilDepotsId() != null) { + sql.SET("oil_depots_id = #{record.oilDepotsId,jdbcType=BIGINT}"); + } + if (record.getType() != null) { sql.SET("`type` = #{record.type,jdbcType=INTEGER}"); } @@ -199,6 +213,10 @@ public class EnOilManagementSqlProvider { sql.SET("img = #{record.img,jdbcType=VARCHAR}"); } + if (record.getSignImg() != null) { + sql.SET("sign_img = #{record.signImg,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); } @@ -248,6 +266,7 @@ public class EnOilManagementSqlProvider { sql.UPDATE("en_oil_management"); 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("transport_car_id = #{record.transportCarId,jdbcType=BIGINT}"); sql.SET("transport_car_no = #{record.transportCarNo,jdbcType=VARCHAR}"); @@ -258,6 +277,7 @@ public class EnOilManagementSqlProvider { sql.SET("change_num = #{record.changeNum,jdbcType=DECIMAL}"); sql.SET("remark = #{record.remark,jdbcType=VARCHAR}"); sql.SET("img = #{record.img,jdbcType=VARCHAR}"); + sql.SET("sign_img = #{record.signImg,jdbcType=VARCHAR}"); sql.SET("`status` = #{record.status,jdbcType=INTEGER}"); sql.SET("create_user = #{record.createUser,jdbcType=BIGINT}"); sql.SET("create_user_name = #{record.createUserName,jdbcType=VARCHAR}"); @@ -278,6 +298,10 @@ public class EnOilManagementSqlProvider { SQL sql = new SQL(); sql.UPDATE("en_oil_management"); + if (record.getOilDepotsId() != null) { + sql.SET("oil_depots_id = #{oilDepotsId,jdbcType=BIGINT}"); + } + if (record.getType() != null) { sql.SET("`type` = #{type,jdbcType=INTEGER}"); } @@ -318,6 +342,10 @@ public class EnOilManagementSqlProvider { sql.SET("img = #{img,jdbcType=VARCHAR}"); } + if (record.getSignImg() != null) { + sql.SET("sign_img = #{signImg,jdbcType=VARCHAR}"); + } + if (record.getStatus() != null) { sql.SET("`status` = #{status,jdbcType=INTEGER}"); } diff --git a/service/src/main/java/com/hfkj/entity/EnOilManagement.java b/service/src/main/java/com/hfkj/entity/EnOilManagement.java index 67ec378..b5dafd6 100644 --- a/service/src/main/java/com/hfkj/entity/EnOilManagement.java +++ b/service/src/main/java/com/hfkj/entity/EnOilManagement.java @@ -19,6 +19,11 @@ public class EnOilManagement implements Serializable { */ private Long id; + /** + * 油库ID + */ + private Long oilDepotsId; + /** * 类型1:出库 2:入库 */ @@ -35,7 +40,7 @@ public class EnOilManagement implements Serializable { private String transportCarNo; /** - * 油品类型:1 柴油 2:汽油 + * 油品类型:1柴油 2:汽油 */ private Integer oilType; @@ -69,6 +74,11 @@ public class EnOilManagement implements Serializable { */ private String img; + /** + * 签名图片 + */ + private String signImg; + /** * 状态 */ @@ -129,6 +139,14 @@ public class EnOilManagement implements Serializable { this.id = id; } + public Long getOilDepotsId() { + return oilDepotsId; + } + + public void setOilDepotsId(Long oilDepotsId) { + this.oilDepotsId = oilDepotsId; + } + public Integer getType() { return type; } @@ -209,6 +227,14 @@ public class EnOilManagement implements Serializable { this.img = img; } + public String getSignImg() { + return signImg; + } + + public void setSignImg(String signImg) { + this.signImg = signImg; + } + public Integer getStatus() { return status; } @@ -302,6 +328,7 @@ public class EnOilManagement implements Serializable { } EnOilManagement other = (EnOilManagement) that; 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.getTransportCarId() == null ? other.getTransportCarId() == null : this.getTransportCarId().equals(other.getTransportCarId())) && (this.getTransportCarNo() == null ? other.getTransportCarNo() == null : this.getTransportCarNo().equals(other.getTransportCarNo())) @@ -312,6 +339,7 @@ public class EnOilManagement implements Serializable { && (this.getChangeNum() == null ? other.getChangeNum() == null : this.getChangeNum().equals(other.getChangeNum())) && (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark())) && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg())) + && (this.getSignImg() == null ? other.getSignImg() == null : this.getSignImg().equals(other.getSignImg())) && (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())) @@ -329,6 +357,7 @@ public class EnOilManagement implements Serializable { final int prime = 31; int result = 1; 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 + ((getTransportCarId() == null) ? 0 : getTransportCarId().hashCode()); result = prime * result + ((getTransportCarNo() == null) ? 0 : getTransportCarNo().hashCode()); @@ -339,6 +368,7 @@ public class EnOilManagement implements Serializable { result = prime * result + ((getChangeNum() == null) ? 0 : getChangeNum().hashCode()); result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode()); result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode()); + result = prime * result + ((getSignImg() == null) ? 0 : getSignImg().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()); @@ -359,6 +389,7 @@ public class EnOilManagement implements Serializable { sb.append(" ["); sb.append("Hash = ").append(hashCode()); sb.append(", id=").append(id); + sb.append(", oilDepotsId=").append(oilDepotsId); sb.append(", type=").append(type); sb.append(", transportCarId=").append(transportCarId); sb.append(", transportCarNo=").append(transportCarNo); @@ -369,6 +400,7 @@ public class EnOilManagement implements Serializable { sb.append(", changeNum=").append(changeNum); sb.append(", remark=").append(remark); sb.append(", img=").append(img); + sb.append(", signImg=").append(signImg); 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/EnOilManagementExample.java b/service/src/main/java/com/hfkj/entity/EnOilManagementExample.java index d458ac8..97703c2 100644 --- a/service/src/main/java/com/hfkj/entity/EnOilManagementExample.java +++ b/service/src/main/java/com/hfkj/entity/EnOilManagementExample.java @@ -186,6 +186,66 @@ public class EnOilManagementExample { 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 values) { + addCriterion("oil_depots_id in", values, "oilDepotsId"); + return (Criteria) this; + } + + public Criteria andOilDepotsIdNotIn(List 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() { addCriterion("`type` is null"); return (Criteria) this; @@ -826,6 +886,76 @@ public class EnOilManagementExample { return (Criteria) this; } + public Criteria andSignImgIsNull() { + addCriterion("sign_img is null"); + return (Criteria) this; + } + + public Criteria andSignImgIsNotNull() { + addCriterion("sign_img is not null"); + return (Criteria) this; + } + + public Criteria andSignImgEqualTo(String value) { + addCriterion("sign_img =", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgNotEqualTo(String value) { + addCriterion("sign_img <>", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgGreaterThan(String value) { + addCriterion("sign_img >", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgGreaterThanOrEqualTo(String value) { + addCriterion("sign_img >=", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgLessThan(String value) { + addCriterion("sign_img <", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgLessThanOrEqualTo(String value) { + addCriterion("sign_img <=", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgLike(String value) { + addCriterion("sign_img like", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgNotLike(String value) { + addCriterion("sign_img not like", value, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgIn(List values) { + addCriterion("sign_img in", values, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgNotIn(List values) { + addCriterion("sign_img not in", values, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgBetween(String value1, String value2) { + addCriterion("sign_img between", value1, value2, "signImg"); + return (Criteria) this; + } + + public Criteria andSignImgNotBetween(String value1, String value2) { + addCriterion("sign_img not between", value1, value2, "signImg"); + return (Criteria) this; + } + public Criteria andStatusIsNull() { addCriterion("`status` is null"); return (Criteria) this;