From 7152ceca7b76d1867067b911faae00ce6d27f6fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 8 May 2023 17:20:43 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=20>=20?= =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=9E=A5=EB=B9=84=ED=98=84=ED=99=A9=20>=20?= =?UTF-8?q?=EC=9E=A5=EB=B9=84=ED=98=84=ED=99=A9=20=EC=88=98=EC=A0=95,=20?= =?UTF-8?q?=EC=9D=B4=EB=A0=A5=20=EB=AA=A8=EB=8B=AC=20=ED=86=B5=ED=95=A9.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../faisp/main/equip/EquipController.java | 21 +- .../faisp/main/equip/mapper/EquipMapper.java | 2 +- .../dbnt/faisp/main/equip/model/Equip.java | 2 +- .../main/equip/service/EquipService.java | 2 +- .../resources/mybatisMapper/EquipMapper.xml | 2 +- src/main/resources/static/js/equip/equip.js | 100 ++---- .../templates/equip/equipHistory.html | 160 --------- .../resources/templates/equip/equipList.html | 17 +- .../templates/equip/equipModifyModal.html | 334 +++++++++++++----- 9 files changed, 284 insertions(+), 356 deletions(-) delete mode 100644 src/main/resources/templates/equip/equipHistory.html diff --git a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java index db08274e..d0d1fa01 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/EquipController.java +++ b/src/main/java/com/dbnt/faisp/main/equip/EquipController.java @@ -72,10 +72,11 @@ public class EquipController { @PostMapping("/saveEquip") public void saveEquip(@AuthenticationPrincipal UserInfo loginUser,Equip equip, MultipartHttpServletRequest request){ - equip.setWrtNm(loginUser.getUserNm()); equip.setWrtOrgan(loginUser.getOgCd()); equip.setWrtPart(loginUser.getOfcCd()); + equip.setWrtUserSeq(loginUser.getUserSeq()); equip.setWrtTitle(loginUser.getTitleCd()); + equip.setWrtNm(loginUser.getUserNm()); equip.setWrtDt(LocalDateTime.now()); equipService.saveEquip(equip,request); } @@ -109,6 +110,11 @@ public class EquipController { mav.addObject("userSeq", loginUser.getUserSeq()); mav.addObject("wrtUserSeq", equipService.selectEquipFirstUserSeq(equip)); mav.addObject("equInfo", equipService.selectEquipInfo(equip)); + + List equipHistoryList = equipService.selectHistoryList(equip); + mav.addObject("historyList", equipHistoryList.subList(1, equipHistoryList.size())); + mav.addObject("lastVersion", equipService.selectHistoryDetail(equipHistoryList.get(0))); + return mav; } @@ -124,23 +130,14 @@ public class EquipController { return result; } - @GetMapping("/historyView") - public ModelAndView historyView(Equip equip) { - ModelAndView mav = new ModelAndView("equip/equipHistory"); - List equipHistoryList = equipService.selectHistoryList(equip); - mav.addObject("historyList", equipHistoryList.subList(1, equipHistoryList.size())); - mav.addObject("lastVersion", equipService.selectHistoryDetail(equipHistoryList.get(0))); - return mav; - } - @GetMapping("/HistoryDetail") @ResponseBody public Equip HistoryDetail(Equip equip){ return equipService.selectHistoryDetail(equip); } - @PostMapping("/epuipDelete") - public void epuipDelete(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List equip){ + @PostMapping("/equipDelete") + public void equipDelete(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List equip){ equipService.equipDelete(equip,loginUser); } diff --git a/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java b/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java index 8cc1e213..fde6146f 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java +++ b/src/main/java/com/dbnt/faisp/main/equip/mapper/EquipMapper.java @@ -29,7 +29,7 @@ public interface EquipMapper { Integer selectEquipLogListCnt(EquipLog equipLog); - String selectEquipFirstUserSeq(Equip equip); + Integer selectEquipFirstUserSeq(Equip equip); List selectCellPhoneList(CellPhone cellPhone); diff --git a/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java b/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java index 498e5af0..8b398dc4 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java +++ b/src/main/java/com/dbnt/faisp/main/equip/model/Equip.java @@ -52,7 +52,7 @@ public class Equip extends BaseModel implements Serializable{ @Column(name = "wrt_title") private String wrtTitle; @Column(name = "wrt_user_seq") - private String wrtUserSeq; + private Integer wrtUserSeq; @Column(name = "wrt_nm") private String wrtNm; @Column(name = "wrt_dt") diff --git a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java index 5f2ac863..b8746183 100644 --- a/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java +++ b/src/main/java/com/dbnt/faisp/main/equip/service/EquipService.java @@ -271,7 +271,7 @@ public class EquipService extends BaseService { return equipMapper.selectEquipLogListCnt(equipLog); } - public String selectEquipFirstUserSeq(Equip equip) { + public Integer selectEquipFirstUserSeq(Equip equip) { return equipMapper.selectEquipFirstUserSeq(equip); } diff --git a/src/main/resources/mybatisMapper/EquipMapper.xml b/src/main/resources/mybatisMapper/EquipMapper.xml index ea9d8f21..16571ddc 100644 --- a/src/main/resources/mybatisMapper/EquipMapper.xml +++ b/src/main/resources/mybatisMapper/EquipMapper.xml @@ -399,7 +399,7 @@ ) a - select wrt_user_seq from equ_mgt where equ_key = #{equKey} diff --git a/src/main/resources/static/js/equip/equip.js b/src/main/resources/static/js/equip/equip.js index 54a1b04a..d41392ad 100644 --- a/src/main/resources/static/js/equip/equip.js +++ b/src/main/resources/static/js/equip/equip.js @@ -1,4 +1,3 @@ - $(document).ready(function(){ $(".table_id").each(function(){ var rows = $(".table_id:contains('"+$(this).text()+"')"); @@ -97,42 +96,6 @@ $(document).on('click', '#saveEquip', function (){ }); -$(document).on('click', '#equUpdateBtn', function (){ - if($('input:checkbox[name=equChk]:checked').length < 1){ - alert("게시물을 선택해주세요") - return false; - } - if($('input:checkbox[name=equChk]:checked').length > 1){ - alert("한개만 선택해주세요") - return false; - } - const target = $('input:checkbox[name=equChk]:checked'); - const equKey = Number(target.parents('tr').find('.equKey').val()); - showUpdateModal(equKey); -}) - -function showUpdateModal(equKey){ - $.ajax({ - url: '/equip/updatePage', - data: {equKey: equKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#equipModifyModalContent").empty().append(html) - $("#equipModifyModal").modal('show'); - $(".mStoredYear").datepicker({ - minViewMode: 'years', - format: "yyyy", - language: "ko", - autoclose: true - }) - }, - error:function(e){ - ajaxErrorAction(e); - } - }); -} - $(document).on('click', '#addImgBtn', function (){ $("#imgUpload").remove(); $("#addImgBtn").hide(); @@ -172,7 +135,6 @@ $(document).on('click', '#updateEquip', function (){ contentType: false, success : function(data) { alert("수정되었습니다."); - showUpdateModal(data); contentFade("out"); location.reload(); }, @@ -185,32 +147,6 @@ $(document).on('click', '#updateEquip', function (){ }); -$(document).on('click', '#historyBtn', function (){ - if($('input:checkbox[name=equChk]:checked').length < 1){ - alert("장비를 선택해주세요") - return false; - } - if($('input:checkbox[name=equChk]:checked').length > 1){ - alert("한개만 선택해주세요") - return false; - } - const target = $('input:checkbox[name=equChk]:checked'); - const equKey = Number(target.parents('tr').find('.equKey').val()); - $.ajax({ - url: '/equip/historyView', - data: {equKey: equKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#equipHistoryModalContent").empty().append(html) - $("#equipHistoryModal").modal('show'); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); -}) - $(document).on('click', '.historyInfoTr', function (){ $(this).find('.hisChk').prop('checked',true) if($(this).find('.hisChk').prop('checked')){ @@ -267,7 +203,7 @@ $(document).on('click', '#deleteEquip', function (){ function deleteEquip(checkArr){ $.ajax({ type : 'POST', - url : "/equip/epuipDelete", + url : "/equip/equipDelete", data : JSON.stringify(checkArr), contentType: 'application/json', beforeSend: function (xhr){ @@ -295,13 +231,33 @@ $(document).on('click', '#statusExcel', function (){ } }) -$(document).on('click', '.modalCloseBtn', function (){ - location.reload(); +$(document).on('click', '.equipTr', function (){ + $.ajax({ + url: '/equip/updatePage', + data: {equKey: $(this).find('.equKey').val()}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#equipModifyModalContent").empty().append(html) + $("#equipModifyModal").modal('show'); + $(".mStoredYear").datepicker({ + minViewMode: 'years', + format: "yyyy", + language: "ko", + autoclose: true + }) + }, + error:function(e){ + ajaxErrorAction(e); + } + }); }) -$(document).on('click', '.equipTr', function (event){ - if(event.target.className !== "equInfoCheckBox"){ - const chkBox = $(this).find(".equInfoCheckBox")[0]; - chkBox.checked = !chkBox.checked; - } +$(document).on('click', '#formTab', function (){ + $("#equipModifyModalFooter").show(); + $("#equipModifyModal").find('.modal-dialog')[0].className = "modal-dialog modal-dialog-scrollable"; }) +$(document).on('click', '#historyTab', function (){ + $("#equipModifyModalFooter").hide(); + $("#equipModifyModal").find('.modal-dialog')[0].className = "modal-dialog modal-xl modal-dialog-scrollable"; +}) \ No newline at end of file diff --git a/src/main/resources/templates/equip/equipHistory.html b/src/main/resources/templates/equip/equipHistory.html deleted file mode 100644 index 69963a76..00000000 --- a/src/main/resources/templates/equip/equipHistory.html +++ /dev/null @@ -1,160 +0,0 @@ - - - - -
-
수정이력
- -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
작성자등록일
- - -
수정 이력이 없습니다.
-
-
-
-
-
수정이력
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
-
-
최신데이터
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- 첨부이미지 -
-
- -
-
-
-
-
-
-
- -
-
- \ No newline at end of file diff --git a/src/main/resources/templates/equip/equipList.html b/src/main/resources/templates/equip/equipList.html index 26758ff0..04ac2aa7 100644 --- a/src/main/resources/templates/equip/equipList.html +++ b/src/main/resources/templates/equip/equipList.html @@ -47,7 +47,6 @@ - @@ -60,11 +59,8 @@ - + + @@ -80,10 +76,7 @@
순번 소속 세부소속
- - - -
-
-
- -
+
-
- - -
diff --git a/src/main/resources/templates/equip/equipModifyModal.html b/src/main/resources/templates/equip/equipModifyModal.html index 6a724ec5..0aa3f5ff 100644 --- a/src/main/resources/templates/equip/equipModifyModal.html +++ b/src/main/resources/templates/equip/equipModifyModal.html @@ -5,106 +5,252 @@
-
- - - - -
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
-
- - + +
+
+ + + + + +
+ +
+ +
- +
+
+
+ + + + + + + + + + + + + + + + + + + + + + +
작성자등록일
+ + +
수정 이력이 없습니다.
+
+
+
+
+
수정이력
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
최신데이터
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ 첨부이미지 +
+
-
- - -
- +
-
+
- - -
-
- +
+
\ No newline at end of file