物料管理改造

abi-cloud-qr-platform-server/src/main/java/com/abi/qms/platform/dto/req/ListMaterialReq.java

@@ -26,8 +26,10 @@ public class ListMaterialReq extends PageReq implements Serializable {
     @Schema(name = "是否有效 0-无效 1-有效")
     private Integer valid;
 
-    //603版 已作废
-    /*@Schema(name = "SKU商品名称")
-    private String skuName;*/
+    @Schema(name = "活动名称")
+    private String activeName;
+
+    @Schema(name = "是否有二维码 0-没有 1-有")
+    private Integer hasQr;
 
 }

abi-cloud-qr-platform-server/src/main/resources/dao/mapper/BaseMaterialMapper.xml

@@ -46,6 +46,12 @@
             <if test="req.valid!=null">
                 and m.valid = #{req.valid}
             </if>
+            <if test="req.hasQr!=null">
+                and m.has_qr = #{req.hasQr}
+            </if>
+            <if test="req.activeName!=null and req.activeName!=''">
+                and a.active_name regexp #{req.activeName}
+            </if>
         </where>
 
         order by update_time desc

abi-cloud-qr-platform-server/src/test/java/com/abi/qms/platform/ReactBeanTest.java

@@ -1,6 +1,7 @@
 package com.abi.qms.platform;
 
 import com.abi.qms.platform.dto.res.GetPackageCodeRes;
+import com.abi.qms.platform.dto.res.ListMaterialRes;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +18,7 @@ import java.util.Map;
 public class ReactBeanTest {
 
     public static void main(String[] args) {
-        Class clz = GetPackageCodeRes.class;
+        Class clz = ListMaterialRes.MaterialBean.class;
 
         Map<Class,String> classMap = new HashMap<>();
         classMap.put(String.class,"string");