DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

master
강석 최 2023-02-06 16:20:05 +09:00
parent ece8860dad cc7e9f475d
commit 48a5820e01
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/main/fpiMgt/monitoring/MonitoringController.java
View File

@ -249,7 +249,7 @@ public class MonitoringController { // 첩보수집활동 > 해양외사모니
if(mr.getMrKey()!=null){ if(mr.getMrKey()!=null){
mr = monitoringService.selectResult(mr.getMrKey()); mr = monitoringService.selectResult(mr.getMrKey());
} }
mr.setWrtUserSeq(loginUser.getUserSeq());
mav.addObject("mr", mr); mav.addObject("mr", mr);
return mav; return mav;
} }

13
src/main/resources/static/js/igActivities/fpiMgt/monitoring/result.js
View File

@ -46,9 +46,8 @@ $(document).on('click', '#designationListModalBtn', function (){
const mdKey = $("input[name=mdKey]").val(); const mdKey = $("input[name=mdKey]").val();
$.ajax({ $.ajax({
url: '/monitoring/designationListModal', url: '/monitoring/designationListModal',
data: { data: {wrtUserSeq:$("input[name=wrtUserSeq]").val(),
mdState:'DST006'},
},
type: 'GET', type: 'GET',
dataType:"html", dataType:"html",
success: function(html){ success: function(html){
@ -108,8 +107,9 @@ $(document).on('click', '#saveBtn', function (){
alert("모니터링 대상을 선택해주세요"); alert("모니터링 대상을 선택해주세요");
return false; return false;
} }
/* const infoRowList = $("#resultInfoRow").find(".infoRow");
$.each($("#resultInfoRow").find(".infoRow"), function (idx, div){ for(let i=0; i<infoRowList.length; i++){
const div = infoRowList[i];
if($(div).find(".contactDate").val() == ""){ if($(div).find(".contactDate").val() == ""){
alert("접촉일을 입력해주세요"); alert("접촉일을 입력해주세요");
return false; return false;
@ -122,8 +122,7 @@ $(document).on('click', '#saveBtn', function (){
alert("접촉종료시간 입력해주세요"); alert("접촉종료시간 입력해주세요");
return false; return false;
} }
}); }
*/
if(confirm("저장하시겠습니까?")){ if(confirm("저장하시겠습니까?")){
saveResult('DST002'); saveResult('DST002');
} }