Merge remote-tracking branch 'origin/会员关联项目' into 会员关联项目

fs-service-system/src/main/java/com/fs/store/domain/FsUserCompanyUser.java

@@ -5,6 +5,8 @@ import com.fs.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.time.LocalDateTime;
+
 /**
  * 微信用户和销售关系对象 fs_user_company_user
  *
@@ -61,4 +63,8 @@ public class FsUserCompanyUser {
      * 备注
      */
     private String remark;
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
 }

fs-service-system/src/main/resources/db/upgrade/20250625会员关联项目.sql

@@ -28,4 +28,7 @@ create table fs_user_project_tag (
     primary key (`id`) using btree,
     index idx_user_company_user_id(`user_company_user_id`) using btree,
     index idx_tag_id(`tag_id`) using btree
-) engine = InnoDB comment = '用户项目标签表';
+) engine = InnoDB comment = '用户项目标签表';
+
+alter table fs_user_company_user
+    add column create_time datetime comment '创建时间';

fs-service-system/src/main/resources/mapper/store/FsUserCompanyUserMapper.xml

@@ -16,10 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="qwCompanyId"    column="qw_company_id"    />
         <result property="status"    column="status"    />
         <result property="remark"    column="remark"    />
+        <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectFsUserCompanyUserVo">
-        select id, user_id, company_user_id, company_id, is_repeat_fans, project_id, qw_user_id, qw_external_contact_id, qw_company_id, `status`, remark from fs_user_company_user
+        select id, user_id, company_user_id, company_id, is_repeat_fans, project_id, qw_user_id, qw_external_contact_id, qw_company_id, `status`, remark, create_time from fs_user_company_user
     </sql>
 
     <select id="selectFsUserCompanyUserList" parameterType="FsUserCompanyUser" resultMap="FsUserCompanyUserResult">
@@ -35,6 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwCompanyId != null "> and qw_company_id = #{qwCompanyId}</if>
             <if test="status != null "> and `status` = #{status}</if>
             <if test="remark != null "> and remark = #{remark}</if>
+            <if test="createTime != null "> and create_time = #{createTime}</if>
         </where>
     </select>
 
@@ -57,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwCompanyId != null">qw_company_id,</if>
             <if test="status != null">`status`,</if>
             <if test="remark != null">remark,</if>
+            <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
@@ -70,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwCompanyId != null">#{qwCompanyId},</if>
             <if test="status != null">#{status},</if>
             <if test="remark != null">#{remark},</if>
+            <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>
 
@@ -86,6 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="qwCompanyId != null">qw_company_id = #{qwCompanyId},</if>
             <if test="status != null">`status` = #{status},</if>
             <if test="remark != null">remark = #{remark},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
         </trim>
         where id = #{id}
     </update>

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -598,7 +598,6 @@
         fs_user.avatar,
         fs_user.nickname,
         fs_user.phone,
-        fs_user.create_time,
         fs_user_course_count.id,
         fs_user_course_count.watch_course_count,
         fs_user_course_count.miss_course_count,
@@ -616,7 +615,8 @@
         fs_user_company_user.project_id,
         fs_user_company_user.`status`,
         fs_user_company_user.remark,
-        fs_user_company_user.id as userCompanyUserId
+        fs_user_company_user.id as userCompanyUserId,
+        fs_user_company_user.create_time,
         FROM
         fs_user
         INNER JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
@@ -634,16 +634,19 @@
         <if test="status != null">
             AND fs_user_company_user.status = #{status}
         </if>
+        <if test="projectId != null">
+            AND fs_user_company_user.project_id = #{projectId}
+        </if>
         <if test="keyword != null and keyword !='' ">
             AND (fs_user.nickname LIKE concat('%',#{keyword},'%')
             or  fs_user.phone LIKE concat('%',#{keyword},'%')
             )
         </if>
         <if test="registerStartTime != null and registerStartTime !='' ">
-            AND fs_user.create_time &gt;= #{registerStartTime}
+            AND fs_user_company_user.create_time &gt;= #{registerStartTime}
         </if>
         <if test="registerEndTime != null and registerEndTime !='' ">
-            AND fs_user.create_time &lt;= #{registerEndTime}
+            AND fs_user_company_user.create_time &lt;= #{registerEndTime}
         </if>
         <if test="tagIds != null and tagIds.length > 0">
             AND upt.tag_id in
@@ -694,7 +697,7 @@
             order by
             <choose>
                 <when test = "continueMissCourseSort == 0">
-                    fs_user.create_time desc
+                    fs_user_company_user.create_time desc
                 </when>
                 <when test = "continueMissCourseSort == 1">
                     fs_user.nickname asc
@@ -908,7 +911,7 @@
                 <if test="companyId != null ">
                     and ucu.company_id = #{companyId}
                 </if>
-                  AND to_days(fs_user.create_time) = to_days(now())) as todayNewUser
+                  AND to_days(ucu.create_time) = to_days(now())) as todayNewUser
     </select>
 
     <select id="countTag" resultType="FsUserSummaryCountTagVO">