자동이체 - 수입 완료 (형태 변경 아직 필요)

This commit is contained in:
주우성
2025-06-17 20:13:45 +09:00
parent 9a215b1221
commit 3f9b74d1f6
37 changed files with 920 additions and 28 deletions

View File

@@ -0,0 +1,57 @@
<?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.front.usecase.info.bank.createBank.adapters.persistence.CreateBankMapper">
<insert id="createBank" keyProperty="id">
<selectKey keyProperty="id" order="BEFORE" resultType="long">
SELECT nextval('bank_auto_transfer_seq')
</selectKey>
INSERT INTO bank_auto_transfer (
id,
household_seq,
transfer_type,
crop_code,
transfer_category_code,
transfer_category,
income_code,
expense_code,
source_purpose,
count,
unit_code,
price,
month,
monthly_input_status_id,
created_at,
created_by,
updated_at,
updated_by,
is_deleted
) VALUES (
#{id},
#{householdSeq},
#{transferType},
#{cropCode},
#{transferCategoryCode},
#{transferCategory},
#{incomeCode},
#{expenseCode},
#{sourcePurpose},
#{count},
#{unitCode},
#{price},
#{month},
#{monthlyInputStatusId},
#{createdAt},
#{createdBy},
#{createdAt},
#{createdBy},
false
)
</insert>
</mapper>

View File

@@ -0,0 +1,67 @@
<?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.front.usecase.info.bank.getBanks.adapters.persistence.GetBanksMapper">
<select id="getBanks"
resultType="app.module.front.usecase.info.bank.getBanks.adapters.persistence.model.GetBanksDto">
SELECT
a.id AS id,
a.household_seq AS householdSeq,
a.transfer_type AS transferType,
a.crop_code AS cropCode,
a.transfer_category_code AS transferCategoryCode,
a.transfer_category AS transferCategory,
a.income_code AS incomeCode,
a.expense_code AS expenseCode,
a.source_purpose AS sourcePurpose,
a.count AS count,
a.unit_code AS unitCode,
a.price AS price,
a.month AS month,
a.monthly_input_status_id AS monthlyInputStatusId,
a.created_at AS createdAt,
a.created_by AS createdBy,
a.updated_at AS updatedAt,
a.updated_by AS updatedBy,
COUNT(*) OVER () AS total
FROM bank_auto_transfer a
WHERE a.is_deleted = false
<if test="cmd.monthlyInputStatusId != null">
AND a.monthly_input_status_id = #{cmd.monthlyInputStatusId}
</if>
<if test="cmd.householdSeq != null">
AND a.household_seq = #{cmd.householdSeq}
</if>
<if test="pageable.sort != null and !pageable.sort.isEmpty()">
ORDER BY
<foreach collection="pageable.sort" item="order" separator=",">
<choose>
<when test="order.property eq 'household'">a.household_seq</when>
<when test="order.property eq 'updatedBy'">a.updated_by</when>
<when test="order.property eq 'updatedAt'">a.updated_at</when>
<when test="order.property eq 'createdBy'">a.created_by</when>
<when test="order.property eq 'createdAt'">a.created_at</when>
<otherwise>a.id</otherwise>
</choose>
<choose>
<when test="order.direction.toString() eq 'DESC'">DESC</when>
<otherwise>ASC</otherwise>
</choose>
</foreach>
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
</if>
</select>
</mapper>

View File

@@ -0,0 +1,16 @@
<?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.front.usecase.info.bank.removeBanks.adapters.persistence.RemoveBanksMapper">
<update id="deleteBanks">
UPDATE bank_auto_transfer
SET <include refid="common.fields.DeleteBaseSet" />
WHERE
household_seq = #{householdSeq}
AND monthly_input_status_id = #{monthlyInputStatusId}
AND transfer_type = #{transferType}
</update>
</mapper>

View File

