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

fs-service/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -93,6 +93,8 @@ public class FsUserPageListParam implements Serializable {
     private Integer isBuy;
     private String source;
     private String phoneMk;
+    //营期名称
+    private String periodName;
 
 }
 

fs-service/src/main/java/com/fs/store/vo/h5/FsUserPageListVO.java

@@ -105,5 +105,6 @@ public class FsUserPageListVO {
 
     @ApiModelProperty(value = "是否购买 1：是 0 否")
     private BigDecimal isBuy;
-
+    //营期名称
+    private String periodName;
 }

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -344,10 +344,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         ucu.company_id,
         ucu.project_id,
         fs_user.integral,
+        fucp.period_name,
         if(fs_user.pay_count>0,1,0) as isBuy
         FROM
         fs_user
         left join fs_user_company_user ucu on ucu.user_id = fs_user.user_id
+        left join fs_course_watch_log fcwl on fs_user.user_id = fcwl.user_id
+        left join fs_user_course_period fucp on fcwl.period_id = fucp.period_id
         <where>
             fs_user.is_del = 0
             <if test="userId != null">
@@ -389,6 +392,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isBuy != null  and isBuy != ''">
                 and fs_user.is_buy = #{isBuy}
             </if>
+            <if test="periodName != null and periodName != ''">
+                AND fucp.period_name like concat('%', #{periodName},'%')
+            </if>
         </where>
         ORDER BY fs_user.create_time DESC
     </select>