查询

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

@@ -19,24 +19,41 @@ public class GroupChatSearchQDTO implements Serializable {
     private Date dismissEndDate;
     // 群主列表
     private List<String> staffIdList;
-    // 群活码id
-    private Long chatHmId ;
     private String staffId ;
+    private int gicFlag = 1 ;
+    private String sortColumn = "";
+    private String sortType = "desc" ;
+    
+    public String getSortColumn() {
+        return sortColumn;
+    }
 
-    public String getStaffId() {
-        return staffId;
+    public String getSortType() {
+        return sortType;
     }
 
-    public void setStaffId(String staffId) {
-        this.staffId = staffId;
+    public void setSortColumn(String sortColumn) {
+        this.sortColumn = sortColumn;
+    }
+
+    public void setSortType(String sortType) {
+        this.sortType = sortType;
     }
 
-    public Long getChatHmId() {
-        return chatHmId;
+    public int getGicFlag() {
+        return gicFlag;
     }
 
-    public void setChatHmId(Long chatHmId) {
-        this.chatHmId = chatHmId;
+    public void setGicFlag(int gicFlag) {
+        this.gicFlag = gicFlag;
+    }
+
+    public String getStaffId() {
+        return staffId;
+    }
+
+    public void setStaffId(String staffId) {
+        this.staffId = staffId;
     }
 
     public Date getDismissStartDate() {

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

@@ -177,8 +177,9 @@
 		group by wx_enterprise_id , staff_id
 	</select>
 	
-	<select id="list" resultMap="result-map-tabHaobanGroupChat">
-		select <include refid="Base_Column_List" /> from tab_haoban_group_chat where wx_enterprise_id=#{wxEnterpriseId} and delete_flag = 0 
+	<select id="list" resultMap="result-map-tabHaobanGroupChat" parameterType="com.gic.haoban.manage.api.dto.qdto.chat.GroupChatSearchQDTO">
+		select <include refid="Base_Column_List" /> from tab_haoban_group_chat where wx_enterprise_id=#{wxEnterpriseId}
+		 and (enterpries_id = #{enterpriseId} or enterprise_id is null)
 		<if test="null != staffId">
 			and staff_id = #{staffId}
 		</if>
@@ -194,6 +195,30 @@
 		<if test="null != status and 4==status">
 			and chat_status = 4
 		</if>
+		<if test="null != searchParams">
+			and name like '%${searchParams}%'
+		</if>
+		<if test="null != staffIdList and staffIdList.size>0">
+			and staff_id in 
+			<foreach collection="staffIdList" close=")" index="index" item="staffId" open="(" separator=",">
+				#{staffId}
+			</foreach>
+		</if>
+		<if test="null != startDate">
+			and chat_add_time <![CDATA[ >=]]>   #{startDate} and chat_add_time  <![CDATA[ <= ]]>  #{endDate}
+		</if>
+		<if test="null != dismissStartDate">
+			and chat_dissolve_time <![CDATA[ >=]]>   #{startDate} and chat_dissolve_time  <![CDATA[ <= ]]>  #{endDate}	
+		</if>
+		<if test="null != gicFlag and gicFlag ==0 ">
+			and gic_flag = 0
+		</if>
+		<if test="null = gicFlag or gicFlag ==1 ">
+			and gic_flag = 1
+		</if>
+		 and delete_flag = 0 
+		 
+		 order by #{sortColumn} #{sortType}
 	</select>
 	
 	<update id="updateChatEnterpriseId">