äupdate project

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/product/ProductMapper.java

@@ -144,6 +144,10 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
             "AND t.`audit_status` = #{query.auditStatus}",
             "</when>",
 
+            "<when test = 'query.packaging != null'>",
+            "AND t.`packaging` = #{query.packaging}",
+            "</when>",
+
             "<when test = 'query.titleZh != null and query.titleZh != \"\"'>",
             "AND (t.`title_zh` like concat('%',concat(#{query.titleZh},'%')) or t.`title_en` like concat('%',concat(#{query.titleZh},'%')))",
             "</when>",
@@ -166,6 +170,47 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
 //            "AND FIND_IN_SET(t.`attr_id`, #{query.attrId})",
             "</when>",
 
+            "<when test=\"query.materialTypes != null and query.materialTypes.size()>0\">" ,
+                "<when test=\"query.materialTypes != null  and query.materialTypes.size()==1 \">" +
+                    "<foreach item='materialType' index=\"index\" collection='query.materialTypes' >" +
+                    "AND t.`material_type` = #{materialType}" +
+                    "</foreach>" +
+                    "</when>",
+                "<when test=\"query.materialTypes != null and query.materialTypes.size()>1 \">" +
+                    "                AND t.`material_type` in " +
+                    "                <foreach item='materialType' index='index' collection='query.materialTypes' open='(' separator=',' close=')'>" +
+                    "                    #{materialType}" +
+                    "                </foreach>" +
+                    "</when>" +
+            "</when>",
+
+            " <when test='query.beginCreateTime != null' >",
+                "AND <![CDATA[  t.create_time >= #{query.beginCreateTime}  ]]> ",
+            "</when>",
+            " <when test='query.endCreateTime != null' >",
+                "AND <![CDATA[  t.create_time <= #{query.endCreateTime}  ]]> ",
+            "</when>",
+
+            "<when test=\"query.creator != null and query.creator != ''  \">" +
+                "AND c.`nickname` like concat('%',concat(#{query.creator},'%'))",
+            "</when>",
+
+            "<when test=\"query.titleZhKey != null and query.titleZhKey != ''  \">" +
+                    "AND c.`title_zh` like concat('%',concat(#{query.titleZhKey},'%'))",
+            "</when>",
+
+            "<when test=\"query.notTitleZhKey != null and query.notTitleZhKey != ''  \">" +
+                    "AND c.`title_zh` not like concat('%',concat(#{query.notTitleZhKey},'%'))",
+            "</when>",
+
+            "<when test=\"query.eqTitleZhKey != null and query.eqTitleZhKey != ''  \">" +
+                    "AND c.`title_zh` =  #{query.eqTitleZhKey} ",
+            "</when>",
+
+            "<when test=\"query.notEqTitleZhKey != null and query.notEqTitleZhKey != ''  \">" +
+                    "AND c.`title_zh` !=  #{query.notEqTitleZhKey} ",
+            "</when>",
+
             "order by t.id desc",
 
             "</script>"

yudao-module-product/yudao-module-product-core/src/main/java/cn/iocoder/yudao/module/product/dto/ProductReqDTO.java

@@ -26,9 +26,26 @@ public class ProductReqDTO  extends PageParam {
     @ApiModelProperty(value = "商品属性id")
     //private String attrId;
     private  List<String> attrId;
+
+    @ApiModelProperty(value = "商品材质id")
+    //private String materialTypes;
+    private  List<String> materialTypes;
+
     @ApiModelProperty(value = "中文标题")
     private String titleZh;
 
+    @ApiModelProperty(value = "中文标题搜索(包括订单号，麦头，提单号)")
+    private String titleZhKey;
+
+    @ApiModelProperty(value = "反向中文标题搜索(包括订单号，麦头，提单号)不包含的数据")
+    private String notTitleZhKey;
+
+    @ApiModelProperty(value = "中文标题搜索强等于(包括订单号，麦头，提单号)")
+    private String eqTitleZhKey;
+
+    @ApiModelProperty(value = "中文标题搜索强不等于(包括订单号，麦头，提单号)")
+    private String notEqTitleZhKey;
+
     @ApiModelProperty(value = "英文标题")
     private String titleEn;
 
@@ -79,6 +96,9 @@ public class ProductReqDTO  extends PageParam {
     @ApiModelProperty(value = "结束创建时间")
     private Date endCreateTime;
 
+    @ApiModelProperty(value = "创建人")
+    private String creator;
+
     private boolean filter = true;
 
     /**