Browse Source

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

anderx 1 year ago
parent
commit
7e116c88af

+ 8 - 0
src/main/java/com/goafanti/common/mapper/UserServiceMapper.xml

@@ -395,6 +395,7 @@
         <result column="techSatisfaction" property="techSatisfaction" />
         <result column="businessSatisfaction" property="businessSatisfaction" />
         <result column="add_group_chat" property="addGroupChat" />
+        <result column="add_group_chat_time" property="addGroupChatTime" />
         <association column="orderNo" javaType="java.util.ArrayList" property="list" select="getTask" />
     </resultMap>
 
@@ -408,6 +409,7 @@
     <select id="OrderUseServiceList" resultMap="userService">
         select a.order_no orderNo,a.contract_no contractNo,b.dep_name depName ,a.buyer_id uid,a.create_time ,b.buyer_name userName,c.new_time ,
         date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as orderTimes, date_format(c.new_time,'%Y-%m-%d %H:%i:%S') as newTimes,c.add_group_chat,
+        c.add_group_chat_time ,
         date_format(c.renewal_time,'%Y-%m-%d') as renewalTimes, date_format(a.sign_time,'%Y-%m-%d') as signTimes,a.delete_sign deleteSign ,
         d.name adminName,c.add_wechat addWechat,c.wechat ,c.renewal ,c.renewal_time ,c.sign_project signProject ,c.remarks,
         c.tech_satisfaction techSatisfaction, c.business_satisfaction businessSatisfaction
@@ -442,6 +444,9 @@
         <if test="addGroupChat != null">
             and c.add_group_chat = #{addGroupChat}
         </if>
+        <if test="addGroupChatTimeStart != null">
+            and c.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
+        </if>
         order by c.new_time,a.create_time
         <if test="page_sql != null">
             ${page_sql}
@@ -481,6 +486,9 @@
         <if test="addGroupChat != null">
             and c.add_group_chat = #{addGroupChat}
         </if>
+        <if test="addGroupChatTimeStart != null">
+            and c.add_group_chat_time BETWEEN #{addGroupChatTimeStart} and #{addGroupChatTimeEnd}
+        </if>
     </select>
 
 </mapper>

+ 19 - 0
src/main/java/com/goafanti/user/bo/InputListOrderUserService.java

@@ -24,9 +24,28 @@ public class InputListOrderUserService {
 	private String endSignTimes;
 	private String contractNo;
 	private Integer addGroupChat;
+	private String addGroupChatTimeStart;
+	private String addGroupChatTimeEnd;
 	private Integer pageSize;
 	private Integer pageNo;
 
+
+	public String getAddGroupChatTimeStart() {
+		return addGroupChatTimeStart;
+	}
+
+	public void setAddGroupChatTimeStart(String addGroupChatTimeStart) {
+		this.addGroupChatTimeStart = addGroupChatTimeStart;
+	}
+
+	public String getAddGroupChatTimeEnd() {
+		return addGroupChatTimeEnd;
+	}
+
+	public void setAddGroupChatTimeEnd(String addGroupChatTimeEnd) {
+		this.addGroupChatTimeEnd = addGroupChatTimeEnd;
+	}
+
 	public Integer getAddGroupChat() {
 		return addGroupChat;
 	}

+ 13 - 0
src/main/java/com/goafanti/user/bo/OutOrderUserService.java

@@ -1,7 +1,9 @@
 package com.goafanti.user.bo;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.goafanti.common.utils.excel.Excel;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -51,9 +53,20 @@ public class OutOrderUserService {
 	private Integer businessSatisfaction;
 	@Excel(name = "是否入群",readConverterExp = "0=否,1=是")
 	private Integer addGroupChat;
+	@Excel(name = "入群时间")
+	private Date addGroupChatTime;
 	private String uid;
 	private List<OrderProject> list;
 
+	@JsonFormat(pattern = "yyyy-MM-dd" ,timezone = "GMT+8")
+	public Date getAddGroupChatTime() {
+		return addGroupChatTime;
+	}
+
+	public void setAddGroupChatTime(Date addGroupChatTime) {
+		this.addGroupChatTime = addGroupChatTime;
+	}
+
 	public Integer getAddGroupChat() {
 		if (addGroupChat==null)return 0;
 		return addGroupChat;

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

@@ -80,6 +80,8 @@ public class  UserServiceServiceImpl extends BaseMybatisDao<UserServiceMapper> i
 		if(i.getRenewal()!=null)map.put("renewal", i.getRenewal());
 		if (i.getContractNo()!=null)map.put("contractNo", i.getContractNo());
 		if (i.getAddGroupChat()!=null)map.put("addGroupChat", i.getAddGroupChat());
+		if (i.getAddGroupChatTimeStart()!=null)map.put("addGroupChatTimeStart", i.getAddGroupChatTimeStart());
+		if (i.getAddGroupChatTimeEnd()!=null)map.put("addGroupChatTimeEnd", i.getAddGroupChatTimeEnd()+" 23:59:59");
 		return map;
 	}