diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java index 7669cbe5..14b8a83b 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/adapters/persistence/GetDailyRecordStatusDetailDao.java @@ -8,25 +8,53 @@ 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.GetDailyWorkRecords; 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 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.GetDailyRecordStatusDetailPortOut; import java.util.Optional; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.stereotype.Repository; @Repository @RequiredArgsConstructor class GetDailyRecordStatusDetailDao implements GetDailyRecordStatusDetailPortOut { private final GetDailyRecordStatusDetailMapper mapper; + private final FileUrlPortIn fileUrlPortIn; + + @Value("${path.upload.storage}") + private String uploadStorageType; @Override public Optional operate(GetDailyRecordStatusCmd cmd) { GetDailyRecordStatus status = mapper.getDailyRecordStatus(cmd); List 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 works = mapper.getDailyWorkRecords(cmd); List 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 powers = mapper.getDailyPowerRecords(cmd); List forestries = mapper.getDailyForestryRecords(cmd); List farmings = mapper.getDailyFarmingRecords(cmd); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java index 14b4a35c..bfe696cf 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyExpenseRecords.java @@ -24,6 +24,9 @@ public class GetDailyExpenseRecords { private String estimatedValue; private String updatedBy; private String updatedAt; + private Long fileId; + private String fileOriginName; + private String attachmentURL; private String startDay; private String endDay; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java index 60fa6f91..cf2ee83e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/getDailyRecordStatusDetail/ports/application/domain/GetDailyIncomeRecords.java @@ -28,6 +28,9 @@ public class GetDailyIncomeRecords { private String estimatedValue; private String updatedBy; private String updatedAt; + private Long fileId; + private String fileOriginName; + private String attachmentURL; private String startDay; private String endDay; } diff --git a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml index 3d90ad50..ccbb3dd8 100644 --- a/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml +++ b/admin/src/main/resources/mappers/household/GetDailyRecordStatusDetailMapper.xml @@ -43,7 +43,11 @@ di.price, /* 현금 */ di.estimated_value, /* 현물평가액 */ 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 , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day @@ -55,6 +59,11 @@ LEFT JOIN uicode ui_unit ON ui_unit.parent_id = 'code.record.unit' 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' INNER JOIN daily_record dr ON dr.id = di.daily_record_seq @@ -150,7 +159,11 @@ de.price, /* 현금 */ de.estimated_value, /* 현물평가액 */ 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 , EXTRACT(DAY FROM CAST(dr.start_date as date)) as start_day , EXTRACT(DAY FROM CAST(dr.end_date as date)) as end_day @@ -159,6 +172,11 @@ LEFT JOIN uicode ui_unit ON ui_unit.parent_id = 'code.record.unit' 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' INNER JOIN daily_record dr ON dr.id = de.daily_record_seq diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index 6a86cedd..4389bbb4 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -78,9 +78,6 @@

수입 (0건)

-