From 8ce4509d34bedb450f2891e856e7893fc9134a01 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Fri, 6 Jan 2023 14:00:33 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A3=BC=EC=9A=94=EC=82=AC=EA=B1=B4?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=98=84=ED=99=A9=202=EC=B0=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/config/BaseService.java | 2 + .../com/dbnt/faisp/config/FileController.java | 5 + .../service/BoardInvestigationService.java | 1 + .../majorStatus/MajorStatusController.java | 29 ++- .../ivsgtMgt/majorStatus/model/MajorFile.java | 2 +- .../repository/MajorStatusRepository.java | 2 + .../service/MajorStatusService.java | 44 ++-- src/main/resources/application-dev.properties | 1 + .../resources/application-prod.properties | 1 + .../resources/application-test.properties | 1 + .../mybatisMapper/MajorStatusMapper.xml | 15 +- .../resources/static/js/ivsgt/majorStatus.js | 192 ++++++++---------- .../majorStatus/majorStatusEditModal.html | 16 +- .../ivsgt/majorStatus/majorStatusPage.html | 5 +- .../majorStatus/majorStatusViewModal.html | 56 ++--- 15 files changed, 197 insertions(+), 175 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/config/BaseService.java b/src/main/java/com/dbnt/faisp/config/BaseService.java index 9648951d..0aa2f599 100644 --- a/src/main/java/com/dbnt/faisp/config/BaseService.java +++ b/src/main/java/com/dbnt/faisp/config/BaseService.java @@ -48,6 +48,8 @@ public class BaseService { protected String ciaEduPath; @Value("${file.dir.activityCase}") protected String activityCasePath; + @Value("${file.dir.majorStatus}") + protected String majorStatusPath; protected String calculationSize(double fileSize){ String[] units = {"bytes", "KB", "MB", "GB", "TB", "PB"}; diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index ed361e2c..5643e648 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -9,6 +9,7 @@ import com.dbnt.faisp.main.fpiMgt.affairPlan.service.PlanService; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; import com.dbnt.faisp.main.fpiMgt.sri.service.SriService; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.BoardInvestigationService; +import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService; import com.dbnt.faisp.main.publicBoard.service.PublicBoardService; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; @@ -44,6 +45,7 @@ public class FileController extends BaseService{ private final FishingBoatService fishingBoatService; private final SriService sriService; private final CounterIntelligenceService ciService; + private final MajorStatusService majorStatusService; @GetMapping("/editorFileDisplay") public ResponseEntity editorFileDisplay(HttpServletRequest request, @@ -143,6 +145,9 @@ public class FileController extends BaseService{ case "ciWork": downloadFile = ciService.selectCiWorkFile(parentKey, fileSeq); break; + case "MajorFile" : + downloadFile = majorStatusService.selectMajorFile(parentKey, fileSeq); + break; } return downloadFile; } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java index cc9cae91..75ff89f1 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/BoardInvestigationService.java @@ -106,6 +106,7 @@ public class BoardInvestigationService extends BaseService { } } + private void deletIvsgtFile(Integer ivsgtKey, List deleteFileSeq) { List ivsgtFileList = ivsgtFileRepository.findByIvsgtKey(ivsgtKey); for(IvsgtFile file: ivsgtFileList){ diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java index bef9c678..9104451b 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java @@ -3,7 +3,9 @@ package com.dbnt.faisp.main.ivsgtMgt.majorStatus; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.equip.model.Equip; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus; +import com.dbnt.faisp.main.ivsgtMgt.majorStatus.repository.MajorStatusRepository; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.service.MajorStatusService; import com.dbnt.faisp.main.userInfo.model.UserInfo; @@ -50,23 +52,33 @@ public class MajorStatusController { majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); }else{ majorStatus.setWrtOrgan(loginUser.getOgCd()); + majorStatus.setWrtPart(loginUser.getOfcCd()); + majorStatus.setWrtUserSeq(loginUser.getUserSeq()); + majorStatus.setWrtUserGrd(loginUser.getTitleCd()); majorStatus.setWrtUserNm(loginUser.getUserNm()); - majorStatus.setWrtDt(LocalDateTime.now()); + majorStatus.setWrtDt(loginUser.getWrtDt()); + majorStatus.setWrtDt(loginUser.getWrtDt()); + + } mav.addObject("majorStatus", majorStatus); - + mav.addObject("userSeq", loginUser.getUserSeq()); return mav; } @GetMapping("/majorViewModal") public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){ - ModelAndView mav = null; - mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal"); + ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal"); + majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); mav.addObject("userSeq", loginUser.getUserSeq()); - mav.addObject("major", majorStatus); + mav.addObject("majorStatus", majorStatus); + + //메뉴권한 확인 + // mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/"+majorStatus.getMajorType()).get(0).getAccessAuth()); + return mav; } @@ -79,5 +91,12 @@ public class MajorStatusController { } + @PostMapping("/deleteContent") + @ResponseBody + public void deleteContent(@AuthenticationPrincipal UserInfo loginUser, @RequestBody List majorStatuses){ + + majorStatusService.deleteContent(majorStatuses,loginUser); + + } } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/model/MajorFile.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/model/MajorFile.java index 1726cd73..1a891500 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/model/MajorFile.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/model/MajorFile.java @@ -14,7 +14,7 @@ import java.io.Serializable; @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "major_file") +@Table(name = "major_status_file") @IdClass(MajorFile.MajorFileId.class) public class MajorFile extends FileInfo { @Id diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java index 8c34985d..dd374335 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/repository/MajorStatusRepository.java @@ -4,4 +4,6 @@ import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus; import org.springframework.data.jpa.repository.JpaRepository; public interface MajorStatusRepository extends JpaRepository { + + void deleteByMajorKey(Integer majorKey); } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java index 231fc8c8..1f00972e 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/service/MajorStatusService.java @@ -3,17 +3,24 @@ package com.dbnt.faisp.main.ivsgtMgt.majorStatus.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.config.FileInfo; +import com.dbnt.faisp.main.counterIntelligence.activityCase.model.ActivityCaseFile; +import com.dbnt.faisp.main.equip.model.Equip; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.BoardInvestigation; +import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.IvsgtFile; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.mapper.MajorStatusMapper; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorFile; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.repository.MajorFileRepository; import com.dbnt.faisp.main.ivsgtMgt.majorStatus.repository.MajorStatusRepository; +import com.dbnt.faisp.main.publicBoard.model.PublicBoard; +import com.dbnt.faisp.main.publicBoard.model.PublicComment; +import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; +import javax.swing.*; import java.io.File; import java.util.List; import java.util.UUID; @@ -35,14 +42,14 @@ public class MajorStatusService extends BaseService { } public MajorStatus selectMajor(Integer majorKey) { - MajorStatus savedBoardInvestigation = majorStatusRepository.findById(majorKey).orElse(null); - if (savedBoardInvestigation != null) { - savedBoardInvestigation.setFileList(majorFileRepository.findByMajorKey(majorKey)); - - // savedBoardInvestigation.setArrestType(majorStatusMapper.selectArrestType(majorKey)); - // savedBoardInvestigation.setRelatedReportsList(majorStatusMapper.selectRelatedReportsList(majorKey)); - } - return savedBoardInvestigation; + MajorStatus majorStatus= majorStatusRepository.findById(majorKey).orElse(null); + majorStatus.setFileList(majorFileRepository.findByMajorKey(majorKey)); +// List commentList = publicCommentRepository.findByPublicKeyAndParentCommentOrderByCommentKeyAsc(publicKey, null); +// for(PublicComment comment: commentList){ +// comment.setChildCommentList(publicCommentRepository.findByPublicKeyAndParentCommentOrderByCommentKeyAsc(publicKey, comment.getCommentKey())); +// } + // publicBoard.setCommentList(commentList); + return majorStatus; } @Transactional @@ -57,27 +64,38 @@ public class MajorStatusService extends BaseService { return majorKey; } - private void saveUploadFiles(Integer majorkey, List multipartFileList) { - MajorFile lastFileInfo = majorFileRepository.findTopByMajorKeyOrderByFileSeq(majorkey).orElse(null); + private void saveUploadFiles(Integer majorKey, List multipartFileList){ + MajorFile lastFileInfo = majorFileRepository.findTopByMajorKeyOrderByFileSeq(majorKey).orElse(null); int fileSeq = lastFileInfo==null?1:(lastFileInfo.getFileSeq()+1); for(MultipartFile file : multipartFileList){ String saveName = UUID.randomUUID().toString(); - + String path = locationPath+ File.separator+"major"; + saveFile(file, new File(path+File.separator+saveName)); String originalFilename = file.getOriginalFilename(); int extnIdx = originalFilename.lastIndexOf("."); MajorFile fileInfo = new MajorFile(); - fileInfo.setMajorKey(majorkey); + fileInfo.setMajorKey(majorKey); fileInfo.setFileSeq(fileSeq++); fileInfo.setOrigNm(originalFilename.substring(0, extnIdx)); fileInfo.setFileExtn(originalFilename.substring(extnIdx+1)); fileInfo.setConvNm(saveName); fileInfo.setFileSize(calculationSize(file.getSize())); - + fileInfo.setSavePath(path); majorFileRepository.save(fileInfo); } } + + public void deleteContent(List majorStatuses, UserInfo loginUser){ + + for(MajorStatus majorStatus : majorStatuses){ + + majorStatusRepository.deleteByMajorKey(majorStatus.getMajorKey()); + } + + } + private void deleteMajorFile(Integer majorKey, List deleteFileSeq) { List majorFileList = majorFileRepository.findByMajorKey(majorKey); for(MajorFile file: majorFileList){ diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 2b0939a4..b1f487b8 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -26,6 +26,7 @@ file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu file.dir.activityCase=/activityCase +file.dir.majorStatus=/majorStatus editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index 31674498..b364704a 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -26,6 +26,7 @@ file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu file.dir.activityCase=/activityCase +file.dir.majorStatus=/majorStatus editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/application-test.properties b/src/main/resources/application-test.properties index 7c4d6545..7800bbd2 100644 --- a/src/main/resources/application-test.properties +++ b/src/main/resources/application-test.properties @@ -25,6 +25,7 @@ file.dir.cia.company=/cia/company file.dir.cia.foreigner=/cia/foreigner file.dir.cia.edu=/cia/edu file.dir.activityCase=/activityCase +file.dir.majorStatus=/majorStatus editor.img.view=/file/editorFileDisplay?fileNm= diff --git a/src/main/resources/mybatisMapper/MajorStatusMapper.xml b/src/main/resources/mybatisMapper/MajorStatusMapper.xml index b9858c81..3135cfa1 100644 --- a/src/main/resources/mybatisMapper/MajorStatusMapper.xml +++ b/src/main/resources/mybatisMapper/MajorStatusMapper.xml @@ -14,7 +14,7 @@ and a.wrt_organ = #{wrtOrgan} - AND a.content_title LIKE CONCAT('%', #{content_title}, '%') + AND a.content_title LIKE CONCAT('%', #{contentTitle}, '%') AND a.wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%') @@ -42,13 +42,20 @@ a.content_info, a.content_status, a.wrt_user_grd, + a.wrt_user_seq, a.wrt_user_nm, a.wrt_dt, a.wrt_organ, - wrt_user_seq, - wrt_part + a.wrt_part, + b.fileCnt from major_status a + left outer join (select major_key, + count(file_seq) as fileCnt + from major_status_file + group by major_key) b + on a.major_key = b.major_key + order by major_key desc limit #{rowCnt} offset #{firstIndex} @@ -60,4 +67,6 @@ + + \ No newline at end of file diff --git a/src/main/resources/static/js/ivsgt/majorStatus.js b/src/main/resources/static/js/ivsgt/majorStatus.js index d879a5ff..b8f0efc0 100644 --- a/src/main/resources/static/js/ivsgt/majorStatus.js +++ b/src/main/resources/static/js/ivsgt/majorStatus.js @@ -1,4 +1,37 @@ + + +$(document).on('click', '#addMajorBtn', function (){ + getEditModal(null) +}) + +$(document).on('click', '.tr', function (){ + $(".trChkBox").prop("checked", false); + $(this).find(".trChkBox").prop("checked", true); + getViewModal(Number($(this).find(".majorKey").val())); +}) + +// $(document).on('click', '.tr', function (event){ +// const target = event.target; +// if(!(target.className === "cpChk" ||$(target).parents("td").length>0)){ +// const phoneKey = (Number($(this).find(".phoneKey").val())); +// showModal(phoneKey); +// } +// }); + +$(document).on('click', '#saveBtn', function (){ + saveContent("boardEditForm") +}) + +$(document).on('click', '#editBtn', function (){ + $("#MajorViewModal").modal('hide') + getEditModal($(this).attr("data-majorkey")); +}) + + + + + $(function(){ $("#dateSelectorDiv").datepicker({ format: "yyyy-mm-dd", @@ -7,89 +40,63 @@ $(function(){ }); }) -// $(document).on('click', '#commentSaveBtn', function (){ -// if(!$("#comment").val()) { -// alert("댓글을 입력해주세요.") -// }else{ -// if (confirm("등록하시겠습니까?")) { -// contentFade("in") -// const formData = new FormData($("#commentForm")[0]); -// $.ajax({ -// type : 'POST', -// data : formData, -// url : "/publicBoard/saveComment", -// processData: false, -// contentType: false, -// dataType:"html", -// beforeSend: function (xhr){ -// xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); -// }, -// success : function(html) { -// const parentComment = $("#parentComment"); -// if(!parentComment.val()){ -// $("#commentDiv").append(html) -// }else{ -// $("#childComment"+parentComment.val()).append(html); -// } -// commentFormReset(); -// alert("저장되었습니다."); -// contentFade("out"); -// }, -// error : function(xhr, status) { -// alert("저장에 실패하였습니다.") -// contentFade("out"); -// } -// }) -// } + + + + +$(document).on('click', '#delectMajorBtn', function (){ + if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ + const checkArr = []; + $('input:checkbox[name=equChk]:checked').each(function (idx, el){ + checkArr.push({}); + const target = $(el); + checkArr[idx].equKey = Number(target.parents('tr').find('.majorKey').val()); + }) + deleteMajor(checkArr); + + } +}) + +// $(document).on('click', '#deleteEquip', function (){ +// if(confirm("선택한 대상을 삭제처리 하시겠습니까?")){ +// const checkArr = []; +// checkArr.push({}); +// checkArr[0].equKey = Number($('#mEquKey').val()); +// deleteEquip(checkArr); // } // }) -// $(document).on('click', '.childCommentBtn', function (){ -// const childCommentFormDiv = $(this).parents(".commentRow").find(".childCommentFormDiv") -// childCommentFormDiv.show(); -// $("#parentComment").val($(this).parents(".commentRow").find(".commentKey").val()); -// $("#childFormRemoveBtn").show(); -// childCommentFormDiv.empty().append($("#commentForm")) -// }) -// $(document).on('click', '#childFormRemoveBtn', function (){ -// commentFormReset(); -// }) -// $(document).on('click', '.deleteCommentBtn', function (){ -// const commentRow = $(this).parents(".commentRow"); -// const publicKey = Number(commentRow.find(".publicKey").val()); -// const commentKey = Number(commentRow.find(".commentKey").val()); -// $.ajax({ -// type : 'POST', -// data : JSON.stringify({publicKey: publicKey, commentKey: commentKey}), -// url : "/publicBoard/deleteComment", -// contentType: 'application/json', -// beforeSend: function (xhr){ -// xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); -// }, -// success : function(result) { -// commentRow.remove(); -// $("#childComment"+commentKey).remove(); -// alert("삭제되었습니다."); -// contentFade("out"); -// }, -// error : function(xhr, status) { -// alert("삭제를 실패하였습니다.") -// contentFade("out"); -// } -// }) -// }) +function deleteMajor(checkArr){ + $.ajax({ + type : 'POST', + url : "/ivsgt/deleteContent", + data : JSON.stringify(checkArr), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function() { + alert("삭제처리 되었습니다."); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제처리에 실패하였습니다"); + } + }) +} -function getEditModal(majorKey, majorType){ +function getEditModal(majorKey){ $.ajax({ url: '/ivsgt/majorEditModal', - data: {majorKey: majorKey, majorType:majorType}, + data: {majorKey: majorKey}, type: 'GET', dataType:"html", success: function(html){ - $("#editContent").empty().append(html) + $("#editContent").empty().append(html); setUploadDiv(); setEditor('editor', '570'); - $("#majorEditModal").modal('show'); + $("#MajorEditModal").modal('show'); + }, error:function(){ @@ -97,15 +104,15 @@ function getEditModal(majorKey, majorType){ }); } -function getViewModal(majorKey, majorType){ +function getViewModal(majorKey){ $.ajax({ url: '/ivsgt/majorViewModal', - data: {majorKey: majorKey, majorType: majorType}, + data: {majorKey: majorKey}, type: 'GET', dataType:"html", success: function(html){ $("#viewContent").empty().append(html) - $("#majorViewModal").modal('show'); + $("#MajorViewModal").modal('show'); }, error:function(){ @@ -126,7 +133,7 @@ function saveContent(formId, majorType){ $(".text-decoration-line-through").each(function (idx, el){ formData.append('fileSeq', $(el).attr("data-fileseq")); }) - formData.append('content', CrossEditor.GetBodyValue()); + formData.append('contentInfo', CrossEditor.GetBodyValue()); $.ajax({ type : 'POST', data : formData, @@ -136,8 +143,8 @@ function saveContent(formId, majorType){ success : function(result) { alert("저장되었습니다."); contentFade("out"); - $("#editModal").modal('hide'); - getViewModal(result, majorType); + $("#MajorEditModal").modal('hide'); + getViewModal(result); }, error : function(xhr, status) { alert("저장에 실패하였습니다.") @@ -150,16 +157,11 @@ function saveContent(formId, majorType){ function contentCheck(formId){ let flag = true; - if(!$("#title").val()){ + if(!$("#contentTitle").val()){ alert("제목을 입력해주세요.") flag = false; } - if($("#majorType").val()==="PLB003"){ - if(!$("#tabStatus").val()){ - alert("분류를 선택해주세요.") - flag = false; - } - } + flag = fileCheck(flag, files); return flag; } @@ -174,23 +176,3 @@ function commentFormReset(){ - - -$(document).on('click', '#addMajorBtn', function (){ - getEditModal(null) -}) - -$(document).on('click', '.planTr', function (){ - $(".trChkBox").prop("checked", false); - $(this).find(".trChkBox").prop("checked", true); - getViewModal(Number($(this).find(".planKey").val())); -}) - -$(document).on('click', '#saveBtn', function (){ - savePublicBoard("boardEditForm") -}) - -$(document).on('click', '#editBtn', function (){ - $("#MajorStatusViewModal").modal('hide') - getEditModal($(this).attr("data-ciwkey")); -}) \ No newline at end of file diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html index 23f1127b..4f090ad6 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html @@ -1,20 +1,20 @@
-
+
- +
@@ -29,18 +29,18 @@
- +
- +
- +
- +
@@ -55,7 +55,7 @@ - + diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index f109c464..9ac5ceda 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -40,7 +40,7 @@
- +
@@ -76,7 +76,7 @@ - + @@ -126,6 +126,7 @@
+
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html index 43dbf97b..84fc7229 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html @@ -1,17 +1,17 @@
-
주요사건처리현황 열람
+
주요사건처리현황 열람
- +
@@ -19,23 +19,23 @@
- + - +
- +
-
+
@@ -50,16 +50,16 @@ - + 파일이 없습니다. - - + + - + @@ -70,31 +70,11 @@
-
-
- -
-
- - - -
-
-
- - -
-
-
- -
- -
- - + +
\ No newline at end of file From cb59ccfd08cad32a0678a64adadb072439936e81 Mon Sep 17 00:00:00 2001 From: "DESKTOP-QGC5RJO\\DBNT" Date: Fri, 6 Jan 2023 14:07:22 +0900 Subject: [PATCH 2/2] test --- .../resources/templates/ivsgt/majorStatus/majorStatusPage.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index 9ac5ceda..4d054530 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -8,7 +8,7 @@
-

주요사건처리현황

+

주요사건처리현황t