Merge branch 'kangsun' into 'dev'

[BO] 임가현황 - 은행자동이체내역 작업 중 (1)

See merge request korea-research/korea-research!72
This commit is contained in:
이강선 매니저/ST
2025-07-01 08:58:27 +00:00
38 changed files with 1054 additions and 4 deletions

View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.adapters.persistence.GetBankAutoTransferIncomeMapper">
<select id="getBankAutoTransferIncome"
resultType="app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferIncome.ports.application.domain.GetBankAutoTransferIncome">
/* getBankAutoTransferIncome : 은행자동이체(수입) 상세 조회 */
SELECT id,
household_seq,
crop_code,
income_code,
expense_code,
transfer_category_code,
transfer_category,
source_purpose,
count,
unit_code,
unit,
price
FROM bank_auto_transfer
WHERE is_deleted = false
AND id = #{id}
</select>
</mapper>

View File

@@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.adapters.persistence.GetMonthlyInputStatusMapper">
<select id="getMonthlyInputStatus"
resultType="app.module.admin.usecase.household.monthlyInputStatus.getMonthlyInputStatus.ports.application.domain.GetMonthlyInputStatus">
/* getMonthlyInputStatus : 월별 입력상태 상세 조회 */
SELECT id,
household_seq,
month,
forest_product_status,
bank_auto_transfer_input_status,
bank_auto_transfer_output_status
FROM monthly_input_status
WHERE is_deleted = false
AND household_seq = #{householdSeq}
AND month = #{recordMonth}
</select>
</mapper>

View File

