diff --git a/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml b/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml index 2d5810f8..07dc5eb9 100644 --- a/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateResearcherMappingMapper.xml @@ -28,7 +28,7 @@ ( nextval('researcher_has_household_seq'), - #{researcherSeq}, + #{adminSeq}, #{householdSeq}, ) diff --git a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml index 4e078b48..b1f2c355 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdsStatusMapper.xml @@ -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 <= 2 GROUP BY household_seq diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html index a0f5778d..799922c9 100644 --- a/admin/src/main/resources/templates/households/tab/forest-product.html +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -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: '선택하신 내용을 삭제하시겠습니까?
삭제한 항목은 복구할 수 없습니다.', positiveCallback: function () { + const totalRows = document.querySelectorAll('.row-class').length; + + if (totalRows - checkedIds.length <= 0) { + alert("등록내용은 최소 1건이 남아 있어야 합니다."); + return; + } removeForestProduct(checkedIds); }, }); diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java index f2939121..ccc954ed 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -35,10 +35,15 @@ public class DailyRecordDao implements DailyRecordPortOut { if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { // 종료일의 달이 변경되면 시작일=종료일 처리 detail.setEndDate(detail.getStartDate()); + detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate())); } } detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate())); + if (detail.isLastDay()) { + detail.setEndDay(dailyUtil.getLastDay(detail.getStartDate())); + } + detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate())); detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate())); detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate())); diff --git a/core/src/main/resources/sql/data/04_second_open.sql b/core/src/main/resources/sql/data/04_second_open.sql index 9f17b874..bf55a707 100644 --- a/core/src/main/resources/sql/data/04_second_open.sql +++ b/core/src/main/resources/sql/data/04_second_open.sql @@ -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); -- ==================================================================================================================== -- 문자 발송 diff --git a/front/src/main/resources/templates/info/main.html b/front/src/main/resources/templates/info/main.html index af85f24e..32c8a579 100644 --- a/front/src/main/resources/templates/info/main.html +++ b/front/src/main/resources/templates/info/main.html @@ -41,20 +41,18 @@ 최근등록 :
등록된 일계부가 없습니다.
- - +

공지사항

+
- -
diff --git a/front/src/main/resources/templates/record/income/form.html b/front/src/main/resources/templates/record/income/form.html index 84d1590b..4ba3d956 100644 --- a/front/src/main/resources/templates/record/income/form.html +++ b/front/src/main/resources/templates/record/income/form.html @@ -8,9 +8,7 @@ th:if="not ${detail.updated}">
- -