Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-04 14:07:09 +09:00
11 changed files with 79 additions and 5 deletions

View File

@@ -8,25 +8,52 @@ import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDe
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatus;
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyWorkRecords;
import java.util.List; import java.util.List;
import app.module.core.config.application.enums.FileStorageType;
import app.module.core.usecase.file.url.application.port.in.FileUrlPortIn;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusDetail;
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.application.domain.GetDailyRecordStatusCmd;
import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut; import app.module.admin.usecase.household.tab.dailyRecord.getDailyRecordStatusDetail.ports.GetDailyRecordStatusDetailPortOut;
import java.util.Optional; import java.util.Optional;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
@Repository @Repository
@RequiredArgsConstructor @RequiredArgsConstructor
class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut { class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut {
private final GetDailyRecordStatusDetailMapper mapper; private final GetDailyRecordStatusDetailMapper mapper;
private final FileUrlPortIn fileUrlPortIn;
@Value("${path.upload.storage}")
private String uploadStorageType;
@Override @Override
public Optional<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd) { public Optional<GetDailyRecordStatusDetail> operate(GetDailyRecordStatusCmd cmd) {
GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd); GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd);
List<GetDailyIncomeRecords> incomes = mapper.getDailyIncomeRecords(cmd); List<GetDailyIncomeRecords> incomes = mapper.getDailyIncomeRecords(cmd);
incomes.stream().map(income ->{
if(income.getFileId() != null) {
income.setAttachmentURL(
fileUrlPortIn.getAttachment(
FileStorageType.valueOf(uploadStorageType), income.getFileId()));
}
return income;
}).toList();
List<GetDailyWorkRecords> works = mapper.getDailyWorkRecords(cmd); List<GetDailyWorkRecords> works = mapper.getDailyWorkRecords(cmd);
List<GetDailyExpenseRecords> expenses = mapper.getDailyExpenseRecords(cmd); List<GetDailyExpenseRecords> expenses = mapper.getDailyExpenseRecords(cmd);
expenses.stream().map(expense ->{
if(expense.getFileId() != null) {
expense.setAttachmentURL(
fileUrlPortIn.getAttachment(
FileStorageType.valueOf(uploadStorageType), expense.getFileId()));
}
return expense;
}).toList();
List<GetDailyPowerRecords> powers = mapper.getDailyPowerRecords(cmd); List<GetDailyPowerRecords> powers = mapper.getDailyPowerRecords(cmd);
List<GetDailyForestryRecords> forestries = mapper.getDailyForestryRecords(cmd); List<GetDailyForestryRecords> forestries = mapper.getDailyForestryRecords(cmd);
List<GetDailyFarmingRecords> farmings = mapper.getDailyFarmingRecords(cmd); List<GetDailyFarmingRecords> farmings = mapper.getDailyFarmingRecords(cmd);

View File

@@ -24,6 +24,9 @@ public class GetDailyExpenseRecords {
private String estimatedValue; private String estimatedValue;
private String updatedBy; private String updatedBy;
private String updatedAt; private String updatedAt;
private Long fileId;
private String fileOriginName;
private String attachmentURL;
private String startDay; private String startDay;
private String endDay; private String endDay;
} }

View File

@@ -28,6 +28,9 @@ public class GetDailyIncomeRecords {
private String estimatedValue; private String estimatedValue;
private String updatedBy; private String updatedBy;
private String updatedAt; private String updatedAt;
private Long fileId;
private String fileOriginName;
private String attachmentURL;
private String startDay; private String startDay;
private String endDay; private String endDay;
} }

View File

