DM,GROUP検索

ABVJE_BL/src/jp/agentec/abook/abv/bl/data/dao/ChatRoomDao.java

@@ -62,7 +62,7 @@ public class ChatRoomDao extends AbstractDao {
 		return dto;
 	}
 
-	public List<ChatRoomDto> getAllChatRoom() {
+	public List<ChatRoomDto> getAllChatRoom(Integer roomType) {
 		StringBuffer sql = new StringBuffer();
 		sql.append(" SELECT ");
 		sql.append("      cr.chat_room_id ");
@@ -79,9 +79,10 @@ public class ChatRoomDao extends AbstractDao {
 		sql.append(" LEFT JOIN ");
 		sql.append("      ( SELECT max(insert_date) insert_date, message, message_type, chat_room_id FROM t_chat_message GROUP BY chat_room_id ) AS cm ");
 		sql.append("   ON cr.chat_room_id = cm.chat_room_id ");
+		sql.append(" WHERE cr.type =? ");
 		sql.append(" GROUP BY cr.chat_room_id ");
 		sql.append(" ORDER BY unread_count, cm.insert_date DESC ");
-		List<ChatRoomDto> list = rawQueryGetDtoList(sql.toString(), null, ChatRoomDto.class);
+		List<ChatRoomDto> list = rawQueryGetDtoList(sql.toString(), new String[]{""+ roomType}, ChatRoomDto.class);
 		return list;
 	}
 

ABVJE_BL/src/jp/agentec/abook/abv/bl/logic/CommunicationLogic.java

@@ -69,8 +69,8 @@ public class CommunicationLogic extends AbstractLogic {
 	/*package*/ CommunicationLogic() {
 	}
 
-	public String getChatRoomList() {
-		List<ChatRoomDto> chatRoomList = chatRoomDao.getAllChatRoom();
+	public String getChatRoomList(Integer roomType) {
+		List<ChatRoomDto> chatRoomList = chatRoomDao.getAllChatRoom(roomType);
 
 		JSONArray resultJsonArray = new JSONArray();
 		for (ChatRoomDto chatRoomDto : chatRoomList) {

ABVJE_UI_Android/src/jp/agentec/abook/abv/ui/home/activity/ChatWebviewActivity.java

@@ -684,8 +684,9 @@ public class ChatWebviewActivity extends ParentWebViewActivity {
         }
 
         @JavascriptInterface
-        public String getRoomList() {
-            String chatRoomListStr = communicationLogic.getChatRoomList();
+        public String getRoomList(String roomType) {
+
+            String chatRoomListStr = communicationLogic.getChatRoomList(Integer.parseInt(roomType));
             return chatRoomListStr;
         }