Merge branch 'test' into release

sql/v2.1/20241104.sql

+-- 补充菜单脚本
+INSERT INTO `system_menu` (`name`, `permission`, `menu_type`, `sort`, `parent_id`, `path`, `icon`, `component`, `status`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `is_show_in_menu_bar`, `name_en`, `keepalive`, `redirect`, `badge_field`) VALUES ('到仓修改', '', 2, 20, 1559, 'warehousingTo-update', '#', 'ecw/order/warehousingTo', 0, '2702', '2024-11-03 18:52:39', '2702', '2024-11-03 18:59:08', b'0', b'0', '到仓修改', b'0', NULL, NULL);

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

@@ -143,7 +143,19 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
             "<when test = 'query.auditStatus != null'>",
             "AND t.`audit_status` = #{query.auditStatus}",
             "</when>",
-
+            "<when test='query.auditStatusList != null and query.auditStatusList.size()>0 '>" ,
+            "<when test='query.auditStatusList.size()==1 '>" +
+                    "<foreach item='auditStatus' index=\"index\" collection='query.auditStatusList' >" +
+                    "AND t.`audit_status` = #{auditStatus}" +
+                    "</foreach>" +
+                    "</when>",
+            "<when test='query.auditStatusList.size()>1 '>",
+            " AND t.`audit_status` in ",
+            " <foreach item='auditStatus' index='index' collection='query.auditStatusList' open='(' separator=',' close=')'>",
+            "    #{auditStatus}",
+            " </foreach>" ,
+            "</when>" ,
+            "</when>",
             "<when test = 'query.packaging != null'>",
             "AND t.`packaging` = #{query.packaging}",
             "</when>",
@@ -153,35 +165,35 @@ public interface ProductMapper extends BaseMapperX<ProductDO> {
             "</when>",
 
 //            "<when test = 'query.attrId != null and query.attrId != \"\" '>",
-            "<when test=\"query.attrId != null and query.attrId.size()>0\">" ,
+            "<when test='query.attrId != null and query.attrId.size()>0'>" ,
 
-            "<when test=\"query.attrId != null and query.attrId != '' and query.attrId.size()==1 \">" +
-                    "<foreach item='attrId' index=\"index\" collection='query.attrId' >" +
-                    "AND t.`attr_id` = #{attrId}" +
-                    "</foreach>" +
+            "<when test='query.attrId != null and query.attrId != '' and query.attrId.size()==1 '>" ,
+                    "<foreach item='attrId' index=\"index\" collection='query.attrId' >" ,
+                    "AND t.`attr_id` = #{attrId}" ,
+                    "</foreach>",
                     "</when>",
-                    "<when test=\"query.attrId != null and query.attrId != '' and query.attrId.size()>1 \">" +
+                    "<when test='query.attrId != null and query.attrId != '' and query.attrId.size()>1 '>" ,
                     "AND (1!=1 " +
-                    " <foreach item='attrId' index='index' collection='query.attrId'>" +
-                    " OR FIND_IN_SET(t.`attr_id`, #{attrId})"+
-                    "</foreach>" +
-                    " )" +
+                    " <foreach item='attrId' index='index' collection='query.attrId'>" ,
+                    " OR FIND_IN_SET(t.`attr_id`, #{attrId})",
+                    "</foreach>" ,
+                    " )" ,
                     "</when>",
 //            "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 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 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' >",

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

@@ -85,6 +85,12 @@ public class ProductReqDTO  extends PageParam {
     @ApiModelProperty(value = "审核状态")
     private Integer auditStatus;
 
+
+    @ApiModelProperty(value = "审核状态集合")
+    private List<Integer> auditStatusList;
+
+
+
     @ApiModelProperty(value = "是否展示 默认为展示")
     private Integer status;