Merge branch 'bo_daily' into dev

This commit is contained in:
김현주
2025-07-03 16:37:52 +09:00
103 changed files with 4623 additions and 112 deletions

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.expense.ports.application;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
@@ -98,8 +99,8 @@ public class DailyExpenseService implements DailyExpensePortIn {
formVO.getId(),
formVO.getDailyRecordSeq(),
formVO.getInputType(),
"2", // [정책] 2 고정
(formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재
DailyRecordConstants.EXPENSE_CATEGORY,
(formVO.getCredit() ? DailyRecordConstants.EXPENSE_INCOME_MARK : null),
formVO.getCredit(),
formVO.getExpenseKind(),
formVO.getSourcePurpose(),

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.farming.ports.application;
import app.module.core.config.application.util.DailyUtil;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
@@ -18,6 +19,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.List;
@Slf4j
@@ -25,8 +27,9 @@ import java.util.List;
@RequiredArgsConstructor
public class DailyFarmingService implements DailyFarmingPortIn {
private final DailyFarmingPortOut portOut;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyRecordPortIn dailyRecordPortIn;
private final UICodeListPortIn uiCodeListPortIn;
private final DailyUtil dailyUtil;
@Override
public List<DailyFarmingDto> list(DailyFarmingUIReqVO reqVO) {
@@ -101,30 +104,14 @@ public class DailyFarmingService implements DailyFarmingPortIn {
formVO.getHouseholdSeq(),
formVO.getId());
String incomeMark = null;
String expenseMark = null;
if (!"code.record.farming.self".equals(formVO.getProductCode())) {
List<UICodeElement> recordFarming = uiCodeListPortIn.connect("code.record.farming");
String returnValue = null;
for (UICodeElement codeSetup : recordFarming) {
if (codeSetup.getId().equalsIgnoreCase(formVO.getProductCode())) {
returnValue = codeSetup.getCodeValue();
break;
}
}
if (returnValue != null) {
incomeMark = returnValue.split(",")[0];
expenseMark = returnValue.split(",")[1];
}
}
HashMap<String, String> markMap = dailyUtil.getMarkByFarming(uiCodeListPortIn.connect("code.record.farming"), formVO.getProductCode());
CreateDailyFarmingCmd command = AuditUtil.create(
new CreateDailyFarmingCmd(
formVO.getId(),
formVO.getDailyRecordSeq(),
incomeMark,
expenseMark,
markMap.get("incomeMark"),
markMap.get("expenseMark"),
formVO.getProductCode(),
formVO.getProductSelf(),
formVO.getUsage(),

View File

@@ -1,5 +1,6 @@
package app.module.front.usecase.daily.forestry.ports.application;
import app.module.core.config.constants.DailyRecordConstants;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
@@ -99,7 +100,7 @@ public class DailyForestryService implements DailyForestryPortIn {
new CreateDailyForestryCmd(
formVO.getId(),
formVO.getDailyRecordSeq(),
"81011", // [정책] 81011 고정
DailyRecordConstants.FORESTRY_EXPENSE_MARK,
formVO.getProductName(),
formVO.getUsage(),
formVO.getQuantity(),

View File

@@ -5,7 +5,6 @@ spring:
messages:
basename: messages/exception,messages/validation,messages/uri,messages/operation
encoding: UTF-8
# gzip compression 설정
compression:
enabled: true

View File

@@ -9,7 +9,6 @@
, ds.work_land_area, ds.area_unit_code, ds.area_unit_self, ds.harvest_quantity, ds.harvest_unit_code, ds.harvest_unit_self
, ds.owner_time, ds.spouse_time, ds.family_m_hours, ds.family_f_hours, ds.hired_m_hours
, ds.hired_f_hours, ds.shared_m_hours, ds.shared_f_hours, ds.volunteer_m_hours, ds.volunteer_f_hours
, ds.is_deleted
from daily_work ds
<include refid="app.module.core.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
where ds.is_deleted = false

View File

@@ -89,7 +89,8 @@
</ul>
</div>
</div>
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
th:if="${btnActive}">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>

View File

@@ -87,7 +87,8 @@
</ul>
</div>
</div>
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
th:if="${btnActive}">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>

View File

@@ -87,7 +87,8 @@
</ul>
</div>
</div>
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
th:if="${btnActive}">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>

View File

@@ -77,7 +77,8 @@
</ul>
</div>
</div>
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
th:if="${btnActive}">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>

View File

@@ -129,7 +129,8 @@
</ul>
</div>
</div>
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01">
<button type="button" class="btn btn-m btn-secondary btn-full button-modal01" data-testid="button-modal01"
th:if="${btnActive}">
<i class="ico-add ico-small" aria-hidden="true"></i>
<span class="btn-txt">추가 등록</span>
</button>