diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java index 861e6608..4c27209a 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/IvsgtController.java @@ -5,6 +5,7 @@ import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.InvestigationBoard; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.InvestigationRelatedReports; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.service.IvsgtService; import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; @@ -22,13 +23,15 @@ public class IvsgtController { private final AuthMgtService authMgtService; private final IvsgtService ivsgtService; - @GetMapping("/{ivsgtType}") - public ModelAndView arrest(@AuthenticationPrincipal UserInfo loginUser, @PathVariable("ivsgtType") String ivsgtType, InvestigationBoard investigationBoard) { + @GetMapping("/arrestReport") + public ModelAndView arrest(@AuthenticationPrincipal UserInfo loginUser, InvestigationBoard investigationBoard) { ModelAndView mav = new ModelAndView("ivsgt/ivsgt"); - investigationBoard.setIvsgtType(ivsgtType); + if(Utils.isEmpty(investigationBoard.getIvsgtType())){ + investigationBoard.setIvsgtType("IVT001"); + } //메뉴권한 확인 - String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/arrest").get(0).getAccessAuth(); + String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/arrestReport").get(0).getAccessAuth(); mav.addObject("accessAuth", accessAuth); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); @@ -64,7 +67,7 @@ public class IvsgtController { public ModelAndView ivsgtViewModal(@AuthenticationPrincipal UserInfo loginUser, InvestigationBoard investigationBoard){ ModelAndView mav = new ModelAndView("ivsgt/ivsgtViewModal"); investigationBoard = ivsgtService.selectBoardInvestigation(investigationBoard.getIvsgtKey()); - mav.addObject("boardInvestigation", investigationBoard); + mav.addObject("investigation", investigationBoard); mav.addObject("userSeq",loginUser.getUserSeq()); //메뉴권한 확인 mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/ivsgt/arrest").get(0).getAccessAuth()); diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/InvestigationFile.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/InvestigationFile.java index 4f893b5c..de5ed5da 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/InvestigationFile.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/model/InvestigationFile.java @@ -14,7 +14,7 @@ import java.io.Serializable; @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "ivsgt_file") +@Table(name = "investigation_file") @IdClass(InvestigationFile.InvestigationFileId.class) public class InvestigationFile extends FileInfo { @Id diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java index 3fcd819c..77f48456 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/boardInvestigation/service/IvsgtService.java @@ -54,7 +54,7 @@ public class IvsgtService extends BaseService { if(deleteFileSeq != null && deleteFileSeq.size()>0){ deletIvsgtFile(ivsgtKey, deleteFileSeq); } - if(investigationBoard.getRelatedReportsList().size()>0){ + if(investigationBoard.getRelatedReportsList() != null && investigationBoard.getRelatedReportsList().size()>0){ ivsgtRelatedReportsRepository.deleteByParentIvsgtKey(ivsgtKey); ivsgtRelatedReportsRepository.saveAll(investigationBoard.getRelatedReportsList()); } diff --git a/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml b/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml index 07ea1062..42cb8f69 100644 --- a/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml +++ b/src/main/resources/mybatisMapper/InvestigationBoardMapper.xml @@ -98,11 +98,11 @@
-
사건보고서
+
사건보고서
-

+ + +

+
+
@@ -26,25 +30,19 @@
-
+ @@ -123,6 +121,7 @@ 범죄테마 위반유형 제목 + 첨부파일 작성자 작성일 @@ -136,9 +135,18 @@ - - - + + + + + + + + + + + + @@ -197,6 +205,13 @@ +
+ diff --git a/src/main/resources/templates/ivsgt/ivsgtEditModal.html b/src/main/resources/templates/ivsgt/ivsgtEditModal.html index bd77ed36..49945b9f 100644 --- a/src/main/resources/templates/ivsgt/ivsgtEditModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtEditModal.html @@ -80,9 +80,9 @@
- -
- + +
+
@@ -133,7 +133,7 @@
- +
@@ -148,14 +148,6 @@
- -
diff --git a/src/main/resources/templates/ivsgt/ivsgtViewModal.html b/src/main/resources/templates/ivsgt/ivsgtViewModal.html index 805f6ba5..dc7c3567 100644 --- a/src/main/resources/templates/ivsgt/ivsgtViewModal.html +++ b/src/main/resources/templates/ivsgt/ivsgtViewModal.html @@ -2,26 +2,26 @@
@@ -76,13 +76,13 @@ - + 파일이 없습니다. - - + + @@ -93,7 +93,7 @@
- +
@@ -109,7 +109,7 @@