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

외사활동>관리대장 오류 수정 완료. 

외사수사>주요사건처리현황 오류 수정 작업중.
master
강석 최 2023-06-27 18:09:44 +09:00
parent 87e231d0e4
commit 5642680cee
5 changed files with 124 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/resources/application-dev.properties
View File

@ -60,9 +60,9 @@ spring.datasource-main.username=dbnt0031
spring.datasource-main.password=dbnt0928! spring.datasource-main.password=dbnt0928!
#oracle #oracle
spring.datasource-kwms.driverClassName=net.sf.log4jdbc.sql.jdbcapi.DriverSpy 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.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.username=kwms
spring.datasource-kwms.password=dbnt0928 spring.datasource-kwms.password=dbnt0928

4
src/main/resources/application-test1.properties
View File

@ -23,6 +23,8 @@ spring.servlet.multipart.max-request-size=500MB
site.domain=http://118.219.150.34:50580 site.domain=http://118.219.150.34:50580
clipReport.print.url=http://118.219.150.34:50570/ClipReport5 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
file.dir.publicBoard=/publicBoard file.dir.publicBoard=/publicBoard
@ -68,7 +70,7 @@ spring.datasource-main.username=dbnt0031
spring.datasource-main.password=dbnt0928! spring.datasource-main.password=dbnt0928!
#oracle #oracle
spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver 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.username=kwms
spring.datasource-kwms.password=dbnt0928 spring.datasource-kwms.password=dbnt0928

4
src/main/resources/application-test2.properties
View File

@ -23,6 +23,8 @@ spring.servlet.multipart.max-request-size=500MB
site.domain=http://118.219.150.34:50580 site.domain=http://118.219.150.34:50580
clipReport.print.url=http://118.219.150.34:50570/ClipReport5 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
file.dir.publicBoard=/publicBoard file.dir.publicBoard=/publicBoard
@ -68,7 +70,7 @@ spring.datasource-main.username=dbnt0031
spring.datasource-main.password=dbnt0928! spring.datasource-main.password=dbnt0928!
#oracle #oracle
spring.datasource-kwms.driverClassName=oracle.jdbc.driver.OracleDriver 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.username=kwms
spring.datasource-kwms.password=dbnt0928 spring.datasource-kwms.password=dbnt0928

1
src/main/resources/mybatisMapper/ActivityCaseMapper.xml
View File

@ -285,6 +285,7 @@
max(case_key) as max_case_key, max(case_key) as max_case_key,
min(case_key) as min_case_key min(case_key) as min_case_key
from activity_case_info from activity_case_info
where status <> 'DST008'
group by receipt_key group by receipt_key
) b on a.receipt_key = b.receipt_key ) b on a.receipt_key = b.receipt_key
inner join activity_case_info c inner join activity_case_info c

230
src/main/resources/static/js/ivsgt/majorStatus.js
View File

