Merge branch 'dev' into bo_daily

# Conflicts:
#	admin/src/main/resources/templates/households/{seq}.html
This commit is contained in:
김현주
2025-07-02 16:39:06 +09:00
78 changed files with 2284 additions and 1353 deletions

View File

@@ -0,0 +1,23 @@
<?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.getBankAutoTransferExpense.adapters.persistence.GetBankAutoTransferExpenseMapper">
<select id="getBankAutoTransferExpense"
resultType="app.module.admin.usecase.household.tab.bankAutoTransfer.getBankAutoTransferExpense.ports.application.domain.GetBankAutoTransferExpense">
/* getBankAutoTransferExpense : 은행자동이체(지출) 상세 조회 */
SELECT id,
household_seq,
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,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,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.removeBankAutoTranfers.adapters.persistence.RemoveBankAutoTransfersMapper">
<update id="remove">
/* remove : 은행자동이체내역 삭제*/
UPDATE bank_auto_transfer
SET <include refid="common.fields.DeleteBaseSet"/>
WHERE id IN
<foreach collection="removeIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</update>
<select id="existsBankAutoTransfer" resultType="boolean">
/* existsBankAutoTransfer : 은행자동이체내역 존재 여부 */
SELECT EXISTS (
SELECT 1
FROM bank_auto_transfer
WHERE is_deleted = false
AND monthly_input_status_id = #{monthlyInputStatusId}
)
</select>
</mapper>

View File

@@ -3,8 +3,8 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.tab.forestProduct.removeForestProducts.adapters.persistence.RemoveForestProductsMapper">
<update id="removeForestProducts">
/* removeForestProducts : 임산물현황 삭제*/
<update id="remove">
/* remove : 임산물현황 삭제*/
UPDATE forest_product
SET <include refid="common.fields.DeleteBaseSet"/>
WHERE id IN

View File

@@ -0,0 +1,60 @@
<?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.saveBankAutoTransferExpense.adapters.persistence.SaveBankAutoTransferExpenseMapper">
<insert id="createBankAutoTransferExpense">
/* createBankAutoTransferExpense : 은행자동이체(지출) 등록 */
INSERT INTO bank_auto_transfer
(
household_seq,
month,
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},
#{expenseCode},
#{transferCategoryCode},
#{transferCategory},
#{sourcePurpose},
#{count},
#{unitCode},
#{unit},
#{price},
#{transferType},
#{monthlyInputStatusId},
#{category},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
<update id="updateBankAutoTransferExpense">
/* updateBankAutoTransferExpense : 은행자동이체(지출) 수정 */
UPDATE bank_auto_transfer
SET
household_seq = #{householdSeq},
expense_code = #{expenseCode},
transfer_category_code = #{transferCategoryCode},
transfer_category = #{transferCategory},
source_purpose = #{sourcePurpose},
count = #{count},
unit_code = #{unitCode},
unit = #{unit},
price = #{price},
<include refid="common.fields.UpdateBaseSet"/>
WHERE id = #{bankAutoTransferId}
</update>
</mapper>

View File

@@ -0,0 +1,66 @@
<?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},
#{unit},
#{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},
unit = #{unit},
price = #{price},
<include refid="common.fields.UpdateBaseSet"/>
WHERE id = #{bankAutoTransferId}
</update>
</mapper>

View File

@@ -3,12 +3,30 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.monthlyInputStatus.updateMonthlyInputStatus.adapters.persistence.UpdateMonthlyInputStatusMapper">
<update id="updateForestProductStatus">
/* updateForestProductStatus : 임산물현황 입력상태 수정 */
UPDATE monthly_input_status
SET forest_product_status = #{status},
<include refid="common.fields.UpdateBaseSet"/>
WHERE is_deleted = false
AND id = #{id}
</update>
<update id="updateForestProductStatus">
/* updateForestProductStatus : 임산물현황 입력상태 수정 */
UPDATE monthly_input_status
SET forest_product_status = #{status},
<include refid="common.fields.UpdateBaseSet"/>
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>
<update id="updateBankOutputStatus">
/* updateBankOutputStatus : 은행자동이체(지출) 입력상태 수정 */
UPDATE monthly_input_status
SET bank_auto_transfer_output_status = #{status},
<include refid="common.fields.UpdateBaseSet"/>
WHERE is_deleted = false
AND id = #{id}
</update>
</mapper>