[FO] 일계부 DB 변경에 대한 수정 처리

This commit is contained in:
김현주
2025-06-19 16:24:36 +09:00
parent 4a8d16f768
commit 8f887efe88
28 changed files with 117 additions and 100 deletions

View File

@@ -5,7 +5,7 @@
<select id="getDailyExpenseList"
resultType="app.module.front.usecase.daily.expense.adapters.persistence.model.DailyExpenseDto">
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
, ds.category_self, ds.source_purpose
, ds.expense_kind, ds.source_purpose
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
from daily_expense ds
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
@@ -29,14 +29,14 @@
<insert id="createDailyExpense" useGeneratedKeys="true" keyProperty="id">
insert into daily_expense (
daily_record_seq, income_mark, expense_mark
, input_type, is_credit, category_self, source_purpose
daily_record_seq, input_type, category, income_mark
, is_credit, expense_kind, source_purpose
, quantity, unit_code, unit_self, price, estimated_value
, is_deleted
, <include refid="common.fields.CreateUpdateBaseColumns"/>
) values (
#{dailyRecordSeq}, #{incomeMark}, #{expenseMark}
, #{inputType}, #{credit}, #{categorySelf}, #{sourcePurpose}
#{dailyRecordSeq}, #{inputType}, #{category}, #{incomeMark}
, #{credit}, #{expenseKind}, #{sourcePurpose}
, #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue}
, false
, <include refid="common.fields.CreateUpdateBaseValues"/>
@@ -47,8 +47,7 @@
update daily_expense set <include refid="common.fields.UpdateBaseSet"/>
, is_credit = #{credit}
, income_mark = #{incomeMark}
, expense_mark = #{expenseMark}
, category_self = #{categorySelf}
, expense_kind = #{expenseKind}
, source_purpose = #{sourcePurpose}
, quantity = #{quantity}
, unit_code = #{unitCode}

View File

@@ -5,7 +5,7 @@
<select id="getDailyIncomeList"
resultType="app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto">
select ds.id, ds.daily_record_seq, ds.input_type, ds.is_credit as credit
, ds.crop_code, ds.category_self, ds.source_purpose
, ds.crop_code, ds.income_kind, ds.source_purpose
, ds.quantity, ds.unit_code, ds.unit_self, ds.price, ds.estimated_value
from daily_income ds
<include refid="app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper.InnerJoinByDailyRecord"/>
@@ -29,14 +29,14 @@
<insert id="createDailyIncome" useGeneratedKeys="true" keyProperty="id">
insert into daily_income (
daily_record_seq, income_mark, expense_mark
, input_type, is_credit, crop_code, category_self, source_purpose
daily_record_seq, input_type, category, expense_mark
, is_credit, crop_code, income_kind, source_purpose
, quantity, unit_code, unit_self, price, estimated_value
, is_deleted
, <include refid="common.fields.CreateUpdateBaseColumns"/>
) values (
#{dailyRecordSeq}, #{incomeMark}, #{expenseMark}
, #{inputType}, #{credit}, #{cropCode}, #{categorySelf}, #{sourcePurpose}
#{dailyRecordSeq}, #{inputType}, #{category}, #{expenseMark}
, #{credit}, #{cropCode}, #{incomeKind}, #{sourcePurpose}
, #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue}
, false
, <include refid="common.fields.CreateUpdateBaseValues"/>
@@ -46,10 +46,9 @@
<update id="updateDailyIncome">
update daily_income set <include refid="common.fields.UpdateBaseSet"/>
, is_credit = #{credit}
, income_mark = #{incomeMark}
, expense_mark = #{expenseMark}
, crop_code = #{cropCode}
, category_self = #{categorySelf}
, income_kind = #{incomeKind}
, source_purpose = #{sourcePurpose}
, quantity = #{quantity}
, unit_code = #{unitCode}

View File

@@ -5,7 +5,7 @@
<select id="getDailyWorkList"
resultType="app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto">
select ds.id, ds.daily_record_seq
, ds.item_name, ds.item_mark, ds.work_name, ds.work_mark
, ds.item_name, ds.work_name
, 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
@@ -33,14 +33,14 @@
<insert id="createDailyWork" useGeneratedKeys="true" keyProperty="id">
insert into daily_work (
daily_record_seq
, item_name, item_mark, work_name, work_mark
, item_name, work_name
, work_land_area, area_unit_code, area_unit_self, harvest_quantity, harvest_unit_code, harvest_unit_self
, owner_time, spouse_time, family_m_hours, family_f_hours, hired_m_hours, hired_f_hours, shared_m_hours, shared_f_hours, volunteer_m_hours, volunteer_f_hours
, is_deleted
, <include refid="common.fields.CreateUpdateBaseColumns"/>
) values (
#{dailyRecordSeq}
, #{itemName}, #{itemMark}, #{workName}, #{workMark}
, #{itemName}, #{workName}
, #{workLandArea}, #{areaUnitCode}, #{areaUnitSelf}, #{harvestQuantity}, #{harvestUnitCode}, #{harvestUnitSelf}
, #{ownerTime}, #{spouseTime}, #{familyMHours}, #{familyFHours}, #{hiredMHours}, #{hiredFHours}, #{sharedMHours}, #{sharedFHours}, #{volunteerMHours}, #{volunteerFHours}
, false
@@ -51,9 +51,7 @@
<update id="updateDailyWork">
update daily_work set <include refid="common.fields.UpdateBaseSet"/>
, item_name = #{itemName}
, item_mark = #{itemMark}
, work_name = #{workName}
, work_mark = #{workMark}
, work_land_area = #{workLandArea}
, area_unit_code = #{areaUnitCode}
, area_unit_self = #{areaUnitSelf}

View File

@@ -48,12 +48,12 @@
<section class="form-group">
<div class="component-input">
<div class="input-label">
<label for="categorySelf" class="label-txt">
<label for="expenseKind" class="label-txt">
지출의 종류<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">
<input type="text" id="categorySelf" name="categorySelf" th:value="${detail.categorySelf}" maxlength="30" placeholder="지출의 종류를 입력해 주세요">
<input type="text" id="expenseKind" name="expenseKind" th:value="${detail.expenseKind}" maxlength="30" placeholder="지출의 종류를 입력해 주세요">
</div>
</div>
<div class="component-input">

View File

@@ -52,7 +52,7 @@
<div class="list-item"
th:each="item, itemStatus : ${expenseList}">
<div class="item-tit-group">
<p class="item-name">[[${item.categorySelf}]]</p>
<p class="item-name">[[${item.expenseKind}]]</p>
<div class="btn-group">
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>

View File

@@ -78,12 +78,12 @@
<section class="form-group">
<div class="component-input">
<div class="input-label">
<label for="categorySelf" class="label-txt">
<label for="incomeKind" class="label-txt">
수입의 종류<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</label>
</div>
<div class="input-field">
<input type="text" id="categorySelf" name="categorySelf" th:value="${detail.categorySelf}" maxlength="30" placeholder="수입의 종류를 입력해 주세요">
<input type="text" id="incomeKind" name="incomeKind" th:value="${detail.incomeKind}" maxlength="30" placeholder="수입의 종류를 입력해 주세요">
</div>
</div>
<div class="component-input">

View File

@@ -52,7 +52,7 @@
<div class="list-item"
th:each="item, itemStatus : ${incomeList}">
<div class="item-tit-group">
<p class="item-name">[[${item.categorySelf}]]</p>
<p class="item-name">[[${item.incomeKind}]]</p>
<div class="btn-group">
<button type="button" class="delete" th:onclick="krip.daily.removeConfirm([[${item.id}]])"><span class="hide-txt">삭제</span></button>
<button type="button" class="edit" th:onclick="krip.daily.createModal([[${item.id}]])"><span class="hide-txt">수정</span></button>

View File

@@ -108,7 +108,8 @@
</label>
</div>
<div class="input-field">
<input type="text" id="harvestQuantity" name="harvestQuantity" th:value="${detail.harvestQuantity}" maxlength="10" placeholder="수확량을 입력해 주세요">
<input type="number" inputmode="decimal" pattern="[0-9]*" id="harvestQuantity" name="harvestQuantity"
th:value="${detail.harvestQuantity}" maxlength="10" placeholder="수확량을 입력해 주세요">
</div>
</div>
<div class="select-group">