diff --git a/src/main/java/com/dbnt/faisp/config/FileController.java b/src/main/java/com/dbnt/faisp/config/FileController.java index 81bba3e4..59955895 100644 --- a/src/main/java/com/dbnt/faisp/config/FileController.java +++ b/src/main/java/com/dbnt/faisp/config/FileController.java @@ -238,6 +238,9 @@ public class FileController extends BaseService{ case "designation": downloadFile = monitoringService.selectDesignationFile(parentKey, fileSeq); break; + case "monitoringResult": + downloadFile = monitoringService.selectmonitoringResultFile(parentKey, fileSeq); + break; } return downloadFile; } 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 de68c98e..9ba7c254 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 @@ -22,6 +22,7 @@ import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignationFile.mon import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResult; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResultApprv; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResultFile; +import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResultFile.MonitoringResultFileId; import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringResultInfo; import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationApprvRepository; import com.dbnt.faisp.main.fpiMgt.monitoring.repository.MonitoringDesignationFileRepository; @@ -248,16 +249,20 @@ public class MonitoringService extends BaseService { case "DST003": case "DST005": // 반려시 작성자에게 반려 알림 발송 - userAlarmService.sendAlarmToWrtUser(saveResult.getMrKey(), saveResult.getWrtUserSeq(), 36, saveResult.getMrTitle()+" 문서가 반려되었습니다."); + userAlarmService.sendAlarmToWrtUser(saveResult.getMrKey(), saveResult.getWrtUserSeq(), 37, saveResult.getMrTitle()+" 문서가 반려되었습니다."); break; case "DST006": // 부장승인시 작성자에게 승인 알림 발송 - userAlarmService.sendAlarmToWrtUser(saveResult.getMrKey(), saveResult.getWrtUserSeq(), 36, saveResult.getMrTitle()+" 문서가 승인되었습니다."); + userAlarmService.sendAlarmToWrtUser(saveResult.getMrKey(), saveResult.getWrtUserSeq(), 37, saveResult.getMrTitle()+" 문서가 승인되었습니다."); break; } return apprv.getMrKey(); } + public MonitoringResultFile selectmonitoringResultFile(Integer parentKey, Integer fileSeq) { + return monitoringResultFileRepository.findById(new MonitoringResultFileId(parentKey,fileSeq)).orElse(null); + } + diff --git a/src/main/resources/mybatisMapper/MonitoringMapper.xml b/src/main/resources/mybatisMapper/MonitoringMapper.xml index 4181a7fa..23fbf8cf 100644 --- a/src/main/resources/mybatisMapper/MonitoringMapper.xml +++ b/src/main/resources/mybatisMapper/MonitoringMapper.xml @@ -114,6 +114,14 @@ and mr.mr_state = #{mrState} + + + and mr.mr_sdate >= #{startDate}::date + + + and mr.mr_edate <= #{endDate}::date + + and mr.wrt_dt >= #{startDate}::date diff --git a/src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js b/src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js index 4f4427f9..381c1fdc 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js @@ -43,7 +43,7 @@ function getResultEditModal(mrKey){ } $(document).on('click', '#designationListModalBtn', function (){ - //const opKey = $("input[name=opKey]").val(); + const mdKey = $("input[name=mdKey]").val(); $.ajax({ url: '/monitoring/designationListModal', data: { @@ -53,9 +53,9 @@ $(document).on('click', '#designationListModalBtn', function (){ dataType:"html", success: function(html){ $("#designationListModalContent").empty().append(html); - //if(opKey != ""){ - // $(".rowChkBox[value="+opKey+"]").prop("checked", true); - // } + if(mdKey != ""){ + $(".rowChkBox[value="+mdKey+"]").prop("checked", true); + } $("#designationListModal").modal('show'); }, error:function(e){ @@ -66,7 +66,7 @@ $(document).on('click', '#designationListModalBtn', function (){ $(document).on('click', '#getDesignationBtn', function (){ if($(".rowChkBox:checked").length < 1){ - alert("정보협력자를 선택해주세요."); + alert("모니터링 대상자를 선택해주세요."); return false; } if($(".rowChkBox:checked").length > 1){ @@ -84,8 +84,7 @@ $(document).on('click', '#getDesignationBtn', function (){ }) $(document).on('click', '#resultInfoAddBtn', function (){ - const childCommentDiv = $(this).parents(".resultInfoRow"); - const infoFm = $("#infoFmOrigin").children().clone() + const infoFm = $("#infoFmOrigin").children().clone(); $("#resultInfoRow").append(infoFm); infoFm.find(".contactDate").datepicker({ format: "yyyy-mm-dd", @@ -100,6 +99,31 @@ $(document).on('click', '#editBtn', function (){ }) $(document).on('click', '#saveBtn', function (){ + if($("#mrTitle").val() == ""){ + alert("제목을 입력해주세요"); + $('#mrTitle').focus(); + return false; + } + if($("input[name=mdKey]").val() == ""){ + alert("모니터링 대상을 선택해주세요"); + return false; + } + /* + $.each($("#resultInfoRow").find(".infoRow"), function (idx, div){ + if($(div).find(".contactDate").val() == ""){ + alert("접촉일을 입력해주세요"); + return false; + } + if($(div).find(".contactStime").val() == ""){ + alert("접촉시작시간 입력해주세요"); + return false; + } + if($(div).find(".contactEtime").val() == ""){ + alert("접촉종료시간 입력해주세요"); + return false; + } + }); + */ if(confirm("저장하시겠습니까?")){ saveResult('DST002'); } @@ -124,11 +148,6 @@ function saveResult(mrState){ formData.append('mrState', mrState); $.each($("#resultInfoRow").find(".infoRow"), function (idx, div){ - // const position = $(div).find(".normalSailorPosition").val(); - // let sailorKey = $(div).find(".sailorKey").val(); - // if(sailorKey!==undefined){ - // formData.append('sailorList['+(idx)+'].sailorKey', sailorKey); - // } formData.append('resultInfoList['+(idx)+'].infoSeq', idx+1); formData.append('resultInfoList['+(idx)+'].contactDate', $(div).find(".contactDate").val()); formData.append('resultInfoList['+(idx)+'].contactStime', $(div).find(".contactStime").val()); @@ -202,3 +221,7 @@ $(document).on('click', '.apprvBtn', function (){ } }) +$(document).on('click', '.rowDeleteBtn', function (){ + $(this).parents(".infoRow").remove(); +}) + diff --git a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultEditModal.html index 44085f62..bdbb9d17 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/monitoring/resultEditModal.html @@ -1,7 +1,7 @@