添加一下搜索条件

fs-admin/src/main/java/com/fs/qw/controller/QwExternalContactController.java

@@ -5,14 +5,17 @@ import java.util.Objects;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
+import com.fs.common.core.domain.R;
 import com.fs.common.exception.ServiceException;
 import com.fs.qw.param.QwExternalContactParam;
 import com.fs.qw.param.QwTagSearchParam;
+import com.fs.qw.service.IQwExternalContactInfoService;
 import com.fs.qw.service.IQwTagService;
 import com.fs.qw.vo.QwExternalContactUnionIdExportVO;
 import com.fs.qw.vo.QwExternalContactVO;
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -33,7 +36,7 @@ import com.fs.common.core.page.TableDataInfo;
 
 /**
  * 企业微信客户Controller
- * 
+ *
  * @author fs
  * @date 2025-06-13
  */
@@ -44,6 +47,9 @@ public class QwExternalContactController extends BaseController
     private IQwExternalContactService qwExternalContactService;
     private IQwTagService iQwTagService;
 
+    @Autowired
+    private IQwExternalContactInfoService qwExternalContactInfoService;
+
     QwExternalContactController(IQwExternalContactService qwExternalContactService,IQwTagService iQwTagService){
         this.qwExternalContactService=qwExternalContactService;
         this.iQwTagService=iQwTagService;
@@ -168,4 +174,11 @@ public class QwExternalContactController extends BaseController
     {
         return toAjax(qwExternalContactService.deleteQwExternalContactByIds(ids));
     }
+
+    @GetMapping(value = "getUserInfo/{id}")
+    public R getUserInfo(@PathVariable("id") Long id)
+    {
+        return R.ok().put("data",qwExternalContactInfoService.selectQwExternalContactInfoByExternalContactId(id));
+    }
+
 }

fs-service/src/main/java/com/fs/course/mapper/FsCourseAnswerLogsMapper.java

@@ -53,6 +53,7 @@ public interface FsCourseAnswerLogsMapper
             "\tLEFT JOIN company c on cal.company_id=c.company_id " +
             "        <where>  \n" +
             "            <if test=\"map.phone != null \"> and fu.phone = #{map.phone}</if>\n" +
+            "            <if test=\"map.logId != null \"> and cal.log_id = #{map.logId}</if>\n" +
             "            <if test=\"map.courseId != null \"> and uc.course_id = #{map.courseId}</if>\n" +
             "            <if test=\"map.videoId != null \"> and cal.video_id = #{map.videoId}</if>\n" +
             "            <if test=\"map.watchLogId != null \"> and cal.watch_log_id = #{map.watchLogId}</if>\n" +

fs-service/src/main/java/com/fs/course/mapper/FsCourseRedPacketLogMapper.java

@@ -116,6 +116,7 @@ public interface FsCourseRedPacketLogMapper
             "LEFT JOIN qw_user qu on qu.id= l.qw_user_id  \n" +
             "where 1=1   " +
             "<if test = ' maps.userId !=null '> and l.user_id = #{maps.userId} </if>" +
+            "<if test = ' maps.logId !=null '> and l.log_id = #{maps.logId} </if>" +
             "<if test = ' maps.watchLogId !=null '> and l.watch_log_id = #{maps.watchLogId} </if>" +
             "<if test = ' maps.companyId !=null '> and l.company_id = #{maps.companyId} </if>" +
             "<if test = ' maps.companyUserId !=null '> and l.company_user_id = #{maps.companyUserId} </if>" +

fs-service/src/main/java/com/fs/course/param/FsCourseAnswerLogsParam.java

@@ -12,6 +12,8 @@ import java.util.Set;
 
 @Data
 public class FsCourseAnswerLogsParam  extends BaseEntity  {
+
+    private Long logId;
     private String phone;
     private String phoneMk;
     private String courseId;

fs-service/src/main/java/com/fs/course/param/FsCourseRedPacketLogParam.java

@@ -11,6 +11,7 @@ import java.util.stream.Collectors;
 @Data
 public class FsCourseRedPacketLogParam implements Serializable {
 
+    private Long logId;
     private Long userId;
 
     private Long companyId;

fs-service/src/main/java/com/fs/course/param/FsCourseWatchLogListParam.java

@@ -11,6 +11,8 @@ import java.util.stream.Collectors;
 @Data
 public class FsCourseWatchLogListParam implements Serializable {
 
+    private Long logId;
+
     private Long userId;
 
     private Long qwUserId;

fs-service/src/main/java/com/fs/qw/param/QwExternalContactParam.java

@@ -10,8 +10,12 @@ import java.util.List;
 
 @Data
 public class QwExternalContactParam {
+
     private Long id;
 
+    @TableField(exist = false)
+    private Long extId;
+
     /** 属于用户id */
     @Excel(name = "属于用户id")
     private String userId;
@@ -24,10 +28,12 @@ public class QwExternalContactParam {
 
     /** 外部联系人id */
     @Excel(name = "外部联系人id")
-    private Long externalUserId;
+    private String externalUserId;
 
     private Long companyUserId;
 
+    private Long fsUserId;
+
     /**
      * 销售员工信息（昵称，手机号）
      */

fs-service/src/main/resources/mapper/course/FsCourseWatchLogMapper.xml

@@ -82,6 +82,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test ='maps.userId !=null'>
                 and l.user_id = #{maps.userId}
             </if>
+            <if test ='maps.logId !=null'>
+                and l.log_id = #{maps.logId}
+            </if>
             <if test ='maps.project !=null'>
                 and l.project = #{maps.project}
             </if>

fs-service/src/main/resources/mapper/qw/QwExternalContactMapper.xml

@@ -759,6 +759,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 <if test="isBindMini == 'noBindMini'">
                     and ec.fs_user_id is null
                 </if>
+                <if test="extId != null and extId != ''">
+                    and ec.id = #{extId}
+                </if>
+                <if test="fsUserId != null and fsUserId != ''">
+                    and ec.fs_user_id = #{fsUserId}
+                </if>
                 <if test="lossTime != null">
                     and DATE(ec.loss_time) = DATE(#{lossTime})
                 </if>