@@ -7,7 +7,7 @@
<insert id="createForestProduct" keyProperty="id">
<!-- createForestProduct 게시글 등록 -->
<selectKey keyProperty="id" order="BEFORE" resultType="long">
SELECT nextval('notice_seq')
SELECT nextval('monthly_input_status_seq')
</selectKey>
INSERT INTO forest_product (

View File

@@ -9,7 +9,7 @@
SET <include refid="common.fields.DeleteBaseSet" />
WHERE
household_seq = #{householdSeq}
AND monthly_input_status_id = #{id}
AND monthly_input_status_id = #{monthlyInputStatusId}
</update>

View File

@@ -53,7 +53,7 @@
<div class="component-btns fixed">
<div class="btns-row">
<!-- 비활성화 스타일/ 버튼 속성 disabled 추가-->
<button type="button" class="btn btn-l btn-primary" id="complateBtn" disabled>
<button type="button" class="btn btn-l btn-primary" id="complateBtn" disabled onclick="formControl.goSave()">
<span class="btn-txt">등록 완료</span>
</button>
</div>
@@ -97,7 +97,7 @@
</div>
</div>"/api/front/info/bank/create"
<section layout:fragment="script">
<script th:inline="javascript">
@@ -111,11 +111,11 @@
modalPopup: null
},
data: {
transferCategoryList: /*[[${transferCategoryList}]]*/ [],
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
unitList: /*[[${unitList}]]*/ [],
bankList : [],
pastBankList : [],
bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'',
currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferInputStatus}]]*/'',
pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferInputStatus}]]*/'',
@@ -125,7 +125,7 @@
noDataCheckbox: document.getElementById("forestProductStatus"),
select:{
cropCodeSelect : null,
transferCategorySelect : null,
transferCategoryCodeSelect : null,
unitCodeSelect : null,
}
},
@@ -247,11 +247,12 @@
}
});
const $select2 = document.querySelector('#transferCategorySelect');
ENV.elementRefs.select.transferCategorySelect = new etUI.components.SelectBox();
ENV.elementRefs.select.transferCategorySelect.core.init($select2,{
const $select2 = document.querySelector('#transferCategoryCodeSelect');
ENV.elementRefs.select.transferCategoryCodeSelect = new etUI.components.SelectBox();
ENV.elementRefs.select.transferCategoryCodeSelect.core.init($select2,{
selectItemCallback({selectValue, dataValue}){
document.querySelector('#transferCategory').value=dataValue;
// document.querySelector('#transferCategory').value=selectValue;
document.querySelector('#transferCategoryCode').value=dataValue;
document.querySelectorAll('div[data-option]').forEach(el => {
el.style.display = 'none';
});
@@ -327,17 +328,17 @@
const form = document.getElementById('popupForm');
kri.form.errorInit(form);
const selects = ['cropCode', 'transferCategory', 'unitCode'];
const selects = ['cropCode', 'transferCategoryCode', 'unitCode'];
selects.forEach(id => {
const sel = document.getElementById(id + 'Select');
if (sel && sel.value) form[id].value = sel.value;
});
const errors = [];
if (!form.transferCategory.value) errors.push({field: 'transferCategory', message: '수입종류를 선택해주세요.'});
if (form.transferCategory.value && document.getElementById(form.transferCategory.value+"_value")
&& !document.getElementById(form.transferCategory.value+"_value").value){
errors.push({field: form.transferCategory.value+"_value", message: '수입대상을 입력해주세요.'});
if (!form.transferCategoryCode.value) errors.push({field: 'transferCategoryCode', message: '수입종류를 선택해주세요.'});
if (form.transferCategoryCode.value && document.getElementById(form.transferCategoryCode.value+"_value")
&& !document.getElementById(form.transferCategoryCode.value+"_value").value){
errors.push({field: form.transferCategoryCode.value+"_value", message: '수입대상을 입력해주세요.'});
}
if (!form.sourcePurpose.value) errors.push({field: 'sourcePurpose', message: '수입원을 입력해주세요.'});
@@ -352,6 +353,7 @@
return;
}
form.transferCategory.value = document.getElementById(form.transferCategoryCode.value+"_value").value;//입력값
const formData = new FormData(form);
const product = {};
formData.forEach((value, key) => product[key] = value);
@@ -366,7 +368,7 @@
},
getCategoryLabel(code) {
const found = ENV.data.transferCategoryList.find(i => i.id === code);
const found = ENV.data.transferCategoryCodeList.find(i => i.id === code);
return found ? found.codeText : '-';
},
// 단위 코드
@@ -392,11 +394,16 @@
Object.entries(product).forEach(([key, val]) => {
const field = form.elements.namedItem(key);
if (field) field.value = val;
if (field) {
field.value = val;
if(key == 'transferCategoryCode'){
document.getElementById(val+"_value").value = product["transferCategory"];
}
}
});
ENV.elementRefs.select.cropCodeSelect.setValue(product.cropCode);
ENV.elementRefs.select.transferCategorySelect.setValue(product.transferCategory);
ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode);
ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode);
},100)
@@ -412,6 +419,29 @@
clearAllItems() {
location.reload();
},
goSave() {
ajaxUtil._ajaxAsync(
ENV.httpUrl.save,
{
status: ENV.elementRefs.noDataCheckbox.checked,
id: ENV.data.id,
bankList: ENV.data.bankList
},
function (rstData, status) {
if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('등록이 완료되었습니다.', null, function () {
history.back()
});
} else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);
}
},
);
}
}
@@ -432,8 +462,9 @@
const getCategory = formControl.getCategoryLabel;
const getCrop = formControl.getCropLabel;
const categoryCode = product.transferCategory;
const categoryValue = product[`${categoryCode}_value`];
const categoryCode = product.transferCategoryCode;
const categoryCodeInputValue = product.transferCategory;
const categoryValue = product[`${categoryCode}_value`] ? product[`${categoryCode}_value`] : categoryCodeInputValue;
const tagTitle = categoryCode === 'code.bank.input.99'
? categoryValue
: `${getCategory(categoryCode)}<span>(${categoryValue})</span>`;

View File

@@ -57,8 +57,9 @@
<i class="ico-required-mark" role="img" aria-label="필수">*</i>
</p>
</div>
<div id="transferCategorySelect" class="component-select bottom-sheet" data-props-default="수입 종류를 선택해 주세요"
<div id="transferCategoryCodeSelect" class="component-select bottom-sheet" data-props-default="수입 종류를 선택해 주세요"
data-props-type="bottomSheet">
<input type="hidden" name="transferCategoryCode" id="transferCategoryCode" data-type="select"/>
<input type="hidden" name="transferCategory" id="transferCategory" data-type="select"/>
<button type="button" class="select-box">
<span class="select-txt"></span>