@ -7,41 +7,41 @@ $(function(){
}) })
$(document).on('click', '#saveBtn', function (){ $(document).on('click', '#saveBtn', function (){
if(confirm("저장하시겠습니까?")){ if(confirm("저장하시겠습니까?")){
if($('#contentTitle').val() == ''){ if($('#contentTitle').val() == ''){
alert("제목을 입력해주세요."); alert("제목을 입력해주세요.");
$('#contentTitle').focus(); $('#contentTitle').focus();
return false; return false;
}
if($('#majorType').val() == ''){
alert("종류를 선택해주세요.");
$('#majorType').focus();
return false;
}
saveContent('DST007');
} }
if($('#majorType').val() == ''){
alert("종류를 선택해주세요.");
$('#majorType').focus();
return false;
}
saveContent('DST007');
}
}) })
$(document).on('click', '#saveTempBtn', function (){ $(document).on('click', '#saveTempBtn', function (){
if(confirm("임시저장 하시겠습니까?")){ if(confirm("임시저장 하시겠습니까?")){
if($('#contentTitle').val() == ''){ if($('#contentTitle').val() == ''){
alert("제목을 입력해주세요."); alert("제목을 입력해주세요.");
$('#contentTitle').focus(); $('#contentTitle').focus();
return false; return false;
}
if($('#majorType').val() == ''){
alert("종류를 선택해주세요.");
$('#majorType').focus();
return false;
}
saveContent('DST001');
} }
if($('#majorType').val() == ''){
alert("종류를 선택해주세요.");
$('#majorType').focus();
return false;
}
saveContent('DST001');
}
}) })
$(document).on('click', '#addMajorBtn', function (){ $(document).on('click', '#addMajorBtn', function (){
getEditModal(null) getEditModal(null)
}) })
$(document).on('click', '.tr', function (event){ $(document).on('click', '.tr', function (event){
@ -58,8 +58,8 @@ $(document).on('click', '.tr', function (event){
// }) // })
$(document).on('click', '#editBtn', function (){ $(document).on('click', '#editBtn', function (){
$("#MajorViewModal").modal('hide') $("#MajorViewModal").modal('hide')
getEditModal($(this).attr("data-majorkey")); getEditModal($(this).attr("data-majorkey"));
}) })
@ -81,95 +81,95 @@ $(document).on('click', '#fileDownBtn', function (){
$(document).on('click', '#deleteMajorBtn', function (){ $(document).on('click', '#deleteMajorBtn', function (){
const majorKey = $('input[name=majorKey]').val(); const majorKey = $('input[name=majorKey]').val();
console.log(majorKey); console.log(majorKey);
if(confirm("삭제하시겠습니까?")){ if(confirm("삭제하시겠습니까?")){
//contentFade("in"); //contentFade("in");
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
url : "/ivsgt/deleteContent", url : "/ivsgt/deleteContent",
data : JSON.stringify({majorKey:majorKey}), data : JSON.stringify({majorKey:majorKey}),
contentType: 'application/json', contentType: 'application/json',
beforeSend: function (xhr){ beforeSend: function (xhr){
xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val()); xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
}, },
success : function(data) { success : function(data) {
alert("삭제 처리되었습니다."); alert("삭제 처리되었습니다.");
//contentFade("out"); //contentFade("out");
location.reload(); location.reload();
}, },
error : function(xhr, status) { error : function(xhr, status) {
alert("삭제 처리에 실패하였습니다"); alert("삭제 처리에 실패하였습니다");
//contentFade("out"); //contentFade("out");
} }
}) })
} }
}) })
function getEditModal(majorKey){ function getEditModal(majorKey){
$.ajax({ $.ajax({
url: '/ivsgt/majorEditModal', url: '/ivsgt/majorEditModal',
data: {majorKey: majorKey}, data: {majorKey: majorKey},
type: 'GET', type: 'GET',
dataType:"html", dataType:"html",
success: function(html){ success: function(html){
$("#editContent").empty().append(html); $("#editContent").empty().append(html);
setUploadDiv(); setUploadDiv();
setEditor('editor', '570'); setEditor('editor', '570');
$("#MajorEditModal").modal('show'); $("#MajorEditModal").modal('show');
}, },
error:function(e){ error:function(e){
ajaxErrorAction(e); ajaxErrorAction(e);
} }
}); });
} }
function getViewModal(majorKey){ function getViewModal(majorKey){
$.ajax({ $.ajax({
url: '/ivsgt/majorViewModal', url: '/ivsgt/majorViewModal',
data: {majorKey: majorKey}, data: {majorKey: majorKey},
type: 'GET', type: 'GET',
dataType:"html", dataType:"html",
success: function(html){ success: function(html){
$("#viewContent").empty().append(html) $("#viewContent").empty().append(html)
$("#MajorViewModal").modal('show'); $("#MajorViewModal").modal('show');
}, },
error:function(e){ error:function(e){
ajaxErrorAction(e); ajaxErrorAction(e);
} }
}); });
} }
function saveContent(contentStatus){ function saveContent(contentStatus){
const formData = new FormData($("#MajorEditForm")[0]); const formData = new FormData($("#MajorEditForm")[0]);
for(const file of files) { for(const file of files) {
if(!file.isDelete) if(!file.isDelete)
formData.append('uploadFiles', file, file.name); 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){ function contentCheck(formId){
let flag = true; let flag = true;
if(!$("#contentTitle").val()){ if(!$("#contentTitle").val()){
alert("제목을 입력해주세요.") alert("제목을 입력해주세요.")
flag = false; flag = false;
} }
flag = fileCheck(flag, files); flag = fileCheck(flag, files);
return flag; return flag;
} }
function commentFormReset(){ function commentFormReset(){
const commentForm = $("#commentForm"); const commentForm = $("#commentForm");
commentForm[0].reset(); commentForm[0].reset();
$("#childFormRemoveBtn").hide(); $("#childFormRemoveBtn").hide();
$("#parentComment").val(''); $("#parentComment").val('');
$("#commentFormHome").append(commentForm) $("#commentFormHome").append(commentForm)
} }