diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java index e9a23f32..1f18c1e5 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java @@ -103,6 +103,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 md.setContentCnt(monitoringService.selectDesignationListCnt(md)); md.setPaginationInfo(); mav.addObject("type", type); + mav.addObject("searchUrl", "/monitoring/designationList/"+type); mav.addObject("searchParams", md); return mav; } @@ -111,7 +112,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니 public ModelAndView planEditModal(@AuthenticationPrincipal UserInfo loginUser, MonitoringDesignation md){ ModelAndView mav = new ModelAndView("igActivities/fpiMgt/monitoring/designationEditModal"); if(md.getMdKey()!=null){ - + md = monitoringService.selectDesignation(md.getMdKey()); } mav.addObject("md", md); diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java index d52166ca..892b297f 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/service/MonitoringService.java @@ -107,10 +107,11 @@ public class MonitoringService extends BaseService { } return savedDesignation; } - + + @Transactional public Integer designationStateChange(MonitoringDesignationApprv apprv) { - MonitoringDesignation saveddesignation = monitoringDesignationRepository.findById(apprv.getMdKey()).orElse(null); - saveddesignation.setMdState(apprv.getState()); + MonitoringDesignation saveDesignation = monitoringDesignationRepository.findById(apprv.getMdKey()).orElse(null); + saveDesignation.setMdState(apprv.getState()); MonitoringDesignationApprv lastApprv = monitoringDesignationApprvRepository.findTopByMdKeyOrderByApprvSeqDesc(apprv.getMdKey()).orElse(null); apprv.setApprvSeq(lastApprv==null?1:lastApprv.getApprvSeq()+1); monitoringDesignationApprvRepository.save(apprv); @@ -118,17 +119,17 @@ public class MonitoringService extends BaseService { switch (apprv.getState()){ case "DST004": // 계장승인시 부장 결재권자에게 알림 발송. - userAlarmService.sendAlarmToApprvUser(saveddesignation.getMdKey(), saveddesignation.getWrtOrgan(), "APC001", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다."); - userAlarmService.sendAlarmToApprvUser(saveddesignation.getMdKey(), saveddesignation.getWrtOrgan(), "APC002", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다."); + userAlarmService.sendAlarmToApprvUser(saveDesignation.getMdKey(), saveDesignation.getWrtOrgan(), "APC001", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다."); + userAlarmService.sendAlarmToApprvUser(saveDesignation.getMdKey(), saveDesignation.getWrtOrgan(), "APC002", 36, "해양외사 모니터링 지정보고에 결재대기 문서가 있습니다."); break; case "DST003": case "DST005": // 반려시 작성자에게 반려 알림 발송 - userAlarmService.sendAlarmToWrtUser(saveddesignation.getMdKey(), saveddesignation.getWrtUserSeq(), 36, saveddesignation.getMdTitle()+" 문서가 반려되었습니다."); + userAlarmService.sendAlarmToWrtUser(saveDesignation.getMdKey(), saveDesignation.getWrtUserSeq(), 36, saveDesignation.getMdTitle()+" 문서가 반려되었습니다."); break; case "DST006": // 부장승인시 작성자에게 승인 알림 발송 - userAlarmService.sendAlarmToWrtUser(saveddesignation.getMdKey(), saveddesignation.getWrtUserSeq(), 36, saveddesignation.getMdTitle()+" 문서가 승인되었습니다."); + userAlarmService.sendAlarmToWrtUser(saveDesignation.getMdKey(), saveDesignation.getWrtUserSeq(), 36, saveDesignation.getMdTitle()+" 문서가 승인되었습니다."); break; } return apprv.getMdKey(); diff --git a/src/main/resources/mybatisMapper/MonitoringMapper.xml b/src/main/resources/mybatisMapper/MonitoringMapper.xml index 0782c3d1..42c6ee90 100644 --- a/src/main/resources/mybatisMapper/MonitoringMapper.xml +++ b/src/main/resources/mybatisMapper/MonitoringMapper.xml @@ -21,12 +21,12 @@ and md.md_state = #{mdState} - + and md.md_dt >= #{startDate}::date - and md.md_dt <= #{endDate}::date+1 + and md.md_dt <= #{endDate}::date diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monitoring/designation.js b/src/main/resources/static/js/igActivities/fpiMgt/monitoring/designation.js index 8e69c14b..72dea2c0 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/monitoring/designation.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/monitoring/designation.js @@ -1,5 +1,12 @@ +$(function(){ + $("#dateSelectorDiv").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); +}) -$(document).on('click', '#planTab', function (){ +$(document).on('click', '#allTab', function (){ location.href = "/monitoring/designationList/all"; }) $(document).on('click', '#stayTab', function (){ @@ -10,7 +17,7 @@ $(document).on('click', '#commitTab', function (){ }) $(document).on('click', '#addBtn', function (){ - getDesignationEditModal(null) + getDesignationEditModal(null); }) function getDesignationEditModal(mdKey){ @@ -41,12 +48,43 @@ function getDesignationEditModal(mdKey){ }); } +$(document).on('click', '#editBtn', function (){ + $("#designationViewModal").modal('hide'); + getDesignationEditModal($(this).attr("data-mdkey")); +}) + $(document).on('click', '#saveBtn', function (){ + if(!$("#mdDt").val()){ + alert("대상지정일을 입력해주세요."); + $('#mdDt').focus(); + return false; + } + if(!$("#mdName").val()){ + alert("성명을 입력해주세요."); + $('#mdName').focus(); + return false; + } + if(!$("#mdBirth").val()){ + alert("생년월일을 입력해주세요."); + $('#mdBirth').focus(); + return false; + } + if(!$("#mdReason").val()){ + alert("대상지정 사유를 입력해주세요."); + $('#mdReason').focus(); + return false; + } if(confirm("저장하시겠습니까?")){ saveDesignation('DST002'); } }) +$(document).on('click', '#saveTempBtn', function (){ + if(confirm("임시저장 하시겠습니까?")){ + saveDesignation('DST001'); + } +}) + function saveDesignation(mdState){ contentFade("in"); const formData = new FormData($("#designationEditForm")[0]); @@ -99,7 +137,8 @@ function getDesignationViewModal(mdKey){ $(document).on('click', '.apprvBtn', function (){ $("#viewModalApprvValue").val($(this).attr("data-planstate")); - if(confirm($(this).val()+"하시겠습니까?")){ + const approval = $(this).val(); + if(confirm(approval+"하시겠습니까?")){ const formData = new FormData($("#apprvForm")[0]); contentFade("in") $.ajax({ @@ -112,12 +151,12 @@ $(document).on('click', '.apprvBtn', function (){ xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); }, success : function(result) { - alert($(this).val()+"되었습니다"); + alert(approval+"되었습니다"); getDesignationViewModal(result); contentFade("out"); }, error : function(xhr, status) { - alert($(this).val()+"처리를 실패하였습니다."); + alert(approval+"처리를 실패하였습니다."); contentFade("out"); } }) diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html index 643dab8b..a0e26a4a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationEditModal.html @@ -8,17 +8,17 @@
- + + + + + + +
- +
- +
@@ -32,53 +32,53 @@
- +
모니터링 대상자
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
@@ -100,8 +100,12 @@
-
+
+
+
+
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html index 07b72dbb..03e5ba6a 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationList.html @@ -18,7 +18,7 @@
- +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html index 6d61acbd..17543366 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/designationViewModal.html @@ -20,11 +20,15 @@ - + + + - + + +
@@ -143,7 +147,7 @@
- +