Merge remote-tracking branch 'origin/dev_fifo_z' into dev_fifo_z

src/main/java/com/glxp/api/req/collect/CollectOrderRequest.java

@@ -1,6 +1,7 @@
 package com.glxp.api.req.collect;
 
 import com.glxp.api.util.page.ListPageRequest;
+import io.swagger.models.auth.In;
 import lombok.Data;
 
 import java.util.Date;
@@ -112,6 +113,7 @@ public class CollectOrderRequest extends ListPageRequest {
     private String backupOrderRemark6;
     private String unionKey;
     private Integer invAlert;
+    private List<Integer> invAlerts;
 
 
 }

src/main/resources/mybatis/mapper/collect/IoCollectOrderMapper.xml

@@ -84,6 +84,12 @@
             <if test="invAlert != null">
                 and ico.invAlert =#{invAlert}
             </if>
+            <if test="invAlerts != null and invAlerts.size() > 0">
+                and ico.invAlert in
+                <foreach collection="invAlerts" item="item" index="index" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
         </where>
         order by orderTime desc
     </select>