Browse Source

客服模块客户跟进列表新增入群时间

anderx 1 year ago
parent
commit
a5fd7863f6

+ 1 - 1
src/main/java/com/goafanti/common/dao/UserServiceMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
  * 客服信息表(UserService)表数据库访问层
  *
  * @author makejava
- * @since 2024-11-06 09:00:41
+ * @since 2024-11-11 17:01:53
  */
 public interface UserServiceMapper {
 

+ 118 - 97
src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml

@@ -18,10 +18,11 @@
         <result property="techSatisfaction" column="tech_satisfaction" jdbcType="INTEGER"/>
         <result property="businessSatisfaction" column="business_satisfaction" jdbcType="INTEGER"/>
         <result property="addGroupChat" column="add_group_chat" jdbcType="INTEGER"/>
+        <result property="addGroupChatTime" column="add_group_chat_time" jdbcType="TIMESTAMP"/>
     </resultMap>
 
     <sql id="UserServiceAllSql">
-        id, uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id, new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat
+        id, uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id, new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat, add_group_chat_time
     </sql>
 
     <!--查询单个-->
@@ -84,6 +85,9 @@
             <if test="addGroupChat != null">
                 and add_group_chat = #{addGroupChat}
             </if>
+            <if test="addGroupChatTime != null">
+                and add_group_chat_time = #{addGroupChatTime}
+            </if>
         </where>
         <if test="page_sql != null">
             ${page_sql}
@@ -140,6 +144,9 @@
             <if test="addGroupChat != null">
                 and add_group_chat = #{addGroupChat}
             </if>
+            <if test="addGroupChatTime != null">
+                and add_group_chat_time = #{addGroupChatTime}
+            </if>
         </where>
     </select>
 
@@ -147,11 +154,112 @@
     <insert id="insert" keyProperty="id" useGeneratedKeys="true">
         insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
                                  new_time, remarks, create_time, tech_satisfaction, business_satisfaction,
-                                 add_group_chat)
+                                 add_group_chat, add_group_chat_time)
         values (#{uid}, #{aid}, #{addWechat}, #{wechat}, #{renewal}, #{renewalTime}, #{signProject}, #{signProjectId},
-                #{newTime}, #{remarks}, #{createTime}, #{techSatisfaction}, #{businessSatisfaction}, #{addGroupChat})
+                #{newTime}, #{remarks}, #{createTime}, #{techSatisfaction}, #{businessSatisfaction}, #{addGroupChat},
+                #{addGroupChatTime})
+    </insert>
+
+    <insert id="insertBatch">
+        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
+        new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat, add_group_chat_time)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.uid}, #{entity.aid}, #{entity.addWechat}, #{entity.wechat}, #{entity.renewal},
+            #{entity.renewalTime}, #{entity.signProject}, #{entity.signProjectId}, #{entity.newTime}, #{entity.remarks},
+            #{entity.createTime}, #{entity.techSatisfaction}, #{entity.businessSatisfaction}, #{entity.addGroupChat},
+            #{entity.addGroupChatTime})
+        </foreach>
+    </insert>
+
+    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
+        new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat, add_group_chat_time)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.uid}, #{entity.aid}, #{entity.addWechat}, #{entity.wechat}, #{entity.renewal},
+            #{entity.renewalTime}, #{entity.signProject}, #{entity.signProjectId}, #{entity.newTime}, #{entity.remarks},
+            #{entity.createTime}, #{entity.techSatisfaction}, #{entity.businessSatisfaction}, #{entity.addGroupChat},
+            #{entity.addGroupChatTime})
+        </foreach>
+        on duplicate key update
+        uid = values(uid),
+        aid = values(aid),
+        add_wechat = values(add_wechat),
+        wechat = values(wechat),
+        renewal = values(renewal),
+        renewal_time = values(renewal_time),
+        sign_project = values(sign_project),
+        sign_project_id = values(sign_project_id),
+        new_time = values(new_time),
+        remarks = values(remarks),
+        create_time = values(create_time),
+        tech_satisfaction = values(tech_satisfaction),
+        business_satisfaction = values(business_satisfaction),
+        add_group_chat = values(add_group_chat),
+        add_group_chat_time = values(add_group_chat_time)
     </insert>
 
