Commit afc531ed by Lee Daehyun

アーカイブディテール修正

parent be9625d6
......@@ -33,6 +33,7 @@ public class ArchiveDetailJSON extends AcmsCommonJSON {
archiveDto.archiveDate = DateTimeUtil.millToDateString(archiveInfo.getJSONObject(ABookCommConstants.KEY.ARCHIVE_DATE)
.getLong(ABookCommConstants.KEY.TIME), "yyyy/MM/dd HH:mm");
archiveDto.roomId = archiveInfo.getInt(ABookCommConstants.KEY.ROOM_ID);
archiveDto.roomName = archiveInfo.getString(ABookCommConstants.KEY.ROOM_NAME);
archiveDto.saveUserId = archiveInfo.getInt(ABookCommConstants.KEY.SAVE_USER_ID);
archiveDto.filePath = archiveInfo.getString(ABookCommConstants.KEY.FILE_PATH);
if (archiveInfo.has(ABookCommConstants.KEY.ATTEND_USER_IDS)) {
......
......@@ -157,7 +157,7 @@ public class ArchiveDao extends AbstractDao {
}
public boolean updateArchiveDetailInfo(ArchiveDto dto) {
long count = update("update t_archive set archive_name=?, archive_type=?, archive_date=?, room_id=?, attend_user_ids=?, file_path=?, save_user_id=? where archive_id=?", dto.getUpdateDetailValues());
long count = update("update t_archive set archive_name=?, archive_type=?, archive_date=?, room_id=?, room_name=?, attend_user_ids=?, file_path=?, save_user_id=? where archive_id=?", dto.getUpdateDetailValues());
return count > 0;
}
......
......@@ -23,6 +23,7 @@ public class TArchive extends SQLiteTableScript {
sql.append(" , attend_user_ids VARCHAR2 ");
sql.append(" , file_path VARCHAR2 ");
sql.append(" , room_id INTEGER ");
sql.append(" , room_name VARCHAR2 ");
sql.append(" , save_user_id INTEGER ");
sql.append(" , collaboration_detail_id INTEGER ");
sql.append(" , PRIMARY KEY (archive_id)");
......
......@@ -7,6 +7,7 @@ public class ArchiveDto extends AbstractDto {
public String archiveDate;
public Integer archiveType;
public Integer roomId;
public String roomName;
public Integer saveUserId;
public String attendUserIds;
public String filePath;
......@@ -25,7 +26,7 @@ public class ArchiveDto extends AbstractDto {
}
public Object[] getUpdateDetailValues() {
return new Object[]{archiveName, archiveType, archiveDate, roomId, attendUserIds, filePath, saveUserId, archiveId};
return new Object[]{archiveName, archiveType, archiveDate, roomId, roomName, attendUserIds, filePath, saveUserId, archiveId};
}
@Override
......
......@@ -962,7 +962,7 @@ public class CommunicationLogic extends AbstractLogic {
archiveMap.put(ABookCommConstants.KEY.ARCHIVE_DATE, archiveDto.archiveDate);
archiveMap.put(ABookCommConstants.KEY.ARCHIVE_TYPE, archiveDto.archiveType);
archiveMap.put(ABookCommConstants.KEY.ROOM_ID, archiveDto.roomId);
archiveMap.put(ABookCommConstants.KEY.ROOM_NAME, chatRoomDao.getChatRoom(archiveDto.roomId).chatRoomName);
archiveMap.put(ABookCommConstants.KEY.ROOM_NAME, archiveDto.roomName);
archiveMap.put(ABookCommConstants.KEY.SAVE_USER_ID, archiveDto.saveUserId);
archiveMap.put(ABookCommConstants.KEY.ATTEND_USER_IDS, archiveDto.attendUserIds);
archiveMap.put(ABookCommConstants.KEY.FILE_PATH, archiveDto.filePath);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment