Merge branch 'susu' into dev

# Conflicts:
#	front/src/main/resources/static/assets/scripts/common.ui.js
#	front/src/main/resources/static/assets/styles/style.css
This commit is contained in:
주수현
2025-07-08 14:19:36 +09:00
28 changed files with 9536 additions and 26 deletions

View File

@@ -14,6 +14,19 @@
</if>
</select>
<select id="removeDailyIncomeReceipt">
<if test="removeIds != null and removeIds != ''">
update receipt_has_record set
<include refid="common.fields.DeleteBaseSet"/>
where is_deleted = false
and type = 'INCOME'
and receipt_type_id IN
<foreach collection="removeIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</select>
<select id="removeDailyWork">
<if test="removeIds != null and removeIds != ''">
update daily_work set
@@ -38,6 +51,19 @@
</if>
</select>
<select id="removeDailyExpenseReceipt">
<if test="removeIds != null and removeIds != ''">
update receipt_has_record set
<include refid="common.fields.DeleteBaseSet"/>
where is_deleted = false
and type = 'EXPENSE'
and receipt_type_id IN
<foreach collection="removeIds" item="id" open="(" separator="," close=")">
#{id}
</foreach>
</if>
</select>
<select id="removeDailyPower">
<if test="removeIds != null and removeIds != ''">
update daily_power set