+    <!--通过主键修改数据-->
+    <update id="update">
+        update user_service
+        <set>
+            <if test="uid != null and uid != ''">
+                uid = #{uid},
+            </if>
+            <if test="aid != null and aid != ''">
+                aid = #{aid},
+            </if>
+            <if test="addWechat != null">
+                add_wechat = #{addWechat},
+            </if>
+            <if test="wechat != null and wechat != ''">
+                wechat = #{wechat},
+            </if>
+            <if test="renewal != null">
+                renewal = #{renewal},
+            </if>
+            <if test="renewalTime != null">
+                renewal_time = #{renewalTime},
+            </if>
+            <if test="signProject != null and signProject != ''">
+                sign_project = #{signProject},
+            </if>
+            <if test="signProjectId != null and signProjectId != ''">
+                sign_project_id = #{signProjectId},
+            </if>
+            <if test="newTime != null">
+                new_time = #{newTime},
+            </if>
+            <if test="remarks != null and remarks != ''">
+                remarks = #{remarks},
+            </if>
+            <if test="createTime != null">
+                create_time = #{createTime},
+            </if>
+            <if test="techSatisfaction != null">
+                tech_satisfaction = #{techSatisfaction},
+            </if>
+            <if test="businessSatisfaction != null">
+                business_satisfaction = #{businessSatisfaction},
+            </if>
+            <if test="addGroupChat != null">
+                add_group_chat = #{addGroupChat},
+            </if>
+            <if test="addGroupChatTime != null">
+                add_group_chat_time = #{addGroupChatTime},
+            </if>
+        </set>
+        where id = #{id}
+    </update>
+
+    <!--通过主键删除-->
+    <delete id="deleteById">
+        delete
+        from user_service
+        where id = #{id}
+    </delete>
+    <!--部分新增-->
     <insert id="insertSelective" parameterType="com.goafanti.common.model.UserService">
         <!--
           WARNING - @mbg.generated
@@ -205,6 +313,9 @@
             <if test="addGroupChat != null">
                 add_group_chat,
             </if>
+            <if test="addGroupChatTime != null">
+                add_group_chat_time,
+            </if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">
@@ -252,103 +363,12 @@
             <if test="addGroupChat != null">
                 #{addGroupChat,jdbcType=INTEGER},
             </if>
+            <if test="addGroupChatTime != null">
+                #{addGroupChatTime},
+            </if>
         </trim>
     </insert>
 
