diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 7d6b0aeb..ed361e2c 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -1,5 +1,6 @@ package com.dbnt.faisp.config; +import com.dbnt.faisp.main.counterIntelligence.service.CounterIntelligenceService; import com.dbnt.faisp.main.faRpt.service.FaRptService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.FishingBoatService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.SailorService; @@ -42,6 +43,7 @@ public class FileController extends BaseService{ private final BoardInvestigationService boardInvestigationService; private final FishingBoatService fishingBoatService; private final SriService sriService; + private final CounterIntelligenceService ciService; @GetMapping("/editorFileDisplay") public ResponseEntity editorFileDisplay(HttpServletRequest request, @@ -137,7 +139,10 @@ public class FileController extends BaseService{ break; case "sri": downloadFile = sriService.selectFaSriFile(parentKey, fileSeq); - break; + break; + case "ciWork": + downloadFile = ciService.selectCiWorkFile(parentKey, fileSeq); + break; } return downloadFile; } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java index e0ec52b9..95995147 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/CounterIntelligenceController.java @@ -48,8 +48,6 @@ public class CounterIntelligenceController { ModelAndView mav = new ModelAndView("counterIntelligence/ciWorkEditModal"); mav.addObject("ciwrCodeList", codeMgtService.selectCodeMgtList("CIWR")); - mav.addObject("atCodeList", codeMgtService.selectCodeMgtList("AT")); - mav.addObject("at2CodeList", ciWork.getCiwKey()!=null?codeMgtService.selectCodeMgtList(ciWork.getArrestType2()):null); if(ciWork.getCiwKey()==null){ ciWork.setWrtOrgan(loginUser.getOgCd()); ciWork.setWrtPart(loginUser.getOfcCd()); @@ -59,8 +57,10 @@ public class CounterIntelligenceController { ciWork.setWrtDt(LocalDateTime.now()); }else{ ciWork = ciService.selectCounterIntelligenceWork(ciWork.getCiwKey()); - } + + mav.addObject("atCodeList", codeMgtService.selectCodeMgtList("AT")); + mav.addObject("at2CodeList", ciWork.getCiwKey()!=null?codeMgtService.selectCodeMgtList(ciWork.getArrestType1()):null); mav.addObject("ciWork", ciWork); return mav; } @@ -68,6 +68,8 @@ public class CounterIntelligenceController { @GetMapping("/ciWorkViewModal") public ModelAndView ciWorkViewModal(@AuthenticationPrincipal UserInfo loginUser, CounterIntelligenceWork ciWork){ ModelAndView mav = new ModelAndView("counterIntelligence/ciWorkViewModal"); + mav.addObject("lineSeparator", '\n'); + mav.addObject("viewUserSeq", loginUser.getUserSeq()); mav.addObject("ciWork", ciService.selectCounterIntelligenceWork(ciWork.getCiwKey())); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java index 9937741e..53350b52 100644 --- a/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java +++ b/src/main/java/com/dbnt/faisp/main/counterIntelligence/service/CounterIntelligenceService.java @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.counterIntelligence.service; import com.dbnt.faisp.config.BaseService; +import com.dbnt.faisp.config.FileInfo; import com.dbnt.faisp.main.counterIntelligence.mapper.CounterIntelligenceMapper; import com.dbnt.faisp.main.counterIntelligence.model.CiwFile; import com.dbnt.faisp.main.counterIntelligence.model.CounterIntelligenceWork; @@ -99,4 +100,8 @@ public class CounterIntelligenceService extends BaseService { ciwFileRepository.save(fileInfo); } } + + public FileInfo selectCiWorkFile(Integer ciwKey, Integer fileSeq) { + return ciwFileRepository.findById(new CiwFile.CiwFileId(ciwKey, fileSeq)).orElse(null); + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java index bf8823ce..801b55a1 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/sri/service/SriService.java @@ -127,7 +127,7 @@ public class SriService extends BaseService { } public FileInfo selectFaSriFile(Integer faSriKey, Integer fileSeq) { - return sriFileRepository.findById(new SriFile.SriFileId(faSriKey, fileSeq)).orElse(null); + return sriFileRepository.findById(new SriFile.SriFileId(faSriKey, fileSeq)).orElse(null); } @Transactional diff --git a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml index 81fa5916..51f995b8 100644 --- a/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml +++ b/src/main/resources/mybatisMapper/CounterIntelligenceMapper.xml @@ -7,7 +7,7 @@ - and (a.wrt_user_seq = #{wrtUserSeq} and a.status = 'DST002') or a.status = 'DST007' + and ((a.wrt_user_seq = #{wrtUserSeq} and a.status = 'DST002') or a.status = 'DST007') and a.work_rating = #{workRating} diff --git a/src/main/resources/static/js/counterIntelligence/ciWork.js b/src/main/resources/static/js/counterIntelligence/ciWork.js index 763978ea..f8366f12 100644 --- a/src/main/resources/static/js/counterIntelligence/ciWork.js +++ b/src/main/resources/static/js/counterIntelligence/ciWork.js @@ -2,7 +2,7 @@ $(document).on('click', '#addCiWorkBtn', function (){ getCiWorkEditModal(null); }) -$(document).on('click', '#arrestType1', function (){ +$(document).on('change', '#arrestType1', function (){ getArrestType2Option(this.value); }) @@ -10,6 +10,15 @@ $(document).on('click', '#saveTempBtn,#saveCiWorkBtn', function(){ saveCiWork($(this).attr("data-status")); }) +$(document).on('click', '.ciWorkTr', function (){ + getCiWorkViewModal($(this).find(".ciwKey").val()); +}) + +$(document).on('click', '#editCiWorkBtn', function (){ + $("#ciWorkViewModal").modal('hide'); + getCiWorkEditModal($(this).attr("data-ciwkey")); +}) + function getCiWorkEditModal(ciwKey){ $.ajax({ url: '/counterIntelligence/ciWorkEditModal', @@ -33,7 +42,7 @@ function getCiWorkEditModal(ciwKey){ }); } -function getCiwViewModal(ciwKey){ +function getCiWorkViewModal(ciwKey){ $.ajax({ url: '/counterIntelligence/ciWorkViewModal', data: {ciwKey: ciwKey}, @@ -76,8 +85,8 @@ function saveCiWork(status){ success : function(result) { alert("저장되었습니다."); contentFade("out"); - $("#affairEditModal").modal('hide'); - getCiwViewModal(result); + $("#ciWorkEditModal").modal('hide'); + getCiWorkViewModal(result); }, error : function(xhr, status) { alert("저장에 실패하였습니다.") diff --git a/src/main/resources/templates/counterIntelligence/ciWorkBoard.html b/src/main/resources/templates/counterIntelligence/ciWorkBoard.html index 40cc0c6a..74ab3625 100644 --- a/src/main/resources/templates/counterIntelligence/ciWorkBoard.html +++ b/src/main/resources/templates/counterIntelligence/ciWorkBoard.html @@ -65,15 +65,15 @@
@@ -129,7 +129,7 @@ - + diff --git a/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html b/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html index 0b81b403..9adfcf92 100644 --- a/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html +++ b/src/main/resources/templates/counterIntelligence/ciWorkEditModal.html @@ -34,6 +34,12 @@ +
+ +
+ +
+
@@ -58,7 +64,7 @@
@@ -76,17 +82,11 @@
-
- -
- -
-
diff --git a/src/main/resources/templates/counterIntelligence/ciWorkViewModal.html b/src/main/resources/templates/counterIntelligence/ciWorkViewModal.html index b35ce0a2..7748cd65 100644 --- a/src/main/resources/templates/counterIntelligence/ciWorkViewModal.html +++ b/src/main/resources/templates/counterIntelligence/ciWorkViewModal.html @@ -1,80 +1,75 @@ -