1

service/src/main/java/com/hfkj/dao/GoodsTypeMapper.java

@@ -42,13 +42,13 @@ public interface GoodsTypeMapper extends GoodsTypeMapperExt {
         "insert into goods_type (parent_id, title, ",
         "business_type, img_url, ",
         "create_time, update_time, ",
-        "`status`, sort, op_id, ",
+        "sort, `status`, op_id, ",
         "op_name, ext_1, ext_2, ",
         "ext_3)",
         "values (#{parentId,jdbcType=BIGINT}, #{title,jdbcType=VARCHAR}, ",
         "#{businessType,jdbcType=INTEGER}, #{imgUrl,jdbcType=VARCHAR}, ",
         "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
-        "#{status,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, ",
+        "#{sort,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{opId,jdbcType=BIGINT}, ",
         "#{opName,jdbcType=VARCHAR}, #{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, ",
         "#{ext3,jdbcType=VARCHAR})"
     })
@@ -68,8 +68,8 @@ public interface GoodsTypeMapper extends GoodsTypeMapperExt {
         @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
         @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -80,8 +80,8 @@ public interface GoodsTypeMapper extends GoodsTypeMapperExt {
 
     @Select({
         "select",
-        "id, parent_id, title, business_type, img_url, create_time, update_time, `status`, ",
+        "id, parent_id, title, business_type, img_url, create_time, update_time, sort, ",
-        "sort, op_id, op_name, ext_1, ext_2, ext_3",
+        "`status`, op_id, op_name, ext_1, ext_2, ext_3",
         "from goods_type",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -93,8 +93,8 @@ public interface GoodsTypeMapper extends GoodsTypeMapperExt {
         @Result(column="img_url", property="imgUrl", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
-        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="sort", property="sort", jdbcType=JdbcType.INTEGER),
+        @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="op_id", property="opId", jdbcType=JdbcType.BIGINT),
         @Result(column="op_name", property="opName", jdbcType=JdbcType.VARCHAR),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -120,8 +120,8 @@ public interface GoodsTypeMapper extends GoodsTypeMapperExt {
           "img_url = #{imgUrl,jdbcType=VARCHAR},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",
-          "`status` = #{status,jdbcType=INTEGER},",
           "sort = #{sort,jdbcType=INTEGER},",
+          "`status` = #{status,jdbcType=INTEGER},",
           "op_id = #{opId,jdbcType=BIGINT},",
           "op_name = #{opName,jdbcType=VARCHAR},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",

service/src/main/java/com/hfkj/dao/GoodsTypeSqlProvider.java

@@ -52,14 +52,14 @@ public class GoodsTypeSqlProvider {
             sql.VALUES("update_time", "#{updateTime,jdbcType=TIMESTAMP}");
         }
         
-        if (record.getStatus() != null) {
-            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
-        }
-        
         if (record.getSort() != null) {
             sql.VALUES("sort", "#{sort,jdbcType=INTEGER}");
         }
         
+        if (record.getStatus() != null) {
+            sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
+        }
+        
         if (record.getOpId() != null) {
             sql.VALUES("op_id", "#{opId,jdbcType=BIGINT}");
         }
@@ -96,8 +96,8 @@ public class GoodsTypeSqlProvider {
         sql.SELECT("img_url");
         sql.SELECT("create_time");
         sql.SELECT("update_time");
-        sql.SELECT("`status`");
         sql.SELECT("sort");
+        sql.SELECT("`status`");
         sql.SELECT("op_id");
         sql.SELECT("op_name");
         sql.SELECT("ext_1");
@@ -148,14 +148,14 @@ public class GoodsTypeSqlProvider {
             sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
         }
         
-        if (record.getStatus() != null) {
-            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
-        }
-        
         if (record.getSort() != null) {
             sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
         }
         
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
+        }
+        
         if (record.getOpId() != null) {
             sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
         }
@@ -191,8 +191,8 @@ public class GoodsTypeSqlProvider {
         sql.SET("img_url = #{record.imgUrl,jdbcType=VARCHAR}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
-        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("sort = #{record.sort,jdbcType=INTEGER}");
+        sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("op_id = #{record.opId,jdbcType=BIGINT}");
         sql.SET("op_name = #{record.opName,jdbcType=VARCHAR}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@@ -232,14 +232,14 @@ public class GoodsTypeSqlProvider {
             sql.SET("update_time = #{updateTime,jdbcType=TIMESTAMP}");
         }
         
-        if (record.getStatus() != null) {
-            sql.SET("`status` = #{status,jdbcType=INTEGER}");
-        }
-        
         if (record.getSort() != null) {
             sql.SET("sort = #{sort,jdbcType=INTEGER}");
         }
         
+        if (record.getStatus() != null) {
+            sql.SET("`status` = #{status,jdbcType=INTEGER}");
+        }
+        
         if (record.getOpId() != null) {
             sql.SET("op_id = #{opId,jdbcType=BIGINT}");
         }

service/src/main/java/com/hfkj/entity/GoodsType.java

@@ -49,14 +49,14 @@ public class GoodsType implements Serializable {
     private Date updateTime;
 
     /**
-     * 状态 1：正常 0 删除
+     * 排序
      */
-    private Integer status;
+    private Integer sort;
 
     /**
-     * 排序
+     * 状态 1：正常 0 删除
      */
-    private Integer sort;
+    private Integer status;
 
     /**
      * 操作人
@@ -141,14 +141,6 @@ public class GoodsType implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
     public Integer getSort() {
         return sort;
     }
@@ -157,6 +149,14 @@ public class GoodsType implements Serializable {
         this.sort = sort;
     }
 
+    public Integer getStatus() {
+        return status;
+    }
+
+    public void setStatus(Integer status) {
+        this.status = status;
+    }
+
     public Long getOpId() {
         return opId;
     }
@@ -216,8 +216,8 @@ public class GoodsType implements Serializable {
             && (this.getImgUrl() == null ? other.getImgUrl() == null : this.getImgUrl().equals(other.getImgUrl()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getSort() == null ? other.getSort() == null : this.getSort().equals(other.getSort()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getOpId() == null ? other.getOpId() == null : this.getOpId().equals(other.getOpId()))
             && (this.getOpName() == null ? other.getOpName() == null : this.getOpName().equals(other.getOpName()))
             && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@@ -236,8 +236,8 @@ public class GoodsType implements Serializable {
         result = prime * result + ((getImgUrl() == null) ? 0 : getImgUrl().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getSort() == null) ? 0 : getSort().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getOpId() == null) ? 0 : getOpId().hashCode());
         result = prime * result + ((getOpName() == null) ? 0 : getOpName().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@@ -259,8 +259,8 @@ public class GoodsType implements Serializable {
         sb.append(", imgUrl=").append(imgUrl);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
-        sb.append(", status=").append(status);
         sb.append(", sort=").append(sort);
+        sb.append(", status=").append(status);
         sb.append(", opId=").append(opId);
         sb.append(", opName=").append(opName);
         sb.append(", ext1=").append(ext1);

service/src/main/java/com/hfkj/entity/GoodsTypeExample.java

@@ -565,123 +565,123 @@ public class GoodsTypeExample {
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNull() {
+        public Criteria andSortIsNull() {
-            addCriterion("`status` is null");
+            addCriterion("sort is null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIsNotNull() {
+        public Criteria andSortIsNotNull() {
-            addCriterion("`status` is not null");
+            addCriterion("sort is not null");
             return (Criteria) this;
         }
 
-        public Criteria andStatusEqualTo(Integer value) {
+        public Criteria andSortEqualTo(Integer value) {
-            addCriterion("`status` =", value, "status");
+            addCriterion("sort =", value, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotEqualTo(Integer value) {
+        public Criteria andSortNotEqualTo(Integer value) {
-            addCriterion("`status` <>", value, "status");
+            addCriterion("sort <>", value, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThan(Integer value) {
+        public Criteria andSortGreaterThan(Integer value) {
-            addCriterion("`status` >", value, "status");
+            addCriterion("sort >", value, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
+        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
-            addCriterion("`status` >=", value, "status");
+            addCriterion("sort >=", value, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThan(Integer value) {
+        public Criteria andSortLessThan(Integer value) {
-            addCriterion("`status` <", value, "status");
+            addCriterion("sort <", value, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusLessThanOrEqualTo(Integer value) {
+        public Criteria andSortLessThanOrEqualTo(Integer value) {
-            addCriterion("`status` <=", value, "status");
+            addCriterion("sort <=", value, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusIn(List<Integer> values) {
+        public Criteria andSortIn(List<Integer> values) {
-            addCriterion("`status` in", values, "status");
+            addCriterion("sort in", values, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotIn(List<Integer> values) {
+        public Criteria andSortNotIn(List<Integer> values) {
-            addCriterion("`status` not in", values, "status");
+            addCriterion("sort not in", values, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusBetween(Integer value1, Integer value2) {
+        public Criteria andSortBetween(Integer value1, Integer value2) {
-            addCriterion("`status` between", value1, value2, "status");
+            addCriterion("sort between", value1, value2, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
+        public Criteria andSortNotBetween(Integer value1, Integer value2) {
-            addCriterion("`status` not between", value1, value2, "status");
+            addCriterion("sort not between", value1, value2, "sort");
             return (Criteria) this;
         }
 
-        public Criteria andSortIsNull() {
+        public Criteria andStatusIsNull() {
-            addCriterion("sort is null");
+            addCriterion("`status` is null");
             return (Criteria) this;
         }
 
-        public Criteria andSortIsNotNull() {
+        public Criteria andStatusIsNotNull() {
-            addCriterion("sort is not null");
+            addCriterion("`status` is not null");
             return (Criteria) this;
         }
 
-        public Criteria andSortEqualTo(Integer value) {
+        public Criteria andStatusEqualTo(Integer value) {
-            addCriterion("sort =", value, "sort");
+            addCriterion("`status` =", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortNotEqualTo(Integer value) {
+        public Criteria andStatusNotEqualTo(Integer value) {
-            addCriterion("sort <>", value, "sort");
+            addCriterion("`status` <>", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortGreaterThan(Integer value) {
+        public Criteria andStatusGreaterThan(Integer value) {
-            addCriterion("sort >", value, "sort");
+            addCriterion("`status` >", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortGreaterThanOrEqualTo(Integer value) {
+        public Criteria andStatusGreaterThanOrEqualTo(Integer value) {
-            addCriterion("sort >=", value, "sort");
+            addCriterion("`status` >=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortLessThan(Integer value) {
+        public Criteria andStatusLessThan(Integer value) {
-            addCriterion("sort <", value, "sort");
+            addCriterion("`status` <", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortLessThanOrEqualTo(Integer value) {
+        public Criteria andStatusLessThanOrEqualTo(Integer value) {
-            addCriterion("sort <=", value, "sort");
+            addCriterion("`status` <=", value, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortIn(List<Integer> values) {
+        public Criteria andStatusIn(List<Integer> values) {
-            addCriterion("sort in", values, "sort");
+            addCriterion("`status` in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortNotIn(List<Integer> values) {
+        public Criteria andStatusNotIn(List<Integer> values) {
-            addCriterion("sort not in", values, "sort");
+            addCriterion("`status` not in", values, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortBetween(Integer value1, Integer value2) {
+        public Criteria andStatusBetween(Integer value1, Integer value2) {
-            addCriterion("sort between", value1, value2, "sort");
+            addCriterion("`status` between", value1, value2, "status");
             return (Criteria) this;
         }
 
-        public Criteria andSortNotBetween(Integer value1, Integer value2) {
+        public Criteria andStatusNotBetween(Integer value1, Integer value2) {
-            addCriterion("sort not between", value1, value2, "sort");
+            addCriterion("`status` not between", value1, value2, "status");
             return (Criteria) this;
         }