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

yudao-module-customer/yudao-module-customer-core/src/main/java/cn/iocoder/yudao/module/customer/vo/customerFollowup/CustomerFollowupQueryVO.java

@@ -85,4 +85,15 @@ public class CustomerFollowupQueryVO extends PageParam {
     @ApiModelProperty(value = "结束创建时间")
     private Date endCreateTime;
 
+
+    @ApiModelProperty(value = "跟进类型，下拉多选")
+    private List<Integer> followTypes;
+    @ApiModelProperty(value = "跟进方式，下拉多选")
+    private List<Integer> followMethods;
+    @ApiModelProperty(value = "跟进结果，下拉多选")
+    private List<Integer> resultTypes;
+    //跟进状态，多选，逗号分隔
+    @ApiModelProperty(value = "跟进状态，下拉多选")
+    private List<Integer> statuses;
+
 }

yudao-module-customer/yudao-module-customer-core/src/main/resources/mapper/customer/CustomerFollowupMapper.xml

@@ -38,6 +38,35 @@
             AND  a.result_type = #{query.resultType}
         </if>
 
+
+        <if test="query.followTypes != null and query.followTypes.size()>0">
+            AND
+            <foreach item='item' index="index" collection='query.followTypes' open='(' separator='or' close=')'>
+                FIND_IN_SET(#{item}, a.follow_type)
+            </foreach>
+        </if>
+
+        <if test="query.followMethods != null and query.followMethods.size()>0">
+            AND
+            <foreach item='item' index="index" collection='query.followMethods' open='(' separator='or' close=')'>
+                FIND_IN_SET(#{item}, a.follow_method)
+            </foreach>
+        </if>
+
+        <if test="query.resultTypes != null and query.resultTypes.size()>0">
+            AND
+            <foreach item='item' index="index" collection='query.resultTypes' open='(' separator='or' close=')'>
+                FIND_IN_SET(#{item}, a.result_type)
+            </foreach>
+        </if>
+
+        <if test="query.statuses != null and query.statuses.size()>0">
+            AND
+            <foreach item='item' index="index" collection='query.statuses' open='(' separator='or' close=')'>
+                FIND_IN_SET(#{item}, a.status)
+            </foreach>
+        </if>
+
     </sql>
 
     <select id="selectPage1" resultType="cn.iocoder.yudao.module.customer.dal.dataobject.customerFollowup.CustomerFollowupDO">