Merge branch 'dev' of http://gitea.dctpay.com/hurui/puhui-go into dev

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

@@ -39,9 +39,10 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into goods_msg (goods_type, goods_type_name, ",
+        "insert into goods_msg (goods_type, third_id, ",
-        "goods_type_parent, goods_type_parent_name, ",
+        "goods_type_name, goods_type_parent, ",
-        "sale_num, `type`, goods_brand_name, ",
+        "goods_type_parent_name, sale_num, ",
+        "`type`, goods_brand_name, ",
         "goods_brand, goods_label, ",
         "goods_explain, title, ",
         "list_img, banner_img, ",
@@ -49,9 +50,10 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt {
         "create_time, update_time, ",
         "mer_id, mer_name, ext_1, ",
         "ext_2, ext_3)",
-        "values (#{goodsType,jdbcType=BIGINT}, #{goodsTypeName,jdbcType=VARCHAR}, ",
+        "values (#{goodsType,jdbcType=BIGINT}, #{thirdId,jdbcType=VARCHAR}, ",
-        "#{goodsTypeParent,jdbcType=BIGINT}, #{goodsTypeParentName,jdbcType=VARCHAR}, ",
+        "#{goodsTypeName,jdbcType=VARCHAR}, #{goodsTypeParent,jdbcType=BIGINT}, ",
-        "#{saleNum,jdbcType=INTEGER}, #{type,jdbcType=INTEGER}, #{goodsBrandName,jdbcType=VARCHAR}, ",
+        "#{goodsTypeParentName,jdbcType=VARCHAR}, #{saleNum,jdbcType=INTEGER}, ",
+        "#{type,jdbcType=INTEGER}, #{goodsBrandName,jdbcType=VARCHAR}, ",
         "#{goodsBrand,jdbcType=BIGINT}, #{goodsLabel,jdbcType=VARCHAR}, ",
         "#{goodsExplain,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, ",
         "#{listImg,jdbcType=VARCHAR}, #{bannerImg,jdbcType=VARCHAR}, ",
@@ -71,6 +73,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.BIGINT),
+        @Result(column="third_id", property="thirdId", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_type_parent", property="goodsTypeParent", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_type_parent_name", property="goodsTypeParentName", jdbcType=JdbcType.VARCHAR),
@@ -97,7 +100,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt {
 
     @Select({
         "select",
-        "id, goods_type, goods_type_name, goods_type_parent, goods_type_parent_name, ",
+        "id, goods_type, third_id, goods_type_name, goods_type_parent, goods_type_parent_name, ",
         "sale_num, `type`, goods_brand_name, goods_brand, goods_label, goods_explain, ",
         "title, list_img, banner_img, detail_img, `status`, create_time, update_time, ",
         "mer_id, mer_name, ext_1, ext_2, ext_3",
@@ -107,6 +110,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="goods_type", property="goodsType", jdbcType=JdbcType.BIGINT),
+        @Result(column="third_id", property="thirdId", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_type_name", property="goodsTypeName", jdbcType=JdbcType.VARCHAR),
         @Result(column="goods_type_parent", property="goodsTypeParent", jdbcType=JdbcType.BIGINT),
         @Result(column="goods_type_parent_name", property="goodsTypeParentName", jdbcType=JdbcType.VARCHAR),
@@ -143,6 +147,7 @@ public interface GoodsMsgMapper extends GoodsMsgMapperExt {
     @Update({
         "update goods_msg",
         "set goods_type = #{goodsType,jdbcType=BIGINT},",
+          "third_id = #{thirdId,jdbcType=VARCHAR},",
           "goods_type_name = #{goodsTypeName,jdbcType=VARCHAR},",
           "goods_type_parent = #{goodsTypeParent,jdbcType=BIGINT},",
           "goods_type_parent_name = #{goodsTypeParentName,jdbcType=VARCHAR},",

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

@@ -32,6 +32,10 @@ public class GoodsMsgSqlProvider {
             sql.VALUES("goods_type", "#{goodsType,jdbcType=BIGINT}");
         }
         
+        if (record.getThirdId() != null) {
+            sql.VALUES("third_id", "#{thirdId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getGoodsTypeName() != null) {
             sql.VALUES("goods_type_name", "#{goodsTypeName,jdbcType=VARCHAR}");
         }
@@ -127,6 +131,7 @@ public class GoodsMsgSqlProvider {
             sql.SELECT("id");
         }
         sql.SELECT("goods_type");
+        sql.SELECT("third_id");
         sql.SELECT("goods_type_name");
         sql.SELECT("goods_type_parent");
         sql.SELECT("goods_type_parent_name");
@@ -173,6 +178,10 @@ public class GoodsMsgSqlProvider {
             sql.SET("goods_type = #{record.goodsType,jdbcType=BIGINT}");
         }
         
+        if (record.getThirdId() != null) {
+            sql.SET("third_id = #{record.thirdId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getGoodsTypeName() != null) {
             sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}");
         }
@@ -267,6 +276,7 @@ public class GoodsMsgSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         sql.SET("goods_type = #{record.goodsType,jdbcType=BIGINT}");
+        sql.SET("third_id = #{record.thirdId,jdbcType=VARCHAR}");
         sql.SET("goods_type_name = #{record.goodsTypeName,jdbcType=VARCHAR}");
         sql.SET("goods_type_parent = #{record.goodsTypeParent,jdbcType=BIGINT}");
         sql.SET("goods_type_parent_name = #{record.goodsTypeParentName,jdbcType=VARCHAR}");
@@ -302,6 +312,10 @@ public class GoodsMsgSqlProvider {
             sql.SET("goods_type = #{goodsType,jdbcType=BIGINT}");
         }
         
+        if (record.getThirdId() != null) {
+            sql.SET("third_id = #{thirdId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getGoodsTypeName() != null) {
             sql.SET("goods_type_name = #{goodsTypeName,jdbcType=VARCHAR}");
         }

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

@@ -39,20 +39,20 @@ public interface GoodsSpecsMapper extends GoodsSpecsMapperExt {
     int deleteByPrimaryKey(Long id);
 
     @Insert({
-        "insert into goods_specs (goods_id, `name`, ",
+        "insert into goods_specs (goods_id, third_id, ",
-        "pur_limit, sale_price, ",
+        "`name`, pur_limit, ",
-        "original_price, stock, ",
+        "sale_price, original_price, ",
-        "show_img, sales_end_time, ",
+        "stock, show_img, ",
-        "`status`, create_time, ",
+        "sales_end_time, `status`, ",
-        "update_time, ext_1, ",
+        "create_time, update_time, ",
-        "ext_2, ext_3)",
+        "ext_1, ext_2, ext_3)",
-        "values (#{goodsId,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, ",
+        "values (#{goodsId,jdbcType=BIGINT}, #{thirdId,jdbcType=VARCHAR}, ",
-        "#{purLimit,jdbcType=INTEGER}, #{salePrice,jdbcType=DECIMAL}, ",
+        "#{name,jdbcType=VARCHAR}, #{purLimit,jdbcType=INTEGER}, ",
-        "#{originalPrice,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, ",
+        "#{salePrice,jdbcType=DECIMAL}, #{originalPrice,jdbcType=DECIMAL}, ",
-        "#{showImg,jdbcType=VARCHAR}, #{salesEndTime,jdbcType=TIMESTAMP}, ",
+        "#{stock,jdbcType=INTEGER}, #{showImg,jdbcType=VARCHAR}, ",
-        "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{salesEndTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}, ",
-        "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
+        "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ",
-        "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
+        "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
     @Options(useGeneratedKeys=true,keyProperty="id")
     int insert(GoodsSpecs record);
@@ -65,6 +65,7 @@ public interface GoodsSpecsMapper extends GoodsSpecsMapperExt {
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
+        @Result(column="third_id", property="thirdId", jdbcType=JdbcType.VARCHAR),
         @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
         @Result(column="pur_limit", property="purLimit", jdbcType=JdbcType.INTEGER),
         @Result(column="sale_price", property="salePrice", jdbcType=JdbcType.DECIMAL),
@@ -83,14 +84,16 @@ public interface GoodsSpecsMapper extends GoodsSpecsMapperExt {
 
     @Select({
         "select",
-        "id, goods_id, `name`, pur_limit, sale_price, original_price, stock, show_img, ",
+        "id, goods_id, third_id, `name`, pur_limit, sale_price, original_price, stock, ",
-        "sales_end_time, `status`, create_time, update_time, ext_1, ext_2, ext_3",
+        "show_img, sales_end_time, `status`, create_time, update_time, ext_1, ext_2, ",
+        "ext_3",
         "from goods_specs",
         "where id = #{id,jdbcType=BIGINT}"
     })
     @Results({
         @Result(column="id", property="id", jdbcType=JdbcType.BIGINT, id=true),
         @Result(column="goods_id", property="goodsId", jdbcType=JdbcType.BIGINT),
+        @Result(column="third_id", property="thirdId", jdbcType=JdbcType.VARCHAR),
         @Result(column="name", property="name", jdbcType=JdbcType.VARCHAR),
         @Result(column="pur_limit", property="purLimit", jdbcType=JdbcType.INTEGER),
         @Result(column="sale_price", property="salePrice", jdbcType=JdbcType.DECIMAL),
@@ -119,6 +122,7 @@ public interface GoodsSpecsMapper extends GoodsSpecsMapperExt {
     @Update({
         "update goods_specs",
         "set goods_id = #{goodsId,jdbcType=BIGINT},",
+          "third_id = #{thirdId,jdbcType=VARCHAR},",
           "`name` = #{name,jdbcType=VARCHAR},",
           "pur_limit = #{purLimit,jdbcType=INTEGER},",
           "sale_price = #{salePrice,jdbcType=DECIMAL},",

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

@@ -32,6 +32,10 @@ public class GoodsSpecsSqlProvider {
             sql.VALUES("goods_id", "#{goodsId,jdbcType=BIGINT}");
         }
         
+        if (record.getThirdId() != null) {
+            sql.VALUES("third_id", "#{thirdId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getName() != null) {
             sql.VALUES("`name`", "#{name,jdbcType=VARCHAR}");
         }
@@ -95,6 +99,7 @@ public class GoodsSpecsSqlProvider {
             sql.SELECT("id");
         }
         sql.SELECT("goods_id");
+        sql.SELECT("third_id");
         sql.SELECT("`name`");
         sql.SELECT("pur_limit");
         sql.SELECT("sale_price");
@@ -133,6 +138,10 @@ public class GoodsSpecsSqlProvider {
             sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
         }
         
+        if (record.getThirdId() != null) {
+            sql.SET("third_id = #{record.thirdId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getName() != null) {
             sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
         }
@@ -195,6 +204,7 @@ public class GoodsSpecsSqlProvider {
         
         sql.SET("id = #{record.id,jdbcType=BIGINT}");
         sql.SET("goods_id = #{record.goodsId,jdbcType=BIGINT}");
+        sql.SET("third_id = #{record.thirdId,jdbcType=VARCHAR}");
         sql.SET("`name` = #{record.name,jdbcType=VARCHAR}");
         sql.SET("pur_limit = #{record.purLimit,jdbcType=INTEGER}");
         sql.SET("sale_price = #{record.salePrice,jdbcType=DECIMAL}");
@@ -222,6 +232,10 @@ public class GoodsSpecsSqlProvider {
             sql.SET("goods_id = #{goodsId,jdbcType=BIGINT}");
         }
         
+        if (record.getThirdId() != null) {
+            sql.SET("third_id = #{thirdId,jdbcType=VARCHAR}");
+        }
+        
         if (record.getName() != null) {
             sql.SET("`name` = #{name,jdbcType=VARCHAR}");
         }

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

@@ -23,6 +23,11 @@ public class GoodsMsg implements Serializable {
      */
     private Long goodsType;
 
+    /**
+     * 第三方id
+     */
+    private String thirdId;
+
     /**
      * 商品类型名称
      */
@@ -146,6 +151,14 @@ public class GoodsMsg implements Serializable {
         this.goodsType = goodsType;
     }
 
+    public String getThirdId() {
+        return thirdId;
+    }
+
+    public void setThirdId(String thirdId) {
+        this.thirdId = thirdId;
+    }
+
     public String getGoodsTypeName() {
         return goodsTypeName;
     }
@@ -328,6 +341,7 @@ public class GoodsMsg implements Serializable {
         GoodsMsg other = (GoodsMsg) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getGoodsType() == null ? other.getGoodsType() == null : this.getGoodsType().equals(other.getGoodsType()))
+            && (this.getThirdId() == null ? other.getThirdId() == null : this.getThirdId().equals(other.getThirdId()))
             && (this.getGoodsTypeName() == null ? other.getGoodsTypeName() == null : this.getGoodsTypeName().equals(other.getGoodsTypeName()))
             && (this.getGoodsTypeParent() == null ? other.getGoodsTypeParent() == null : this.getGoodsTypeParent().equals(other.getGoodsTypeParent()))
             && (this.getGoodsTypeParentName() == null ? other.getGoodsTypeParentName() == null : this.getGoodsTypeParentName().equals(other.getGoodsTypeParentName()))
@@ -357,6 +371,7 @@ public class GoodsMsg implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getGoodsType() == null) ? 0 : getGoodsType().hashCode());
+        result = prime * result + ((getThirdId() == null) ? 0 : getThirdId().hashCode());
         result = prime * result + ((getGoodsTypeName() == null) ? 0 : getGoodsTypeName().hashCode());
         result = prime * result + ((getGoodsTypeParent() == null) ? 0 : getGoodsTypeParent().hashCode());
         result = prime * result + ((getGoodsTypeParentName() == null) ? 0 : getGoodsTypeParentName().hashCode());
@@ -389,6 +404,7 @@ public class GoodsMsg implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", goodsType=").append(goodsType);
+        sb.append(", thirdId=").append(thirdId);
         sb.append(", goodsTypeName=").append(goodsTypeName);
         sb.append(", goodsTypeParent=").append(goodsTypeParent);
         sb.append(", goodsTypeParentName=").append(goodsTypeParentName);

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

@@ -245,6 +245,76 @@ public class GoodsMsgExample {
             return (Criteria) this;
         }
 
+        public Criteria andThirdIdIsNull() {
+            addCriterion("third_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdIsNotNull() {
+            addCriterion("third_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdEqualTo(String value) {
+            addCriterion("third_id =", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotEqualTo(String value) {
+            addCriterion("third_id <>", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdGreaterThan(String value) {
+            addCriterion("third_id >", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("third_id >=", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdLessThan(String value) {
+            addCriterion("third_id <", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdLessThanOrEqualTo(String value) {
+            addCriterion("third_id <=", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdLike(String value) {
+            addCriterion("third_id like", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotLike(String value) {
+            addCriterion("third_id not like", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdIn(List<String> values) {
+            addCriterion("third_id in", values, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotIn(List<String> values) {
+            addCriterion("third_id not in", values, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdBetween(String value1, String value2) {
+            addCriterion("third_id between", value1, value2, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotBetween(String value1, String value2) {
+            addCriterion("third_id not between", value1, value2, "thirdId");
+            return (Criteria) this;
+        }
+
         public Criteria andGoodsTypeNameIsNull() {
             addCriterion("goods_type_name is null");
             return (Criteria) this;

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

@@ -24,6 +24,11 @@ public class GoodsSpecs implements Serializable {
      */
     private Long goodsId;
 
+    /**
+     * 第三方ID
+     */
+    private String thirdId;
+
     /**
      * sku名称
      */
@@ -107,6 +112,14 @@ public class GoodsSpecs implements Serializable {
         this.goodsId = goodsId;
     }
 
+    public String getThirdId() {
+        return thirdId;
+    }
+
+    public void setThirdId(String thirdId) {
+        this.thirdId = thirdId;
+    }
+
     public String getName() {
         return name;
     }
@@ -225,6 +238,7 @@ public class GoodsSpecs implements Serializable {
         GoodsSpecs other = (GoodsSpecs) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getGoodsId() == null ? other.getGoodsId() == null : this.getGoodsId().equals(other.getGoodsId()))
+            && (this.getThirdId() == null ? other.getThirdId() == null : this.getThirdId().equals(other.getThirdId()))
             && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
             && (this.getPurLimit() == null ? other.getPurLimit() == null : this.getPurLimit().equals(other.getPurLimit()))
             && (this.getSalePrice() == null ? other.getSalePrice() == null : this.getSalePrice().equals(other.getSalePrice()))
@@ -246,6 +260,7 @@ public class GoodsSpecs implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getGoodsId() == null) ? 0 : getGoodsId().hashCode());
+        result = prime * result + ((getThirdId() == null) ? 0 : getThirdId().hashCode());
         result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
         result = prime * result + ((getPurLimit() == null) ? 0 : getPurLimit().hashCode());
         result = prime * result + ((getSalePrice() == null) ? 0 : getSalePrice().hashCode());
@@ -270,6 +285,7 @@ public class GoodsSpecs implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", goodsId=").append(goodsId);
+        sb.append(", thirdId=").append(thirdId);
         sb.append(", name=").append(name);
         sb.append(", purLimit=").append(purLimit);
         sb.append(", salePrice=").append(salePrice);

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

@@ -246,6 +246,76 @@ public class GoodsSpecsExample {
             return (Criteria) this;
         }
 
+        public Criteria andThirdIdIsNull() {
+            addCriterion("third_id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdIsNotNull() {
+            addCriterion("third_id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdEqualTo(String value) {
+            addCriterion("third_id =", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotEqualTo(String value) {
+            addCriterion("third_id <>", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdGreaterThan(String value) {
+            addCriterion("third_id >", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdGreaterThanOrEqualTo(String value) {
+            addCriterion("third_id >=", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdLessThan(String value) {
+            addCriterion("third_id <", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdLessThanOrEqualTo(String value) {
+            addCriterion("third_id <=", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdLike(String value) {
+            addCriterion("third_id like", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotLike(String value) {
+            addCriterion("third_id not like", value, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdIn(List<String> values) {
+            addCriterion("third_id in", values, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotIn(List<String> values) {
+            addCriterion("third_id not in", values, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdBetween(String value1, String value2) {
+            addCriterion("third_id between", value1, value2, "thirdId");
+            return (Criteria) this;
+        }
+
+        public Criteria andThirdIdNotBetween(String value1, String value2) {
+            addCriterion("third_id not between", value1, value2, "thirdId");
+            return (Criteria) this;
+        }
+
         public Criteria andNameIsNull() {
             addCriterion("`name` is null");
             return (Criteria) this;