diff --git a/src/main/java/com/daeucna/board/common/PagingUtil.java b/src/main/java/com/daeucna/board/common/PagingUtil.java index 541952f..c87502e 100644 --- a/src/main/java/com/daeucna/board/common/PagingUtil.java +++ b/src/main/java/com/daeucna/board/common/PagingUtil.java @@ -46,17 +46,17 @@ public class PagingUtil { // 페이지 네이게이션 설정 pagination += ""; int offset = ((currentPage - 1) * countPerList); // 한 화면의 표출되는 게시물의 시작 번호 (쿼리 조건절) diff --git a/src/main/java/com/daeucna/board/common/ResultUtil.java b/src/main/java/com/daeucna/board/common/ResultUtil.java index 9db29bc..689acab 100644 --- a/src/main/java/com/daeucna/board/common/ResultUtil.java +++ b/src/main/java/com/daeucna/board/common/ResultUtil.java @@ -13,4 +13,5 @@ public class ResultUtil { private String state = "FAIL"; private String msg = ""; private Object data = ""; + private String current_user; } diff --git a/src/main/java/com/daeucna/board/controller/BoardController.java b/src/main/java/com/daeucna/board/controller/BoardController.java index d0f21a3..b73cb0b 100644 --- a/src/main/java/com/daeucna/board/controller/BoardController.java +++ b/src/main/java/com/daeucna/board/controller/BoardController.java @@ -55,9 +55,10 @@ public class BoardController { public ResultUtil getBoardList(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm, Authentication authentication) throws Exception { UserDto userDto = (UserDto) authentication.getPrincipal(); boardForm.setBoard_kind(userDto.getBoardName()); - + ResultUtil resultUtils = boardService.getBoardList(boardForm); - + resultUtils.setCurrent_user(userDto.getUsername()); + return resultUtils; } @@ -71,11 +72,13 @@ public class BoardController { /** 게시판 - 상세 조회 */ @RequestMapping(value = "/getBoardDetail") @ResponseBody - public BoardDto getBoardDetail(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm) throws Exception { - + public BoardDto getBoardDetail(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm, Authentication authentication) throws Exception { + UserDto userDto = (UserDto) authentication.getPrincipal(); + MDC.put("ID", String.valueOf(boardForm.getBoard_seq())); BoardDto boardDto = boardService.getBoardDetail(boardForm); + boardDto.setCurrent_user(userDto.getUsername()); MDC.remove("ID"); @@ -97,7 +100,9 @@ public class BoardController { public BoardDto insertBoard(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm, Authentication authentication) throws Exception { UserDto userDto = (UserDto) authentication.getPrincipal(); boardForm.setBoard_kind(userDto.getBoardName()); - + boardForm.setIns_user_id(userDto.getUsername()); + boardForm.setUpd_user_id(userDto.getUsername()); + BoardDto boardDto = boardService.insertBoard(boardForm); return boardDto; @@ -123,10 +128,14 @@ public class BoardController { /** 게시판 - 수정 */ @RequestMapping(value = "/updateBoard") @ResponseBody - public BoardDto updateBoard(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm) throws Exception { - + public BoardDto updateBoard(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm, Authentication authentication) throws Exception { + UserDto userDto = (UserDto) authentication.getPrincipal(); + boardForm.setIns_user_id(userDto.getUsername()); + boardForm.setUpd_user_id(userDto.getUsername()); + BoardDto boardDto = boardService.updateBoard(boardForm); - + boardDto.setCurrent_user(userDto.getUsername()); + return boardDto; } @@ -140,8 +149,12 @@ public class BoardController { /** 게시판 - 답글 등록 */ @RequestMapping(value = "/insertBoardReply") @ResponseBody - public BoardDto insertBoardReply(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm) throws Exception { - + public BoardDto insertBoardReply(HttpServletRequest request, HttpServletResponse response, BoardForm boardForm, Authentication authentication) throws Exception { + UserDto userDto = (UserDto) authentication.getPrincipal(); + boardForm.setBoard_kind(userDto.getBoardName()); + boardForm.setIns_user_id(userDto.getUsername()); + boardForm.setUpd_user_id(userDto.getUsername()); + BoardDto boardDto = boardService.insertBoardReply(boardForm); return boardDto; diff --git a/src/main/java/com/daeucna/board/domain/BoardDto.java b/src/main/java/com/daeucna/board/domain/BoardDto.java index 6f44b1f..fa275ea 100644 --- a/src/main/java/com/daeucna/board/domain/BoardDto.java +++ b/src/main/java/com/daeucna/board/domain/BoardDto.java @@ -31,6 +31,7 @@ public class BoardDto extends CommonDto { String upd_user_id; String upd_date; + String current_user; String result; List files; diff --git a/src/main/java/com/daeucna/board/service/BoardService.java b/src/main/java/com/daeucna/board/service/BoardService.java index bb22600..186ce3e 100644 --- a/src/main/java/com/daeucna/board/service/BoardService.java +++ b/src/main/java/com/daeucna/board/service/BoardService.java @@ -45,7 +45,7 @@ public class BoardService { commonForm.setFunction_name(boardForm.getFunction_name()); commonForm.setCurrent_page_no(boardForm.getCurrent_page_no()); commonForm.setCount_per_page(10); - commonForm.setCount_per_list(15); + commonForm.setCount_per_list(12); commonForm.setTatal_list_count(totalCount); commonDto = PagingUtil.setPageUtil(commonForm); } diff --git a/src/main/resources/mapper/board/BoardMapper.xml b/src/main/resources/mapper/board/BoardMapper.xml index a1e084d..840e435 100644 --- a/src/main/resources/mapper/board/BoardMapper.xml +++ b/src/main/resources/mapper/board/BoardMapper.xml @@ -126,6 +126,7 @@ , INS_DATE , UPD_USER_ID , UPD_DATE + , PROC_STATUS ) VALUES ( @@ -136,10 +137,11 @@ , #{board_writer} , #{board_subject} , #{board_content} - , 'NONMEMBER' + , #{ins_user_id} , NOW() - , 'NONMEMBER' + , #{upd_user_id} , NOW() + , '미처리' ) @@ -178,9 +180,9 @@ , #{file_path} , #{file_size} , 'N' - , 'NONMEMBER' + , #{ins_user_id} , NOW() - , 'NONMEMBER' + , #{upd_user_id} , NOW() ) @@ -210,9 +212,9 @@ , #{board_writer1} , #{board_subject} , #{board_content} - , 'NONMEMBER' + , #{ins_user_id} , NOW() - , 'NONMEMBER' + , #{upd_user_id} , NOW() ) @@ -231,7 +233,9 @@ UPDATE BOARD.TB_BOARD SET BOARD_SUBJECT = #{board_subject} , BOARD_CONTENT = #{board_content} - , UPD_USER_ID = 'NONMEMBER' + , PROC_STATUS = #{proc_status} + , PROC_DESC = #{proc_desc} + , UPD_USER_ID = #{upd_user_id} , UPD_DATE = NOW() WHERE BOARD_SEQ = #{board_seq} @@ -252,7 +256,7 @@ UPDATE TB_BOARD SET BOARD_RE_SEQ = BOARD_RE_SEQ + 1 - , UPD_USER_ID = 'NONMEMBER' + , UPD_USER_ID = #{upd_user_id} , UPD_DATE = NOW() WHERE BOARD_RE_REF = #{board_re_ref} AND BOARD_RE_SEQ > #{board_re_seq} @@ -275,6 +279,7 @@ , INS_DATE , UPD_USER_ID , UPD_DATE + , PROC_STATUS ) VALUES ( @@ -285,10 +290,11 @@ , #{board_writer} , #{board_subject} , #{board_content} - , 'NONMEMBER' + , #{ins_user_id} , NOW() - , 'NONMEMBER' + , #{upd_user_id} , NOW() + , null ) @@ -297,7 +303,7 @@ UPDATE BOARD.TB_BOARD_FILE SET DEL_YN = 'Y' - , UPD_USER_ID = 'NONMEMBER' + , UPD_USER_ID = #{upd_user_id} , UPD_DATE = NOW() WHERE BOARD_SEQ = #{board_seq} AND FILE_NO = #{file_no} diff --git a/src/main/resources/templates/page/boardDetail.html b/src/main/resources/templates/page/boardDetail.html index 7b60c69..4e256f6 100644 --- a/src/main/resources/templates/page/boardDetail.html +++ b/src/main/resources/templates/page/boardDetail.html @@ -90,7 +90,8 @@ var updDate = obj.upd_date; var files = obj.files; var filesLen = files.length; - + var current_user = obj.current_user; + str += ""; str += "제목"; str += ""+ boardSubject +""; @@ -135,15 +136,30 @@ str += "처리상태"; str += ""+ boardProcStatus +""; str += ""; - str += ""; - str += "처리자"; - str += ""+ boardProcUser +""; - str += "처리일시"; - str += ""+ boardProcDate +""; - str += ""; - + if (boardProcStatus == "처리중" || boardProcStatus == "처리완료") { + str += ""; + str += "처리내용"; + str += ""+ boardProcDesc +""; + str += ""; + str += ""; + str += "처리자"; + str += ""+ boardProcUser +""; + str += "처리일시"; + str += ""+ boardProcDate +""; + str += ""; + } + + if (current_user != boardWriter) { + $("#btn_update").html("진행처리"); + } else { + $("#btn_reply").hide(); + } } else { + $("#btn_update").hide(); + $("#btn_delete").hide(); + $("#btn_reply").hide(); + alert("등록된 글이 존재하지 않습니다."); return; } @@ -218,10 +234,10 @@
- - - - + + + +
diff --git a/src/main/resources/templates/page/boardUpdate.html b/src/main/resources/templates/page/boardUpdate.html index 2d11b3e..a416788 100644 --- a/src/main/resources/templates/page/boardUpdate.html +++ b/src/main/resources/templates/page/boardUpdate.html @@ -62,6 +62,10 @@ var boardSubject = obj.board_subject; var boardContent = obj.board_content; var boardHits = obj.board_hits; + var boardProcStatus = obj.proc_status; + var boardProcDesc = obj.proc_desc; + var boardProcDate = obj.proc_date; + var boardProcUser = obj.proc_user; var delYn = obj.del_yn; var insUserId = obj.ins_user_id; var insDate = obj.ins_date; @@ -69,10 +73,26 @@ var updDate = obj.upd_date; var files = obj.files; var filesLen = files.length; + var current_user = obj.current_user; $("#board_subject").val(boardSubject); $("#board_content").val(boardContent); $("#board_writer").text(boardWriter); + $("#proc_desc").val(boardProcDesc); + $("#proc_status").val(boardProcStatus); + + if (current_user != boardWriter) { + $("#board_subject").attr("readonly",true); + $("#board_content").attr("readonly",true); + $("#btn_update").html("진행처리"); + } else { + if (boardProcStatus == "처리중" || boardProcStatus == "처리완료" ) { + $("#btn_update").hide(); + } else { + $("#tr_proc_desc").hide(); + $("#tr_proc_status").hide(); + } + } var fileStr = ""; @@ -212,6 +232,21 @@ 첨부파일 + + 처리내용* + + + + 처리상태* + + + + @@ -220,7 +255,7 @@
- +
-- libgit2 0.21.4