群查询

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/chat/GroupChatPlanLogDTO.java

@@ -37,6 +37,15 @@ public class GroupChatPlanLogDTO implements Serializable {
     private java.util.Date sendTime;
     private java.util.Date createTime;
     private java.util.Date updateTime;
+    private String wxChatId ;
+
+    public String getWxChatId() {
+        return wxChatId;
+    }
+
+    public void setWxChatId(String wxChatId) {
+        this.wxChatId = wxChatId;
+    }
 
     public Integer getChatTotalCount() {
         return chatTotalCount;

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanLogMapper.xml

@@ -74,7 +74,8 @@
 			  a.group_chat_id groupChatId,
 			  a.send_status sendStatus,
 			  a.send_time sendTime ,
-			  a.create_time createTime 
+			  a.create_time createTime ,
+			  d.wx_chat_id wxChatId 
 		  FROM tab_haoban_group_chat_plan_log a 
 		  LEFT JOIN tab_haoban_group_chat_plan_owner_log b ON a.`own_log_id` = b.`owner_log_id` 
           LEFT JOIN tab_haoban_staff c      ON   a.`staff_id` = c.`staff_id` 

haoban-manage3-service/src/main/resources/mapper/chat/GroupChatPlanMapper.xml

@@ -147,18 +147,17 @@
 		resultMap="result-map-tabHaobanGroupChatPlan">
 		SELECT
 		<include refid="Base_Column_List" />
-		FROM tab_haoban_group_chat_plan WHERE plan_id = #{planId} and
-		delete_flag = 0
+		FROM tab_haoban_group_chat_plan WHERE plan_id = #{planId} and delete_flag = 0
 	</select>
 
-	<select id="list"
-		parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO"
-		resultMap="result-map-tabHaobanGroupChatPlan">
+	<select id="list" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatPlanSearchQDTO" resultMap="result-map-tabHaobanGroupChatPlan">
 		select
 		<include refid="Base_Column_List" />
-		from tab_haoban_group_chat_plan where wx_enterprise_id
-		=#{wxEnterpriseId}
+		from tab_haoban_group_chat_plan where wx_enterprise_id=#{wxEnterpriseId}
 		and enterprise_id = #{enterpriseId} and delete_flag = 0
+		<if test="null != startDate">
+			and create_time <![CDATA[>=]]>	#{startDate} and create_time <![CDATA[<=]]> #{endDate}
+		</if>
 		<if test="null != status and status==1">
 			and start_time <![CDATA[<= ]]>	now() and end_time >= now()
 		</if>
@@ -171,9 +170,6 @@
 		<if test="null != searchParams and '' != searchParams">
 			and name like '%${searchParams}%'
 		</if>
-		<if test="null != startDate">
-			and create_time <![CDATA[>=]]>	#{startDate} and create_time <![CDATA[<=]]> #{endDate}
-		</if>
 		<if test="null !=creatorIdList and creatorIdList.size>0">
 			 and creator_id in 
 			 <foreach collection="creatorIdList" item="id" close=")" index="index" open="(" separator=",">