Merge branch 'bo_fixes' into 'dev'

[BO] 수정 반영

See merge request korea-research/korea-research!107
This commit is contained in:
이강선 매니저/ST
2025-07-14 06:01:48 +00:00
4 changed files with 10 additions and 8 deletions

View File

@@ -28,7 +28,7 @@
<foreach collection="householdSeqs" item="householdSeq" separator=",">
(
nextval('researcher_has_household_seq'),
#{researcherSeq},
#{adminSeq},
#{householdSeq},
<include refid="common.fields.CreateUpdateBaseValues"/>
)

View File

@@ -44,6 +44,7 @@
JOIN researcher_has_household rhh ON v.household_seq = rhh.household_seq
WHERE TO_CHAR(v.visit_date, 'YYYYMM') = #{cmd.recordMonth}
AND rhh.is_deleted = false
AND v.is_deleted = false
) sub
WHERE rn &lt;= 2
GROUP BY household_seq

View File

@@ -218,22 +218,21 @@
document.querySelectorAll('input[name="forestRemoveIds"]:checked')
).map(el => Number(el.value));
const totalRows = document.querySelectorAll('input[name="forestRemoveIds"]').length;
if(checkedIds.length <= 0) {
alert("임산물을 선택해주세요.");
return
}
if (checkedIds.length === totalRows) {
alert("등록내용은 최소 1건이 남아있어야 합니다.");
return;
}
etUI.dialog.confirm({
title: '삭제 안내',
message: '선택하신 내용을 삭제하시겠습니까?<br>삭제한 항목은 복구할 수 없습니다.',
positiveCallback: function () {
const totalRows = document.querySelectorAll('.row-class').length;
if (totalRows - checkedIds.length <= 0) {
alert("등록내용은 최소 1건이 남아 있어야 합니다.");
return;
}
removeForestProduct(checkedIds);
},
});

View File

@@ -91,6 +91,8 @@ DELETE FROM uri WHERE id = 'uri.admin.communication.sms';
-- 문자발송 메뉴 숨기기
-- update uri set show_on_navi = false, updated_at = now(), updated_by = 'INIT_DATA' where id ='uri.admin.communication.sms' ;
-- 은행자동이체 내역 칼럼 타입 크기 변경
ALTER TABLE public.bank_auto_transfer ALTER COLUMN source_purpose TYPE varchar(100) USING source_purpose::varchar(100);
-- ====================================================================================================================
-- 문자 발송