diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 1e466d35..ffde120c 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -60,9 +60,9 @@ spring.datasource-main.username=dbnt0031 spring.datasource-main.password=dbnt0928! #oracle spring.datasource-kwms.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy -spring.datasource-kwms.jdbcUrl=jdbc:log4jdbc:oracle:thin:@118.219.150.34:51521:kwms +spring.datasource-kwms.jdbcUrl=jdbc:log4jdbc:oracle:thin:@118.219.150.34:50521:XE #spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver -#spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:51521:kwms +#spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:50521:XE spring.datasource-kwms.username=kwms spring.datasource-kwms.password=dbnt0928 diff --git a/src/main/resources/application-test1.properties b/src/main/resources/application-test1.properties index 513401d5..a3e21c87 100644 --- a/src/main/resources/application-test1.properties +++ b/src/main/resources/application-test1.properties @@ -23,6 +23,8 @@ spring.servlet.multipart.max-request-size=500MB site.domain=http://118.219.150.34:50580 clipReport.print.url=http://118.219.150.34:50570/ClipReport5 +search.engine.default=http://118.219.150.34:7577 +search.engine.suggest=http://118.219.150.34:7614 #file file.dir.publicBoard=/publicBoard @@ -68,7 +70,7 @@ spring.datasource-main.username=dbnt0031 spring.datasource-main.password=dbnt0928! #oracle spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver -spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:51521:kwms +spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:50521:XE spring.datasource-kwms.username=kwms spring.datasource-kwms.password=dbnt0928 diff --git a/src/main/resources/application-test2.properties b/src/main/resources/application-test2.properties index e35c3b82..c5a59c5c 100644 --- a/src/main/resources/application-test2.properties +++ b/src/main/resources/application-test2.properties @@ -23,6 +23,8 @@ spring.servlet.multipart.max-request-size=500MB site.domain=http://118.219.150.34:50580 clipReport.print.url=http://118.219.150.34:50570/ClipReport5 +search.engine.default=http://118.219.150.34:7577 +search.engine.suggest=http://118.219.150.34:7614 #file file.dir.publicBoard=/publicBoard @@ -68,7 +70,7 @@ spring.datasource-main.username=dbnt0031 spring.datasource-main.password=dbnt0928! #oracle spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver -spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:51521:kwms +spring.datasource-kwms.jdbcUrl=jdbc:oracle:thin:@118.219.150.34:50521:XE spring.datasource-kwms.username=kwms spring.datasource-kwms.password=dbnt0928 diff --git a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml index dfe1cf8a..dc53fa87 100644 --- a/src/main/resources/mybatisMapper/ActivityCaseMapper.xml +++ b/src/main/resources/mybatisMapper/ActivityCaseMapper.xml @@ -285,6 +285,7 @@ max(case_key) as max_case_key, min(case_key) as min_case_key from activity_case_info + where status <> 'DST008' group by receipt_key ) b on a.receipt_key = b.receipt_key inner join activity_case_info c diff --git a/src/main/resources/static/js/ivsgt/majorStatus.js b/src/main/resources/static/js/ivsgt/majorStatus.js index 81593e15..005f9e83 100644 --- a/src/main/resources/static/js/ivsgt/majorStatus.js +++ b/src/main/resources/static/js/ivsgt/majorStatus.js @@ -7,41 +7,41 @@ $(function(){ }) $(document).on('click', '#saveBtn', function (){ - if(confirm("저장하시겠습니까?")){ - if($('#contentTitle').val() == ''){ - alert("제목을 입력해주세요."); - $('#contentTitle').focus(); - return false; - } - if($('#majorType').val() == ''){ - alert("종류를 선택해주세요."); - $('#majorType').focus(); - return false; - } - saveContent('DST007'); + if(confirm("저장하시겠습니까?")){ + if($('#contentTitle').val() == ''){ + alert("제목을 입력해주세요."); + $('#contentTitle').focus(); + return false; } + if($('#majorType').val() == ''){ + alert("종류를 선택해주세요."); + $('#majorType').focus(); + return false; + } + saveContent('DST007'); + } }) $(document).on('click', '#saveTempBtn', function (){ - if(confirm("임시저장 하시겠습니까?")){ - if($('#contentTitle').val() == ''){ - alert("제목을 입력해주세요."); - $('#contentTitle').focus(); - return false; - } - if($('#majorType').val() == ''){ - alert("종류를 선택해주세요."); - $('#majorType').focus(); - return false; - } - saveContent('DST001'); + if(confirm("임시저장 하시겠습니까?")){ + if($('#contentTitle').val() == ''){ + alert("제목을 입력해주세요."); + $('#contentTitle').focus(); + return false; } + if($('#majorType').val() == ''){ + alert("종류를 선택해주세요."); + $('#majorType').focus(); + return false; + } + saveContent('DST001'); + } }) $(document).on('click', '#addMajorBtn', function (){ - getEditModal(null) + getEditModal(null) }) $(document).on('click', '.tr', function (event){ @@ -58,8 +58,8 @@ $(document).on('click', '.tr', function (event){ // }) $(document).on('click', '#editBtn', function (){ - $("#MajorViewModal").modal('hide') - getEditModal($(this).attr("data-majorkey")); + $("#MajorViewModal").modal('hide') + getEditModal($(this).attr("data-majorkey")); }) @@ -81,95 +81,95 @@ $(document).on('click', '#fileDownBtn', function (){ $(document).on('click', '#deleteMajorBtn', function (){ - const majorKey = $('input[name=majorKey]').val(); - console.log(majorKey); - if(confirm("삭제하시겠습니까?")){ - //contentFade("in"); - $.ajax({ - type : 'POST', - url : "/ivsgt/deleteContent", - data : JSON.stringify({majorKey:majorKey}), - contentType: 'application/json', - beforeSend: function (xhr){ - xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); - }, - success : function(data) { - alert("삭제 처리되었습니다."); - //contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("삭제 처리에 실패하였습니다"); - //contentFade("out"); - } - }) - } + const majorKey = $('input[name=majorKey]').val(); + console.log(majorKey); + if(confirm("삭제하시겠습니까?")){ + //contentFade("in"); + $.ajax({ + type : 'POST', + url : "/ivsgt/deleteContent", + data : JSON.stringify({majorKey:majorKey}), + contentType: 'application/json', + beforeSend: function (xhr){ + xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); + }, + success : function(data) { + alert("삭제 처리되었습니다."); + //contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("삭제 처리에 실패하였습니다"); + //contentFade("out"); + } + }) + } }) function getEditModal(majorKey){ - $.ajax({ - url: '/ivsgt/majorEditModal', - data: {majorKey: majorKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#editContent").empty().append(html); - setUploadDiv(); - setEditor('editor', '570'); - $("#MajorEditModal").modal('show'); + $.ajax({ + url: '/ivsgt/majorEditModal', + data: {majorKey: majorKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#editContent").empty().append(html); + setUploadDiv(); + setEditor('editor', '570'); + $("#MajorEditModal").modal('show'); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); } function getViewModal(majorKey){ - $.ajax({ - url: '/ivsgt/majorViewModal', - data: {majorKey: majorKey}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#viewContent").empty().append(html) - $("#MajorViewModal").modal('show'); - }, - error:function(e){ - ajaxErrorAction(e); - } - }); + $.ajax({ + url: '/ivsgt/majorViewModal', + data: {majorKey: majorKey}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#viewContent").empty().append(html) + $("#MajorViewModal").modal('show'); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); } function saveContent(contentStatus){ - const formData = new FormData($("#MajorEditForm")[0]); - for(const file of files) { - if(!file.isDelete) - formData.append('uploadFiles', file, file.name); + const formData = new FormData($("#MajorEditForm")[0]); + for(const file of files) { + if(!file.isDelete) + formData.append('uploadFiles', file, file.name); + } + $(".text-decoration-line-through").each(function (idx, el){ + formData.append('fileSeq', $(el).attr("data-fileseq")); + }) + formData.append('contentStatus', contentStatus); + formData.append('contentInfo', CrossEditor.GetBodyValue()); + $.ajax({ + type : 'POST', + data : formData, + url : "/ivsgt/saveContent", + processData: false, + contentType: false, + success : function(result) { + alert("저장되었습니다."); + contentFade("out"); + location.reload(); + }, + error : function(xhr, status) { + alert("저장에 실패하였습니다.") + contentFade("out"); } - $(".text-decoration-line-through").each(function (idx, el){ - formData.append('fileSeq', $(el).attr("data-fileseq")); - }) - formData.append('contentStatus', contentStatus); - formData.append('contentInfo', CrossEditor.GetBodyValue()); - $.ajax({ - type : 'POST', - data : formData, - url : "/ivsgt/saveContent", - processData: false, - contentType: false, - success : function(result) { - alert("저장되었습니다."); - contentFade("out"); - location.reload(); - }, - error : function(xhr, status) { - alert("저장에 실패하였습니다.") - contentFade("out"); - } - }) + }) } @@ -214,22 +214,22 @@ function saveContent(contentStatus){ // } function contentCheck(formId){ - let flag = true; - if(!$("#contentTitle").val()){ - alert("제목을 입력해주세요.") - flag = false; - } + let flag = true; + if(!$("#contentTitle").val()){ + alert("제목을 입력해주세요.") + flag = false; + } - flag = fileCheck(flag, files); - return flag; + flag = fileCheck(flag, files); + return flag; } function commentFormReset(){ - const commentForm = $("#commentForm"); - commentForm[0].reset(); - $("#childFormRemoveBtn").hide(); - $("#parentComment").val(''); - $("#commentFormHome").append(commentForm) + const commentForm = $("#commentForm"); + commentForm[0].reset(); + $("#childFormRemoveBtn").hide(); + $("#parentComment").val(''); + $("#commentFormHome").append(commentForm) }