Merge branch 'kangsun' into 'dev'
[FO] 은행자동이체 칼럼 추가로 create service 수정 + 오류 수정 See merge request korea-research/korea-research!24
This commit is contained in:
@@ -25,6 +25,7 @@ class CreateBankDao implements CreateBankPortOut {
|
||||
new CreateForestProductDto(
|
||||
null,
|
||||
cmd.getHouseholdSeq(),
|
||||
cmd.getTransferType().equals("code.bank.input") ? "1" : "2",
|
||||
cmd.getTransferType(),
|
||||
cmd.getCropCode(),
|
||||
cmd.getTransferCategoryCode(),
|
||||
|
||||
@@ -16,6 +16,7 @@ public class CreateForestProductDto {
|
||||
|
||||
private Long id;
|
||||
private Long householdSeq;
|
||||
private String category;
|
||||
|
||||
private String transferType;
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
INSERT INTO bank_auto_transfer (
|
||||
id,
|
||||
household_seq,
|
||||
category,
|
||||
transfer_type,
|
||||
crop_code,
|
||||
transfer_category_code,
|
||||
@@ -22,7 +23,7 @@
|
||||
source_purpose,
|
||||
count,
|
||||
unit_code,
|
||||
unit,
|
||||
unit,
|
||||
price,
|
||||
month,
|
||||
monthly_input_status_id,
|
||||
@@ -34,6 +35,7 @@
|
||||
) VALUES (
|
||||
#{id},
|
||||
#{householdSeq},
|
||||
#{category},
|
||||
#{transferType},
|
||||
#{cropCode},
|
||||
#{transferCategoryCode},
|
||||
|
||||
@@ -521,30 +521,29 @@
|
||||
|
||||
const buttonGroupHtml = isEdit
|
||||
? `
|
||||
<div class="btn-group">
|
||||
<button type="button" class="delete" onclick="formControl.deleteItemById(${product.id})">
|
||||
<span class="hide-txt">삭제</span>
|
||||
</button>
|
||||
<button type="button" class="edit" onclick="formControl.editItemById(${product.id})">
|
||||
<span class="hide-txt">수정</span>
|
||||
</button>
|
||||
</div>
|
||||
`
|
||||
<div class="btn-group">
|
||||
<button type="button" class="delete" onclick="formControl.deleteItemById(${product.id})">
|
||||
<span class="hide-txt">삭제</span>
|
||||
</button>
|
||||
<button type="button" class="edit" onclick="formControl.editItemById(${product.id})">
|
||||
<span class="hide-txt">수정</span>
|
||||
</button>
|
||||
</div>
|
||||
`
|
||||
: '';
|
||||
|
||||
const itemHtml = `
|
||||
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">${tagTitle}</p>
|
||||
${buttonGroupHtml}
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
|
||||
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
|
||||
${tagCount}
|
||||
<li><p>현금</p><span>${format(product.price)}원</span></li>
|
||||
</ul>
|
||||
`;
|
||||
<div class="item-tit-group">
|
||||
<p class="item-name">${tagTitle}</p>
|
||||
${buttonGroupHtml}
|
||||
</div>
|
||||
<ul class="detail-list">
|
||||
<li><p>재배형태</p><span>${getCrop(product.cropCode)}</span></li>
|
||||
<li><p>수입원</p><span>${product.sourcePurpose}</span></li>
|
||||
${tagCount}
|
||||
<li><p>현금</p><span>${format(product.price)}원</span></li>
|
||||
</ul>
|
||||
`;
|
||||
|
||||
const item = document.createElement('div');
|
||||
item.className = 'list-item';
|
||||
|
||||
@@ -49,8 +49,8 @@
|
||||
<th:block th:each="item : ${transferCategoryList}">
|
||||
|
||||
<div class="component-input " th:data-option="${item.codeText}">
|
||||
<div class="input-field">
|
||||
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="수입 대상을 입력해 주세요." maxlength="30">
|
||||
<div class="input-field" th:if="${item.id == 'code.bank.output.self'}">
|
||||
<input type="text" th:id="${item.id}+'_value'" th:name="${item.id}+'_value'" value="" placeholder="지출의 종류를 입력해 주세요." maxlength="30">
|
||||
</div>
|
||||
<ul class="guide-info" th:if="${item.msgCode}">
|
||||
<li class="txt-blue" th:text="${item.msgCode}"></li>
|
||||
|
||||
Reference in New Issue
Block a user