-    <insert id="insertBatch">
-        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
-        new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.aid}, #{entity.addWechat}, #{entity.wechat}, #{entity.renewal},
-            #{entity.renewalTime}, #{entity.signProject}, #{entity.signProjectId}, #{entity.newTime}, #{entity.remarks},
-            #{entity.createTime}, #{entity.techSatisfaction}, #{entity.businessSatisfaction}, #{entity.addGroupChat})
-        </foreach>
-    </insert>
-
-    <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into user_service(uid, aid, add_wechat, wechat, renewal, renewal_time, sign_project, sign_project_id,
-        new_time, remarks, create_time, tech_satisfaction, business_satisfaction, add_group_chat)
-        values
-        <foreach collection="entities" item="entity" separator=",">
-            (#{entity.uid}, #{entity.aid}, #{entity.addWechat}, #{entity.wechat}, #{entity.renewal},
-            #{entity.renewalTime}, #{entity.signProject}, #{entity.signProjectId}, #{entity.newTime}, #{entity.remarks},
-            #{entity.createTime}, #{entity.techSatisfaction}, #{entity.businessSatisfaction}, #{entity.addGroupChat})
-        </foreach>
-        on duplicate key update
-        uid = values(uid),
-        aid = values(aid),
-        add_wechat = values(add_wechat),
-        wechat = values(wechat),
-        renewal = values(renewal),
-        renewal_time = values(renewal_time),
-        sign_project = values(sign_project),
-        sign_project_id = values(sign_project_id),
-        new_time = values(new_time),
-        remarks = values(remarks),
-        create_time = values(create_time),
-        tech_satisfaction = values(tech_satisfaction),
-        business_satisfaction = values(business_satisfaction),
-        add_group_chat = values(add_group_chat)
-    </insert>
-
-    <!--通过主键修改数据-->
-    <update id="update">
-        update user_service
-        <set>
-            <if test="uid != null and uid != ''">
-                uid = #{uid},
-            </if>
-            <if test="aid != null and aid != ''">
-                aid = #{aid},
-            </if>
-            <if test="addWechat != null">
-                add_wechat = #{addWechat},
-            </if>
-            <if test="wechat != null and wechat != ''">
-                wechat = #{wechat},
-            </if>
-            <if test="renewal != null">
-                renewal = #{renewal},
-            </if>
-            <if test="renewalTime != null">
-                renewal_time = #{renewalTime},
-            </if>
-            <if test="signProject != null and signProject != ''">
-                sign_project = #{signProject},
-            </if>
-            <if test="signProjectId != null and signProjectId != ''">
-                sign_project_id = #{signProjectId},
-            </if>
-            <if test="newTime != null">
-                new_time = #{newTime},
-            </if>
-            <if test="remarks != null and remarks != ''">
-                remarks = #{remarks},
-            </if>
-            <if test="createTime != null">
-                create_time = #{createTime},
-            </if>
-            <if test="techSatisfaction != null">
-                tech_satisfaction = #{techSatisfaction},
-            </if>
-            <if test="businessSatisfaction != null">
-                business_satisfaction = #{businessSatisfaction},
-            </if>
-            <if test="addGroupChat != null">
-                add_group_chat = #{addGroupChat},
-            </if>
-        </set>
-        where id = #{id}
-    </update>
-
-    <!--通过主键删除-->
-    <delete id="deleteById">
-        delete
-        from user_service
-        where id = #{id}
-    </delete>
-
     <select id="selectByUid" resultType="java.lang.Integer">
         select id from user_service where uid= #{uid}
     </select>
@@ -462,5 +482,6 @@
             and c.add_group_chat = #{addGroupChat}
         </if>
     </select>
+
 </mapper>
 

+ 14 - 2
src/main/java/com/goafanti/common/model/UserService.java

@@ -8,10 +8,10 @@ import java.util.Date;
  * 客服信息表(UserService)实体类
  *
  * @author makejava
- * @since 2024-11-06 09:00:41
+ * @since 2024-11-11 17:01:54
  */
 public class UserService implements Serializable {
-    private static final long serialVersionUID = 215446055667637479L;
+    private static final long serialVersionUID = -85623933226950055L;
 
     private Integer id;
 
@@ -68,6 +68,10 @@ public class UserService implements Serializable {
      * 入群 0=否,1=是
      */
     private Integer addGroupChat;
+    /**
+     * 入群时间
+     */
+    private Date addGroupChatTime;
 
 
     public Integer getId() {
@@ -190,5 +194,13 @@ public class UserService implements Serializable {
         this.addGroupChat = addGroupChat;
     }
 
+    public Date getAddGroupChatTime() {
+        return addGroupChatTime;
+    }
+
+    public void setAddGroupChatTime(Date addGroupChatTime) {
+        this.addGroupChatTime = addGroupChatTime;
+    }
+
 }
 

+ 3 - 0
src/main/java/com/goafanti/user/service/impl/UserServiceServiceImpl.java

@@ -99,6 +99,9 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 		update.setUid(us.getUid());
 		update.setAddGroupChat(us.getAddGroupChat());
 		Date date = new Date();
+		if (update.getAddGroupChat()==1){
+			update.setAddGroupChatTime(date);
+		}
 		if (id==null) {
 			update.setCreateTime(date);
 			update.setNewTime(date);