Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
kangsunlee
2025-07-16 15:59:26 +09:00
7 changed files with 10 additions and 9 deletions

View File

@@ -509,7 +509,7 @@
$('#incomeCount').text(data.length); $('#incomeCount').text(data.length);
if(data.length === 0) { if(data.length === 0) {
noDataDaily(tbody, status, 10); noDataDaily(tbody, status, 11);
return; return;
} }

View File

@@ -116,12 +116,12 @@ class GetAttachmentController {
sftpFileDownloader.downloadFile(getFile); sftpFileDownloader.downloadFile(getFile);
} catch (JSchException | SftpException | IOException e) { } catch (JSchException | SftpException | IOException e) {
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
.body("SFTP 파일 다운로드에 실패했습니다: " + e.getMessage()); .body("SFTP 파일 다운로드에 실패했습니다 " + e.getMessage());
} }
File downloadedFile = new File(getFile.getLocalPath()); File downloadedFile = new File(getFile.getLocalPath());
if (!downloadedFile.exists()) { if (!downloadedFile.exists()) {
return ResponseEntity.status(HttpStatus.NOT_FOUND) return ResponseEntity.status(HttpStatus.NOT_FOUND)
.body("다운로드된 파일을 찾을 수 없습니다: " + getFile.getLocalPath()); .body("다운로드된 파일을 찾을 수 없습니다 " + getFile.getLocalPath());
} }
return ResponseEntity.ok() return ResponseEntity.ok()

File diff suppressed because one or more lines are too long

View File

@@ -124,7 +124,7 @@ root: /*[[|#{uri.front.info.user.path}/password|]]*/'rootUrl',
}) })
.catch(error => { .catch(error => {
console.error('Download error:', error); console.error('Download error:', error);
ajaxUtil._alert('파일 다운로드에 실패했습니다: ', null); ajaxUtil._alert('파일 다운로드에 실패했습니다. ', null);
}); });
}, },

View File

@@ -5,7 +5,7 @@
<body> <body>
<div id="wrap"> <div id="wrap">
<div class="loading dimmed" id="loadingBar" style="display: none"><i class="ico-spinner" aria-hidden="true"></i></div> <div class="loading-dimmed" id="loadingBar" style="display: none"><i class="ico-spinner" aria-hidden="true"></i></div>
<section th:replace="~{common/components :: header(true)}"></section> <section th:replace="~{common/components :: header(true)}"></section>
<div id="container" layout:fragment="content"> <div id="container" layout:fragment="content">

View File

@@ -5,7 +5,7 @@
<body> <body>
<div id="wrap"> <div id="wrap">
<div class="loading dimmed" id="loadingBar" style="display: none"><i class="ico-spinner" aria-hidden="true"></i></div> <div class="loading-dimmed" id="loadingBar" style="display: none"><i class="ico-spinner" aria-hidden="true"></i></div>
<section th:replace="~{common/components :: header(false)}"></section> <section th:replace="~{common/components :: header(false)}"></section>
<div id="container" layout:fragment="content"> <div id="container" layout:fragment="content">

View File

@@ -827,6 +827,7 @@
today.getFullYear() === lastDayOfMonth.getFullYear() && today.getFullYear() === lastDayOfMonth.getFullYear() &&
today.getMonth() === lastDayOfMonth.getMonth() && today.getMonth() === lastDayOfMonth.getMonth() &&
today.getDate() === lastDayOfMonth.getDate()) { today.getDate() === lastDayOfMonth.getDate()) {
ajaxUtil._ajaxSyncMethod( ajaxUtil._ajaxSyncMethod(
ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')), ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')),
{}, {},
@@ -845,7 +846,7 @@
} }
dailyNo.push(dateTxt); dailyNo.push(dateTxt);
}); });
msgTxt += "1. 일계부 미등록 \n"+dailyNo.join(',')+"\n"; msgTxt += "<p class=\"dialog-info-tit\">1. 일계부 미등록 </p>\n <p class=\"dialog-info\">"+dailyNo.join(',')+"</p>\n";
} }
if(response.monthRecordAlertDtoList.length > 0) { if(response.monthRecordAlertDtoList.length > 0) {
@@ -853,7 +854,7 @@
if(response.dailyRecordAlertDtoList.length > 0){ if(response.dailyRecordAlertDtoList.length > 0){
idx ++; idx ++;
} }
msgTxt += idx+". "+dto+"\n"; msgTxt += "<p class=\"dialog-info-tit\">"+idx+". "+dto+"</p>\n";
}); });
} }