@@ -43,7 +43,11 @@
di.price, /* 현금 */ di.price, /* 현금 */
di.estimated_value, /* 현물평가액 */ di.estimated_value, /* 현물평가액 */
di.updated_by, /* 최종수정자 */ di.updated_by, /* 최종수정자 */
TO_CHAR(di.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ TO_CHAR(di.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at, /* 최종수정날짜 */
uf.id AS file_id,
uf.name AS file_name,
uf.origin_name AS file_origin_name,
uf.path AS file_path
<if test="searchMonth == true"> <if test="searchMonth == true">
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
@@ -55,6 +59,11 @@
LEFT JOIN uicode ui_unit LEFT JOIN uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit' ON ui_unit.parent_id = 'code.record.unit'
AND ui_unit.id = di.unit_code AND ui_unit.id = di.unit_code
LEFT JOIN receipt_has_record rhr
ON rhr.receipt_type_id = di.id
AND rhr.type = 'INCOME' AND rhr.is_deleted = false
LEFT JOIN upload_file uf
ON uf.id = rhr.file_id and uf.type = 'INCOME'
<if test="searchMonth == true"> <if test="searchMonth == true">
INNER JOIN daily_record dr INNER JOIN daily_record dr
ON dr.id = di.daily_record_seq ON dr.id = di.daily_record_seq
@@ -150,7 +159,11 @@
de.price, /* 현금 */ de.price, /* 현금 */
de.estimated_value, /* 현물평가액 */ de.estimated_value, /* 현물평가액 */
de.updated_by, /* 최종수정자 */ de.updated_by, /* 최종수정자 */
TO_CHAR(de.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at /* 최종수정날짜 */ TO_CHAR(de.updated_at, 'YYYY-MM-DD HH24:MI') AS updated_at, /* 최종수정날짜 */
uf.id AS file_id,
uf.name AS file_name,
uf.origin_name AS file_origin_name,
uf.path AS file_path
<if test="searchMonth == true"> <if test="searchMonth == true">
, EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day
, EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day
@@ -159,6 +172,11 @@
LEFT JOIN uicode ui_unit LEFT JOIN uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit' ON ui_unit.parent_id = 'code.record.unit'
AND ui_unit.id = de.unit_code AND ui_unit.id = de.unit_code
LEFT JOIN receipt_has_record rhr
ON rhr.receipt_type_id = de.id
AND rhr.type = 'EXPENSE' AND rhr.is_deleted = false
LEFT JOIN upload_file uf
ON uf.id = rhr.file_id and uf.type = 'EXPENSE'
<if test="searchMonth == true"> <if test="searchMonth == true">
INNER JOIN daily_record dr INNER JOIN daily_record dr
ON dr.id = de.daily_record_seq ON dr.id = de.daily_record_seq

View File

@@ -78,9 +78,6 @@
<h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3> <h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}"> <div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right"> <div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn small"> <button type="button" class="btn small">
<span class="btn-txt"> <span class="btn-txt">
<label class="radio-inner"> <label class="radio-inner">
@@ -112,6 +109,7 @@
<th>단위</th> <th>단위</th>
<th>현금(원)</th> <th>현금(원)</th>
<th>현물평가액</th> <th>현물평가액</th>
<th>영수증</th>
<th>최종 수정자</th> <th>최종 수정자</th>
</tr> </tr>
</thead> </thead>
@@ -219,6 +217,7 @@
<th>단위</th> <th>단위</th>
<th>현금(원)</th> <th>현금(원)</th>
<th>현물평가액</th> <th>현물평가액</th>
<th>영수증</th>
<th>최종 수정자</th> <th>최종 수정자</th>
</tr> </tr>
</thead> </thead>
@@ -514,6 +513,9 @@
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 --> <td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) --> <td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 --> <td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td class="align-center">
${item.fileId ? `<a href="${item.attachmentURL}" download>다운로드</a>` : '-'}
</td>
<td> <td>
${item.updatedBy}<br> ${item.updatedBy}<br>
(${item.updatedAt}) (${item.updatedAt})
@@ -605,6 +607,9 @@
<td>${ifNullHyphen(item.unitText)}</td><!-- 단위 --> <td>${ifNullHyphen(item.unitText)}</td><!-- 단위 -->
<td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) --> <td class="align-right">${formatNumberWithComma(item.price)}</td><!-- 현금(원) -->
<td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 --> <td class="align-right">${formatNumberWithComma(item.estimatedValue)}</td><!-- 현물평가액 -->
<td class="align-center">
${item.fileId ? `<a href="${item.attachmentURL}" download>다운로드</a>` : '-'}
</td>
<td> <td>
${item.updatedBy}<br> ${item.updatedBy}<br>
(${item.updatedAt}) (${item.updatedAt})

View File

@@ -1598,6 +1598,17 @@ hr::before {
border-radius: 3.2rem 0rem 0rem 0rem; border-radius: 3.2rem 0rem 0rem 0rem;
} }
.loading {
position: absolute;
left: 50%;
top: 50%;
-webkit-transform: translate(-50%, -50%);
transform: translate(-50%, -50%);
width: 4.8rem !important;
height: 4.8rem !important;
z-index: 3200;
}
/*약관 폰트 가이드 규칙*/ /*약관 폰트 가이드 규칙*/
.term-wrap .modal-content-inner { .term-wrap .modal-content-inner {
margin-top: 3.2rem; margin-top: 3.2rem;

View File

@@ -323,10 +323,13 @@ var ajaxUtil = {
if (ajaxUtil.loadingStatus) { if (ajaxUtil.loadingStatus) {
ajaxUtil.loadingStatus = false; ajaxUtil.loadingStatus = false;
// TODO : 로딩바 숨김 // TODO : 로딩바 숨김
document.querySelector('#loadingBar').style.display = 'none';
} }
}, },
_showWaiting:function(){ _showWaiting:function(){
ajaxUtil.loadingStatus = true; ajaxUtil.loadingStatus = true;
// TODO : 로딩바 활성화 // TODO : 로딩바 활성화
document.querySelector('#loadingBar').style.display = 'block';
debugger
}, },
}; };

View File

@@ -5,6 +5,7 @@
<body> <body>
<div id="wrap"> <div id="wrap">
<div class="loading" 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,6 +5,7 @@
<body> <body>
<div id="wrap"> <div id="wrap">
<div class="loading" 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,6 +5,7 @@
<body> <body>
<div id="wrap"> <div id="wrap">
<div class="loading" 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

@@ -303,6 +303,7 @@
let formData = new FormData(); let formData = new FormData();
formData.append('file', file); formData.append('file', file);
ajaxUtil._showWaiting(); ajaxUtil._showWaiting();
$.ajax({ $.ajax({
method: 'POST', method: 'POST',