From 9800a85bf760f8fd29af291ff5f8c8a495710e93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 28 Jun 2023 11:47:47 +0900 Subject: [PATCH] =?UTF-8?q?=EC=A3=BC=EC=9A=94=EC=82=AC=EA=B1=B4=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=ED=98=84=ED=99=A9=20=EC=A0=80=EC=9E=A5=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majorStatus/MajorStatusController.java | 29 +++---------------- .../service/MajorStatusService.java | 2 +- .../resources/static/js/ivsgt/majorStatus.js | 2 +- .../majorStatus/majorStatusEditModal.html | 3 +- 4 files changed, 8 insertions(+), 28 deletions(-) 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 a46b2b5f..74926fe4 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 @@ -1,15 +1,10 @@ package com.dbnt.faisp.main.ivsgtMgt.majorStatus; - import com.dbnt.faisp.main.authMgt.service.AuthMgtService; -import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; -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; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -24,7 +19,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/ivsgt") -public class MajorStatusController { +public class MajorStatusController { // 외사수사관리 > 주요사건처리현황 private final AuthMgtService authMgtService; private final MajorStatusService majorStatusService; @@ -34,12 +29,9 @@ public class MajorStatusController { public ModelAndView majorStatus(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus){ ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusPage"); - mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST")); - mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); mav.addObject("searchParams", majorStatus); - majorStatus.setQueryInfo(); mav.addObject("majorList", majorStatusService.selectMajorList(majorStatus)); majorStatus.setContentCnt(majorStatusService.selectMajorListCnt(majorStatus)); @@ -52,7 +44,6 @@ public class MajorStatusController { @GetMapping("/majorEditModal") public ModelAndView majorEditModal(@AuthenticationPrincipal UserInfo loginUser, MajorStatus majorStatus) { ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusEditModal"); - if(majorStatus.getMajorKey()!=null){ majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); }else{ @@ -62,10 +53,7 @@ public class MajorStatusController { majorStatus.setWrtUserGrd(loginUser.getTitleCd()); majorStatus.setWrtUserNm(loginUser.getUserNm()); majorStatus.setWrtDt(LocalDateTime.now()); - - } - //mav.addObject("mstList", codeMgtService.selectCodeMgtList("MST")); mav.addObject("majorStatus", majorStatus); mav.addObject("userSeq", loginUser.getUserSeq()); return mav; @@ -74,34 +62,25 @@ public class MajorStatusController { @GetMapping("/majorViewModal") public ModelAndView majorViewModal(@AuthenticationPrincipal UserInfo loginUser,MajorStatus majorStatus){ - ModelAndView mav = new ModelAndView("ivsgt/majorStatus/majorStatusViewModal"); - majorStatus = majorStatusService.selectMajor(majorStatus.getMajorKey()); mav.addObject("userSeq", loginUser.getUserSeq()); mav.addObject("majorStatus", majorStatus); - - //메뉴권한 확인 - // mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/"+majorStatus.getMajorType()).get(0).getAccessAuth()); - return mav; } - @PostMapping("/saveContent") - public Integer saveContent (MajorStatus majorStatus, + @PostMapping("/saveMajorStatus") + public Integer saveMajorStatus (MajorStatus majorStatus, MultipartHttpServletRequest request, @RequestParam(value = "fileSeq", required = false) List< Integer > deleteFileSeq){ majorStatus.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); - return majorStatusService.saveContent(majorStatus, deleteFileSeq); + return majorStatusService.saveMajorStatus(majorStatus, deleteFileSeq); } @PostMapping("/deleteContent") @ResponseBody public void deleteContent(@RequestBody MajorStatus majorStatus){ - majorStatusService.deleteContent(majorStatus); - } - } 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 0916e93b..36b8698e 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 @@ -40,7 +40,7 @@ public class MajorStatusService extends BaseService { } @Transactional - public Integer saveContent(MajorStatus majorStatus, List deleteFileSeq) { + public Integer saveMajorStatus(MajorStatus majorStatus, List deleteFileSeq) { Integer majorKey = majorStatusRepository.save(majorStatus).getMajorKey(); if(deleteFileSeq!=null && deleteFileSeq.size()>0){ deleteMajorFile(majorKey, deleteFileSeq); diff --git a/src/main/resources/static/js/ivsgt/majorStatus.js b/src/main/resources/static/js/ivsgt/majorStatus.js index 005f9e83..34a5551b 100644 --- a/src/main/resources/static/js/ivsgt/majorStatus.js +++ b/src/main/resources/static/js/ivsgt/majorStatus.js @@ -157,7 +157,7 @@ function saveContent(contentStatus){ $.ajax({ type : 'POST', data : formData, - url : "/ivsgt/saveContent", + url : "/ivsgt/saveMajorStatus", processData: false, contentType: false, success : function(result) { diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html index f0d42f71..2c021667 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusEditModal.html @@ -14,6 +14,7 @@ +
@@ -25,7 +26,7 @@
- +