@@ -0,0 +1,64 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.tab.bankAutoTransfer.saveBankAutoTransferIncome.adapters.persistence.SaveBankAutoTransferIncomeMapper">
<insert id="createBankAutoTransferIncome">
/* createBankAutoTransferIncome : 은행자동이체(수입) 등록 */
INSERT INTO bank_auto_transfer
(
household_seq,
month,
crop_code,
income_code,
expense_code,
transfer_category_code,
transfer_category,
source_purpose,
count,
unit_code,
unit,
price,
transfer_type,
monthly_input_status_id,
category,
<include refid="common.fields.CreateUpdateBaseColumns"/>
)
VALUES
(
#{householdSeq},
#{recordMonth},
#{cropCode},
#{incomeCode},
#{expenseCode},
#{transferCategoryCode},
#{transferCategory},
#{sourcePurpose},
#{count},
#{unitCode},
#{price},
#{transferType},
#{monthlyInputStatusId},
#{category},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
<update id="updateBankAutoTransferIncome">
/* updateBankAutoTransferIncome : 은행자동이체(수입) 수정 */
UPDATE bank_auto_transfer
SET
household_seq = #{householdSeq},
crop_code = #{cropCode},
income_code = #{incomeCode},
expense_code = #{expenseCode},
transfer_category_code = #{transferCategoryCode},
transfer_category = #{transferCategory},
source_purpose = #{sourcePurpose},
count = #{count},
unit_code = #{unitCode},
price = #{price},
<include refid="common.fields.UpdateBaseSet"/>
WHERE id = #{bankAutoTransferId}
</update>
</mapper>

View File

@@ -11,4 +11,13 @@
WHERE is_deleted = false
AND id = #{id}
</update>
<update id="updateBankInputStatus">
/* updateBankInputStatus : 은행자동이체(수입) 입력상태 수정 */
UPDATE monthly_input_status
SET bank_auto_transfer_input_status = #{status},
<include refid="common.fields.UpdateBaseSet"/>
WHERE is_deleted = false
AND id = #{id}
</update>
</mapper>

View File

@@ -467,7 +467,15 @@ const formatNumberWithComma = (value) => {
const limitMaxLength = (el) => {
const maxLength = parseInt(el.getAttribute('maxlength'), 10);
el.value = el.value.replace(/\D/g, '').slice(0, maxLength);
let $el = $(el);
if ($el.val().length > maxLength) {
$el.val(el.val().slice(0, $el.attr('maxlength')));
}
if ($el.attr('inputmode') === 'numeric') {
$el.val($el.val().replace('.', ''));
}
}
/**

View File

@@ -0,0 +1,368 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="modalFragment">
<!-- 은행자동이체(수입) 등록 모달 폼 -->
<form autocomplete="off" method="get" name="reqBankIncomeForm">
<input type="hidden" name="bankAutoTransferId">
<input type="hidden" name="householdSeq" th:value="${seq}">
<input type="hidden" name="recordMonth">
<input type="hidden" name="incomeCode">
<input type="hidden" name="expenseCode">
<div class="component-modal mypage-wrap modal01 modal-bank-income" data-props-dimm-click="true" data-state="close">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">
은행자동이체(수입)
</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<!-- <i class="ico-required-mark" role="img" aria-label="필수">*</i><p>필수입력</p>-->
<table class="type-form confirm">
<colgroup>
<col width="10%" />
<col width="40%" />
<col width="10%" />
<col width="40%" />
</colgroup>
<tbody>
<tr>
<th>재배형태</th>
<td>
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="cropCode" required>
<option value="">선택</option>
<option th:each="item : ${recordCrop}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
</div>
</td>
</tr>
<tr>
<th>수입의 종류<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="transferCategoryCode" onchange="selectedIncomeCategory(this);" required>
<option value="">선택</option>
<option th:each="item : ${bankInputCodes}"
th:value="${item.id}"
th:text="${item.codeText}"
th:data-code-value="${item.codeValue}"
th:data-code-type="${item.codeType}">
</select>
</div>
<!-- 직접입력 항목 -->
<div class="component-input self-input">
<div class="input-field">
<input type="text" id="transferCategorySelf" name="transferCategory" disabled>
</div>
</div>
</div>
</td>
<th>대상<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input target-input">
<div class="input-field">
<input type="text" id="transferCategoryTarget" name="transferCategory" maxlength="30" disabled>
</div>
</div>
</td>
</tr>
<tr>
<th>수입원</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="sourcePurpose" name="sourcePurpose" maxlength="30">
</div>
</div>
</td>
</tr>
<tr>
<th>수량</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="count" name="count"
maxlength="10" inputmode="decimal" oninput="limitMaxLength(this);">
</div>
</div>
</td>
<th>단위</th>
<td>
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="unitCode" onchange="selectedSelf(this);" required>
<option value="">선택</option>
<option th:each="item : ${countUnitCodes}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
<!-- 직접입력 수량 단위 -->
<div class="component-input self-input">
<div class="input-field">
<input type="text" id="unit" name="unit" disabled>
</div>
</div>
</div>
</td>
</tr>
<tr>
<th>현금(원)<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td >
<div class="component-input">
<div class="input-field">
<input type="number" id="price" name="price"
maxlength="30" inputmode="numeric" oninput="limitMaxLength(this);">
</div>
</div>
</td>
</tr>
</tbody>
</table>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary" onclick="saveBankIncome();">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</div>
<button type="button" class="modal-close"></button>
</div>
</div>
</div>
</form>
<script>
// 은행자동이체(수입) 모달창 띄우기
const showBankIncomeModal = (id) => {
const f = document.reqBankIncomeForm;
const reqForm = document.reqForm;
f.recordMonth.value = reqForm.recordMonth.value;
// 폼 초기화
resetBankIncomeForm();
if(id != null) {
f.bankAutoTransferId.value = id;
ajaxUtil._ajaxMethod(
`/api/household/bankAutoTransferIncome/${id}`,
{},
(response) => {
console.log("은행자동이체(수입) 상세 응답값 : ", response);
setBankIncomeFormData(response);
document.querySelector(".modal-bank-income").ui.open();
},
function (code, rstData) {
console.log("error : ", code);
},
'get',
'json'
);
} else {
document.querySelector(".modal-bank-income").ui.open();
}
}
// 은행이체내역(수입) 상세 값 set
const setBankIncomeFormData = (data) => {
const form = document.reqBankIncomeForm;
if (!form) return;
form.bankAutoTransferId.value = data.id ?? '';
form.householdSeq.value = data.householdSeq ?? '';
form.cropCode.value = data.cropCode ?? '';
form.incomeCode.value = data.incomeCode ?? '';
form.expenseCode.value = data.expenseCode ?? '';
form.count.value = data.count ?? '';
form.unitCode.value = data.unitCode ?? '';
form.unit.value = data.unit ?? '';
form.price.value = data.price ?? '';
form.sourcePurpose.value = data.sourcePurpose ?? '';
form.transferCategoryCode.value = data.transferCategoryCode ?? '';
// transferCategory 분기 처리
setTransferCategory(data.transferCategoryCode, data.transferCategory);
toggleSelfInput(form.unitCode.value, '#unit');
}
</script>
<script>
// form 초기화
const resetBankIncomeForm = () => {
const form = document.reqBankIncomeForm;
if (!form) return;
const skipInputs = [
'bankAutoTransferId',
'householdSeq',
'recordMonth'
];
// input 초기화
form.querySelectorAll('input').forEach((el) => {
if (!skipInputs.includes(el.name)) {
el.value = '';
// 직접입력 영역이면 비활성화 처리
const wrapper = el.closest('.self-input') || el.closest('.target-input');
if (wrapper) {
el.disabled = true;
wrapper.classList.add('input-disabled');
}
}
});
// select 초기화
form.querySelectorAll('select').forEach((el) => {
el.selectedIndex = 0;
});
}
</script>
<script>
// 은행이체내역(수입) 저장 및 수정
const saveBankIncome = () => {
const f = document.reqBankIncomeForm;
if (!f) return;
let dataOj = $(f).serializeObject();
console.log("dataOj", dataOj);
ajaxUtil._ajaxMethod(
'/api/household/bank/income/save',
JSON.stringify(dataOj),
() => { // 성공
alert("등록이 완료되었습니다.");
document.querySelector(".modal-bank-income").ui.close();
getBankAutoTransfer();
},
function (code, rstData) {
if(code == 422) alert(rstData.responseJSON[0].defaultMessage);
},
'post',
'json',
{ handle422Type: 'alert' }
);
}
</script>
<script>
// 수입의 종류 선택에 따른 직접입력 input 과 대상 input disabled 처리
const selectedIncomeCategory = (el) => {
const f = document.reqBankIncomeForm;
f.incomeCode.value = '';
f.expenseCode.value = '';
const selectedOption = el.options[el.selectedIndex];
const codeValue = selectedOption.dataset.codeValue;
const codeType = selectedOption.dataset.codeType;
if(codeType == 'INPUT') {
f.incomeCode.value = codeValue;
} else {
f.expenseCode.value = codeValue;
}
const tr = el.closest('tr');
const selfArea = tr.querySelector('.self-input');
const selfInput = tr.querySelector('.self-input input');
const targetArea = tr.querySelector('.target-input');
const targetInput = tr.querySelector('.target-input input');
// 직접입력 선택시 직접입력 input disabled 해제
if (el.value === 'code.bank.input.self') {
selfInput.disabled = false;
selfArea.classList.remove('input-disabled');
} else {
selfInput.disabled = true;
selfInput.value = '';
selfArea.classList.add('input-disabled');
}
if(el.value !== 'code.bank.input.10' // 연금
&& el.value !== 'code.bank.input.12' // 통장 인출/해약
&& el.value !== 'code.bank.input.13' // 예금/적금 만기
&& el.value !== 'code.bank.input.self' // 직접입력
&& el.value !== '') {
targetInput.disabled = false;
targetArea.classList.remove('input-disabled');
} else {
targetInput.disabled = true;
targetInput.value = '';
targetArea.classList.add('input-disabled');
}
}
// 분기 처리 유틸
const setTransferCategory = (code, value) => {
const selfInput = document.querySelector('#transferCategorySelf');
const targetInput = document.querySelector('#transferCategoryTarget');
const isSelf = code === 'code.bank.input.self';
if (isSelf) {
selfInput.value = value ?? '';
targetInput.value = '';
} else {
selfInput.value = '';
targetInput.value = value ?? '';
}
toggleSelfInput(code, '#transferCategorySelf');
toggleTargetInput(code, '#transferCategoryTarget');
};
const toggleSelfInput = (code, inputSelector) => {
const el = document.querySelector(inputSelector);
const wrapper = el.closest('.self-input');
const isSelf = code.endsWith('.self');
el.disabled = !isSelf;
wrapper.classList.toggle('input-disabled', !isSelf);
if (!isSelf) el.value = '';
};
const toggleTargetInput = (code, inputSelector) => {
const el = document.querySelector(inputSelector);
const wrapper = el.closest('.target-input');
const needTarget = !['code.bank.input.10', 'code.bank.input.12', 'code.bank.input.13', 'code.bank.input.self', ''].includes(code);
el.disabled = !needTarget;
wrapper.classList.toggle('input-disabled', !needTarget);
if (!needTarget) el.value = '';
};
</script>
</div>
</html>

View File

@@ -15,7 +15,7 @@
<button type="button" class="btn small btn-secondary">
<span class=" btn-txt">삭제</span>
</button>
<button type="button" class="btn small btn-primary">
<button type="button" class="btn small btn-primary" onclick="showBankIncomeModal();">
<span class="btn-txt">추가</span>
</button>
</div>
@@ -123,7 +123,7 @@
</div>
</td>
<td>${ifNullHyphen(item.cropText)}</td> <!-- 재배형태 -->
<td class="underline">${ifNullHyphen(item.categoryText)}</td> <!-- 수입의 종류 -->
<td class="underline"><a href="javascript:void(0);" onclick="showBankIncomeModal(${item.id})">${ifNullHyphen(item.categoryText)}</td> <!-- 수입의 종류 -->
<td>${ifNullHyphen(item.target)}</td><!-- 대상 -->
<td>${ifNullHyphen(item.sourcePurpose)}</td><!-- 수입원 -->
<td class="align-right">${ifNullHyphen(item.count)}</td><!-- 수량 -->

View File

@@ -186,6 +186,9 @@
<!-- 임산물현황등록 모달 -->
<th:block th:replace="households/modal/modal-forest-product :: modalFragment"/>
<!-- 은행자동이체 모달 -->
<th:block th:replace="households/modal/modal-bank-auto-transfer-income :: modalFragment"/>
</section>
<section layout:fragment="script">
@@ -340,6 +343,22 @@
disableArea.classList.add('input-disabled');
}
}
// 직접입력 선택시 input 활성화
const selectedSelf = (el) => {
const tr = el.closest('tr');
const unitArea = tr.querySelector('.self-input');
const unitInput = tr.querySelector('.self-input input');
if (el.value?.endsWith('.self')) {
unitInput.disabled = false;
unitArea.classList.remove('input-disabled');
} else {
unitInput.disabled = true;
unitInput.value = '';
unitArea.classList.add('input-disabled');
}
}
</script>
</section>