diff --git a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml index d3fe3f15..15751c66 100644 --- a/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml +++ b/admin/src/main/resources/mappers/researcher/ResearcherMapper.xml @@ -13,12 +13,12 @@ max(u.code_text) AS region_main_code_name, case a.account_disabled when false then '사용' when true then '미사용' end account_disabled_flag from admin a - join admin_has_role ahr ON a.seq = ahr.admin_seq + join admin_has_role ahr ON a.seq = ahr.admin_seq and ahr.is_deleted = false left join uicode u ON u.parent_id = 'code.region.main' AND u.id = a.region_main_code - left join researcher_has_household rhh ON rhh.admin_seq = a.seq - left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true + left join researcher_has_household rhh ON rhh.admin_seq = a.seq and rhh.is_deleted = false + left join household h ON h.seq = rhh.household_seq AND h.is_panel IS true and h.is_deleted = false where - ahr.role_id = 'ROLE_RESEARCHER' and ahr.is_deleted = false + ahr.role_id = 'ROLE_RESEARCHER' and a.name LIKE CONCAT('%', #{searchValue}, '%') diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index 10d0f25e..c920931a 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -93,6 +93,7 @@ +
@@ -144,6 +145,7 @@ +
diff --git a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java index 5f4f086c..c4419369 100644 --- a/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java +++ b/admin/src/test/java/app/module/admin/feature/admin/repository/dao/AdminCreateUpdateDaoTest.java @@ -14,8 +14,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.TestPropertySource; -@SpringBootTest -@TestPropertySource("classpath:application-override.properties") + + @Slf4j class AdminCreateUpdateDaoTest { @@ -23,12 +23,12 @@ class AdminCreateUpdateDaoTest { System.setProperty("com.amazonaws.sdk.disableEc2Metadata", "true"); } - @Autowired +/* @Autowired SaveAdminPortOut adminCreateUpdateDao; @Autowired AdminViewPortIn adminViewPortIn; @Autowired - SaveAdminPortIn saveAdminPortIn; + SaveAdminPortIn saveAdminPortIn;*/ @Test @DisplayName("operate - AdminCreateDao") diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailySort.java b/core/src/main/java/app/module/core/config/application/enums/DailySort.java similarity index 85% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailySort.java rename to core/src/main/java/app/module/core/config/application/enums/DailySort.java index 54c1699a..b881d33a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailySort.java +++ b/core/src/main/java/app/module/core/config/application/enums/DailySort.java @@ -1,4 +1,4 @@ -package app.module.front.usecase.daily.record.adapters.web.model; +package app.module.core.config.application.enums; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java b/core/src/main/java/app/module/core/config/application/enums/DailyStatus.java similarity index 73% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java rename to core/src/main/java/app/module/core/config/application/enums/DailyStatus.java index 7b69c6d8..cd146e2d 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java +++ b/core/src/main/java/app/module/core/config/application/enums/DailyStatus.java @@ -1,4 +1,4 @@ -package app.module.front.usecase.daily.record.adapters.web.model; +package app.module.core.config.application.enums; public enum DailyStatus { /** diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java b/core/src/main/java/app/module/core/config/application/enums/DailyTargetStatus.java similarity index 79% rename from front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java rename to core/src/main/java/app/module/core/config/application/enums/DailyTargetStatus.java index a2472daf..ae8438eb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java +++ b/core/src/main/java/app/module/core/config/application/enums/DailyTargetStatus.java @@ -1,4 +1,4 @@ -package app.module.front.usecase.daily.record.adapters.web.model; +package app.module.core.config.application.enums; public enum DailyTargetStatus { /** diff --git a/front/src/main/java/app/module/front/config/application/util/DailyUtil.java b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java similarity index 87% rename from front/src/main/java/app/module/front/config/application/util/DailyUtil.java rename to core/src/main/java/app/module/core/config/application/util/DailyUtil.java index 763e803d..259b1f20 100644 --- a/front/src/main/java/app/module/front/config/application/util/DailyUtil.java +++ b/core/src/main/java/app/module/core/config/application/util/DailyUtil.java @@ -1,9 +1,8 @@ -package app.module.front.config.application.util; +package app.module.core.config.application.util; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.LocalDate; import java.util.Date; @@ -51,24 +50,29 @@ public class DailyUtil { } /** - * 검색 일의 마지막 일 조회 - * @param searchDate 검색 + * 마지막 일 조회 + * + * @param searchDate 검색일 * @return 마지막 일 */ public int getLastDay(LocalDate searchDate) { - return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth(); + if (searchDate != null) { + return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth(); + } + + return 0; } /** * 자가농업 항목 오픈 여부 * [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 * - * @param groupNo - * @param searchDate 종료일 + * @param groupNo 그룹번호 + * @param endDate 종료일 * @return true=대상, false=대상 아님 */ - public boolean isFarmingOpen(int groupNo, LocalDate searchDate) { - return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(searchDate); + public boolean isFarmingOpen(int groupNo, LocalDate endDate) { + return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(endDate); } /** diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index cb7296fa..c033ef94 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -24,19 +24,19 @@ CREATE TABLE privilege ( )) ); -COMMENT ON TABLE public.privilege IS '권한 정의 테이블'; +COMMENT ON TABLE privilege IS '권한 정의 테이블'; -COMMENT ON COLUMN public.privilege.id IS '권한 ID'; -COMMENT ON COLUMN public.privilege.description IS '권한 설명'; -COMMENT ON COLUMN public.privilege.app_type IS '앱 구분'; -COMMENT ON COLUMN public.privilege.order_no IS '정렬 순서'; -COMMENT ON COLUMN public.privilege.created_at IS '생성일'; -COMMENT ON COLUMN public.privilege.created_by IS '생성자'; -COMMENT ON COLUMN public.privilege.updated_at IS '수정일'; -COMMENT ON COLUMN public.privilege.updated_by IS '수정자'; -COMMENT ON COLUMN public.privilege.deleted_at IS '삭제일'; -COMMENT ON COLUMN public.privilege.deleted_by IS '삭제자'; -COMMENT ON COLUMN public.privilege.is_deleted IS '삭제 여부'; +COMMENT ON COLUMN privilege.id IS '권한 ID'; +COMMENT ON COLUMN privilege.description IS '권한 설명'; +COMMENT ON COLUMN privilege.app_type IS '앱 구분'; +COMMENT ON COLUMN privilege.order_no IS '정렬 순서'; +COMMENT ON COLUMN privilege.created_at IS '생성일'; +COMMENT ON COLUMN privilege.created_by IS '생성자'; +COMMENT ON COLUMN privilege.updated_at IS '수정일'; +COMMENT ON COLUMN privilege.updated_by IS '수정자'; +COMMENT ON COLUMN privilege.deleted_at IS '삭제일'; +COMMENT ON COLUMN privilege.deleted_by IS '삭제자'; +COMMENT ON COLUMN privilege.is_deleted IS '삭제 여부'; -- ============================================ @@ -1201,62 +1201,54 @@ COMMENT ON COLUMN daily_input_status.is_deleted IS '삭제여부'; CREATE SEQUENCE forest_product_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE forest_product ( - id bigint DEFAULT nextval('forest_product_seq') NOT NULL, -- 현황 ID - household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK) - street_num varchar(255), -- 지번 - land_type varchar(255), -- 지목 - town varchar(255), -- 읍면동 - available_area integer, -- 가능면적 - crop_name varchar(255), -- 재배작물명 - crop_code varchar(255), -- 작물부호 (매핑코드) - land_area integer, -- 면적 - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - main_yield NUMERIC(10, 2), -- 수확량 - main_yield_unit_code varchar(255), -- 수확 단위 (매핑코드) - main_sale_amount NUMERIC(10, 2), -- 판매량 - main_sale_unit_code varchar(255), -- 판매 단위 (매핑코드) + id int8 DEFAULT nextval('forest_product_seq'::regclass) NOT NULL, -- 현황 ID + household_seq int8 NOT NULL, -- 임가 일련번호 (FK) + street_num varchar(255), -- 지번 + land_type varchar(255), -- 지목 + town varchar(255), -- 읍면동 + available_area varchar(10), -- 가능면적 + crop_name varchar(255), -- 재배작물명 + crop_code varchar(255), -- 작물부호 (매핑코드) + land_area varchar(10), -- 면적 + "month" varchar(7) NOT NULL, -- 조사 월 (yyyy-mm) + main_yield varchar(10), -- 주 수확량 + main_yield_unit_code varchar(255), -- 주 수확량 단위(코드) + main_sale_amount varchar(10), -- 주 판매량 + main_sale_unit_code varchar(255), -- 주 판매 단위(코드) + sub_yield varchar(10), -- 부 수확량 + sub_yield_unit_code varchar(255), -- 부 수확량 단위(코드) + sub_sale_amount varchar(10), -- 부 판매량 + sub_sale_unit_code varchar(255), -- 부 판매 단위(코드) + monthly_input_status_id int8, -- 월별 입력 상태 ID (FK) + main_yield_unit varchar(255), -- 주 수확량 단위(직접입력) + main_sale_unit varchar(255), -- 주 판매 단위(직접입력) + sub_yield_unit varchar(255), -- 부 수확량 단위(직접입력) + sub_sale_unit varchar(255), -- 부 판매 단위(직접입력) + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 - sub_yield NUMERIC(10, 2), -- 수확량 - sub_yield_unit_code varchar(255), -- 수확 단위 (매핑코드) - sub_sale_amount NUMERIC(10, 2), -- 판매량 - sub_sale_unit_code varchar(255), -- 판매 단위 (매핑코드) - - - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT forest_product_pkey PRIMARY KEY (id), - CONSTRAINT fk_forest_product__household FOREIGN KEY (household_seq) REFERENCES household(seq) + CONSTRAINT forest_product_pkey PRIMARY KEY (id), + CONSTRAINT fk_forest_product__household FOREIGN KEY (household_seq) REFERENCES household(seq), + CONSTRAINT fk_forest_product_monthly_input_status FOREIGN KEY (monthly_input_status_id) REFERENCES monthly_input_status(id) ); -COMMENT ON TABLE forest_product IS '임산물 현황'; +COMMENT ON TABLE forest_product IS '임업 생산물 정보'; -COMMENT ON COLUMN forest_product.id IS '현황 ID'; -COMMENT ON COLUMN forest_product.household_seq IS '임가정보 일련번호'; +COMMENT ON COLUMN forest_product.id IS '임업 생산물 ID'; +COMMENT ON COLUMN forest_product.household_seq IS '임가 일련번호'; COMMENT ON COLUMN forest_product.street_num IS '지번'; -COMMENT ON COLUMN forest_product.land_type IS '지목'; -COMMENT ON COLUMN forest_product.town IS '읍면동'; -COMMENT ON COLUMN forest_product.available_area IS '가능면적'; -COMMENT ON COLUMN forest_product.crop_name IS '재배작물명'; -COMMENT ON COLUMN forest_product.crop_code IS '작물부호 (매핑코드)'; -COMMENT ON COLUMN forest_product.land_area IS '면적'; -COMMENT ON COLUMN forest_product.month IS '조사시행 월 (yyyy-mm)'; - -COMMENT ON COLUMN forest_product.main_yield IS '주 생산물 수확량'; -COMMENT ON COLUMN forest_product.main_yield_unit_code IS '주 생산물 수확 단위 (매핑코드)'; -COMMENT ON COLUMN forest_product.main_sale_amount IS '주 생산물 판매량'; -COMMENT ON COLUMN forest_product.main_sale_unit_code IS '주 생산물 판매 단위 (매핑코드)'; - -COMMENT ON COLUMN forest_product.sub_yield IS '주 생산물 수확량'; -COMMENT ON COLUMN forest_product.sub_yield_unit_code IS '주 생산물 수확 단위 (매핑코드)'; -COMMENT ON COLUMN forest_product.sub_sale_amount IS '주 생산물 판매량'; -COMMENT ON COLUMN forest_product.sub_sale_unit_code IS '주 생산물 판매 단위 (매핑코드)'; - +COMMENT ON COLUMN forest_product.land_type IS '토지 유형'; +COMMENT ON COLUMN forest_product.town IS '마을'; +COMMENT ON COLUMN forest_product.available_area IS '가용 면적'; +COMMENT ON COLUMN forest_product.crop_name IS '작물명'; +COMMENT ON COLUMN forest_product.crop_code IS '작물 코드'; +COMMENT ON COLUMN forest_product.land_area IS '토지 면적'; +COMMENT ON COLUMN forest_product.month IS '조사 월 (yyyy-mm)'; COMMENT ON COLUMN forest_product.created_at IS '생성일'; COMMENT ON COLUMN forest_product.created_by IS '생성자'; COMMENT ON COLUMN forest_product.updated_at IS '수정일'; @@ -1264,6 +1256,19 @@ COMMENT ON COLUMN forest_product.updated_by IS '수정자'; COMMENT ON COLUMN forest_product.deleted_at IS '삭제일'; COMMENT ON COLUMN forest_product.deleted_by IS '삭제자'; COMMENT ON COLUMN forest_product.is_deleted IS '삭제여부'; +COMMENT ON COLUMN forest_product.main_yield IS '주 수확량'; +COMMENT ON COLUMN forest_product.main_yield_unit_code IS '주 수확량 단위(코드)'; +COMMENT ON COLUMN forest_product.main_sale_amount IS '주 판매량'; +COMMENT ON COLUMN forest_product.main_sale_unit_code IS '주 판매 단위(코드)'; +COMMENT ON COLUMN forest_product.sub_yield IS '부 수확량'; +COMMENT ON COLUMN forest_product.sub_yield_unit_code IS '부 수확량 단위(코드)'; +COMMENT ON COLUMN forest_product.sub_sale_amount IS '부 판매량'; +COMMENT ON COLUMN forest_product.sub_sale_unit_code IS '부 판매 단위(코드)'; +COMMENT ON COLUMN forest_product.monthly_input_status_id IS '월별 입력 상태 ID'; +COMMENT ON COLUMN forest_product.main_yield_unit IS '주 수확량 단위(직접입력)'; +COMMENT ON COLUMN forest_product.main_sale_unit IS '주 판매 단위(직접입력)'; +COMMENT ON COLUMN forest_product.sub_yield_unit IS '부 수확량 단위(직접입력)'; +COMMENT ON COLUMN forest_product.sub_sale_unit IS '부 판매 단위(직접입력)'; -- ============================================ @@ -1318,44 +1323,49 @@ COMMENT ON COLUMN forest_product_yield.is_deleted IS '삭제여부'; CREATE SEQUENCE bank_auto_transfer_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE bank_auto_transfer ( - id bigint DEFAULT nextval('bank_auto_transfer_seq') NOT NULL, -- 자동이체 ID - household_seq bigint NOT NULL, -- 임가정보 일련번호 (FK) - transfer_type varchar(7) NOT NULL, -- 수입/지출 유형 (enum : INCOME / EXPENSE) - income_code varchar(255), -- 수입 코드 (매핑코드) - expense_code varchar(255), -- 지출 코드 (매핑코드) - crop_code integer, -- 재배형태 코드 (매핑코드) - transfer_category varchar(30), -- 수입/지출 종류 - source_purpose varchar(10), -- 수입원(용도) - count integer, -- 수량 - unit_code varchar(255), -- 단위 (매핑코드) - price integer, -- 현금(원) - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 + id int8 DEFAULT nextval('bank_auto_transfer_seq'::regclass) NOT NULL, -- 자동 이체 ID + household_seq int8 NOT NULL, -- 임가 일련번호 (FK) + transfer_type varchar(255) NOT NULL, -- 수입/지출 유형 (enum : INCOME / EXPENSE) + income_code varchar(255), -- 수입 코드 (매핑코드) + expense_code varchar(255), -- 지출 코드 (매핑코드) + crop_code varchar(255), -- 재배형태 코드 (매핑코드) + transfer_category varchar(30), -- 수입/지출 종류 + source_purpose varchar(10), -- 수입원(용도) + count varchar(10), -- 수량 + unit_code varchar(255), -- 단위 (매핑코드) + price int8, -- 현금(원) + "month" varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) + monthly_input_status_id int8, -- 월별 입력 상태 ID (FK) + transfer_category_code varchar(255), -- 이체 카테고리 코드 + unit varchar(255), -- 단위(직접입력) + category varchar(10), -- 카테고리 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 - CONSTRAINT bank_auto_transfer_pkey PRIMARY KEY (id), - CONSTRAINT fk_bank_auto_transfer__household FOREIGN KEY (household_seq) REFERENCES household(seq) + CONSTRAINT bank_auto_transfer_pkey PRIMARY KEY (id), + CONSTRAINT fk_bank_auto_transfer__household FOREIGN KEY (household_seq) REFERENCES household(seq), + CONSTRAINT fk_bank_auto_transfer_monthly_input_status FOREIGN KEY (monthly_input_status_id) REFERENCES monthly_input_status(id) ); -COMMENT ON TABLE bank_auto_transfer IS '은행 자동이체 항목'; +COMMENT ON TABLE bank_auto_transfer IS '은행 자동 이체 내역'; -COMMENT ON COLUMN bank_auto_transfer.id IS '자동이체 ID'; -COMMENT ON COLUMN bank_auto_transfer.household_seq IS '임가정보 일련번호'; -COMMENT ON COLUMN bank_auto_transfer.transfer_type IS '수입/지출 유형 (enum)'; -COMMENT ON COLUMN bank_auto_transfer.income_code IS '수입 코드 (매핑코드)'; -COMMENT ON COLUMN bank_auto_transfer.expense_code IS '지출 코드 (매핑코드)'; -COMMENT ON COLUMN bank_auto_transfer.crop_code IS '재배형태 코드 (매핑코드)'; -COMMENT ON COLUMN bank_auto_transfer.transfer_category IS '수입/지출 종류'; -COMMENT ON COLUMN bank_auto_transfer.source_purpose IS '수입원(용도)'; +COMMENT ON COLUMN bank_auto_transfer.id IS '자동 이체 ID'; +COMMENT ON COLUMN bank_auto_transfer.household_seq IS '임가 일련번호'; +COMMENT ON COLUMN bank_auto_transfer.transfer_type IS '이체 유형'; +COMMENT ON COLUMN bank_auto_transfer.income_code IS '수입 코드'; +COMMENT ON COLUMN bank_auto_transfer.expense_code IS '지출 코드'; +COMMENT ON COLUMN bank_auto_transfer.crop_code IS '작물 코드'; +COMMENT ON COLUMN bank_auto_transfer.transfer_category IS '이체 카테고리'; +COMMENT ON COLUMN bank_auto_transfer.source_purpose IS '원천/용도'; COMMENT ON COLUMN bank_auto_transfer.count IS '수량'; -COMMENT ON COLUMN bank_auto_transfer.unit_code IS '단위 (매핑코드)'; -COMMENT ON COLUMN bank_auto_transfer.price IS '현금(원)'; -COMMENT ON COLUMN bank_auto_transfer.month IS '조사시행 월 (yyyy-mm)'; +COMMENT ON COLUMN bank_auto_transfer.unit_code IS '단위(코드)'; +COMMENT ON COLUMN bank_auto_transfer.price IS '금액'; +COMMENT ON COLUMN bank_auto_transfer.month IS '조사 월 (yyyy-mm)'; COMMENT ON COLUMN bank_auto_transfer.created_at IS '생성일'; COMMENT ON COLUMN bank_auto_transfer.created_by IS '생성자'; COMMENT ON COLUMN bank_auto_transfer.updated_at IS '수정일'; @@ -1363,7 +1373,10 @@ COMMENT ON COLUMN bank_auto_transfer.updated_by IS '수정자'; COMMENT ON COLUMN bank_auto_transfer.deleted_at IS '삭제일'; COMMENT ON COLUMN bank_auto_transfer.deleted_by IS '삭제자'; COMMENT ON COLUMN bank_auto_transfer.is_deleted IS '삭제여부'; - +COMMENT ON COLUMN bank_auto_transfer.monthly_input_status_id IS '월별 입력 상태 ID'; +COMMENT ON COLUMN bank_auto_transfer.transfer_category_code IS '이체 카테고리 코드'; +COMMENT ON COLUMN bank_auto_transfer.unit IS '단위(직접입력)'; +COMMENT ON COLUMN bank_auto_transfer.category IS '카테고리'; -- 6. monthly_carryover -- ============================================ diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql index 332b77e5..49418152 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -22,23 +22,25 @@ DROP SEQUENCE IF EXISTS daily_record_seq; */ + + -- ============================================ -- TABLE : daily_day_group -- DESC : 일계부 작성일자 그룹 테이블 -- ============================================ CREATE TABLE daily_day_group ( - group_no smallint NOT NULL, -- 그룹번호 - start_day smallint, -- 시작일자 - end_day smallint, -- 종료일자 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 + group_no smallint NOT NULL, -- 그룹번호 + start_day smallint, -- 시작일자 + end_day smallint, -- 종료일자 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted boolean DEFAULT false, -- 삭제여부 - CONSTRAINT daily_day_group_pkey PRIMARY KEY (group_no) + CONSTRAINT daily_day_group_pkey PRIMARY KEY (group_no) ); COMMENT ON TABLE daily_day_group IS '일계부 작성일자 그룹 테이블'; @@ -56,56 +58,58 @@ COMMENT ON COLUMN daily_day_group.is_deleted IS '삭제여부'; INSERT INTO daily_day_group (group_no, start_day, end_day, created_at, created_by, is_deleted) VALUES - (1, 1, 2, now(), '_system', false) - ,(2, 3, 4, now(), '_system', false) - ,(3, 5, 6, now(), '_system', false) - ,(4, 7, 7, now(), '_system', false) - ,(5, 8, 9, now(), '_system', false) - ,(6, 10, 11, now(), '_system', false) - ,(7, 12, 13, now(), '_system', false) - ,(8, 14, 14, now(), '_system', false) - ,(9, 15, 16, now(), '_system', false) - ,(10, 17, 18, now(), '_system', false) - ,(11, 19, 20, now(), '_system', false) - ,(12, 21, 21, now(), '_system', false) - ,(13, 22, 23, now(), '_system', false) - ,(14, 24, 25, now(), '_system', false) - ,(15, 26, 27, now(), '_system', false) - ,(16, 28, 29, now(), '_system', false) - ,(17, 30, 31, now(), '_system', false) +(1, 1, 2, now(), '_system', false) + ,(2, 3, 4, now(), '_system', false) + ,(3, 5, 6, now(), '_system', false) + ,(4, 7, 7, now(), '_system', false) + ,(5, 8, 9, now(), '_system', false) + ,(6, 10, 11, now(), '_system', false) + ,(7, 12, 13, now(), '_system', false) + ,(8, 14, 14, now(), '_system', false) + ,(9, 15, 16, now(), '_system', false) + ,(10, 17, 18, now(), '_system', false) + ,(11, 19, 20, now(), '_system', false) + ,(12, 21, 21, now(), '_system', false) + ,(13, 22, 23, now(), '_system', false) + ,(14, 24, 25, now(), '_system', false) + ,(15, 26, 27, now(), '_system', false) + ,(16, 28, 29, now(), '_system', false) + ,(17, 30, 31, now(), '_system', false) ; + + -- ============================================ -- TABLE : daily_record -- DESC : 일계부 일별 작성상태 -- ============================================ -CREATE SEQUENCE daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; +CREATE SEQUENCE IF NOT EXISTS daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_record ( - id bigint DEFAULT nextval('daily_record_seq') NOT NULL, -- 일계부 작성상태 ID - household_seq bigint NOT NULL, -- 임가 일련번호 (FK) - record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) - day_group_no smallint, -- 일계부 작성일자 그룹 번호 - start_date date, -- 작성시작일(yyyy-mm-dd) - end_date date, -- 작성종료일(yyyy-mm-dd) - all_status varchar(15), -- 전체 입력상태 - income_status varchar(15), -- 수입 입력상태 - work_status varchar(15), -- 임업노동 투입내역 입력상태 - expense_status varchar(15), -- 지출 입력상태 - power_status varchar(15), -- 동력사용시간 입력상태 - forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태 - farming_status varchar(15), -- 자가농업 생산물 중 자가소비량 입력상태 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT daily_record_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_record__household FOREIGN KEY (household_seq) REFERENCES household(seq) + id int8 DEFAULT nextval('daily_record_seq'::regclass) NOT NULL, -- 일계부 작성상태 ID + household_seq int8 NOT NULL, -- 임가 일련번호 (FK) + record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) + day_group_no int2, -- 일계부 작성일자 그룹 번호 + start_date date, -- 작성시작일(yyyy-mm-dd) + end_date date, -- 작성종료일(yyyy-mm-dd) + all_status varchar(15), -- 전체 입력상태 + income_status varchar(15), -- 수입 입력상태 + work_status varchar(15), -- 임업노동 투입내역 입력상태 + expense_status varchar(15), -- 지출 입력상태 + power_status varchar(15), -- 동력사용시간 입력상태 + forestry_status varchar(15), -- 자가임업 생산물 중 자가소비량 입력상태 + farming_status varchar(15), -- 자가농업 생산물 중 자가소비량 입력상태 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 + + CONSTRAINT daily_record_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_record__household FOREIGN KEY (household_seq) REFERENCES household(seq) ); COMMENT ON TABLE daily_record IS '일계부 일별 작성상태'; @@ -113,9 +117,9 @@ COMMENT ON TABLE daily_record IS '일계부 일별 작성상태'; COMMENT ON COLUMN daily_record.id IS '일계부 작성상태 ID'; COMMENT ON COLUMN daily_record.household_seq IS '임가 일련번호'; COMMENT ON COLUMN daily_record.record_month IS '조사시행 월 (yyyy-mm)'; +COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호'; COMMENT ON COLUMN daily_record.start_date IS '작성시작일(yyyy-mm-dd)'; COMMENT ON COLUMN daily_record.end_date IS '작성종료일(yyyy-mm-dd)'; -COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호'; COMMENT ON COLUMN daily_record.all_status IS '전체 입력상태'; COMMENT ON COLUMN daily_record.income_status IS '수입 입력상태'; COMMENT ON COLUMN daily_record.work_status IS '임업노동 투입내역 입력상태'; @@ -131,7 +135,6 @@ COMMENT ON COLUMN daily_record.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_record.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_record.is_deleted IS '삭제여부'; - -- ============================================ -- TABLE : daily_income -- DESC : 수입내역 - 일계부 @@ -139,32 +142,32 @@ COMMENT ON COLUMN daily_record.is_deleted IS '삭제여부'; CREATE SEQUENCE daily_income_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_income ( - id bigint DEFAULT nextval('daily_income_seq') NOT NULL, -- 일계부 수입 ID - daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - input_type varchar(5), -- 입력 구분(SELF, OCR) - category varchar(10), -- 유형 - income_mark varchar(10), -- 수입 부호 - expense_mark varchar(10), -- 지출 부호 - is_credit boolean, -- 외상판매 여부 - crop_code varchar(255), -- 재배형태(매핑코드) - income_kind varchar(100), -- 수입의 종류 - income_kind_mark varchar(10), -- 종류 부호 - source_purpose varchar(100), -- 수입원(용도) - quantity varchar(10), -- 수량 - unit_code varchar(255), -- 단위(매핑코드) - unit_self varchar(100), -- 단위(직접입력) - price bigint, -- 현금(원) - estimated_value bigint, -- 현물(평가액) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 - - CONSTRAINT daily_income_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) + id int8 DEFAULT nextval('daily_income_seq'::regclass) NOT NULL, -- 일계부 수입 ID + daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK) + input_type varchar(5), -- 입력 구분(SELF, OCR) + category varchar(10), -- 유형 + income_mark varchar(10), -- 수입 부호 + expense_mark varchar(10), -- 지출 부호 + is_credit bool, -- 외상판매 여부 + crop_code varchar(255), -- 재배형태(매핑코드) + income_kind varchar(100), -- 수입의 종류 + income_kind_mark varchar(10), -- 종류 부호 + source_purpose varchar(100), -- 수입원(용도) + quantity varchar(10), -- 수량 + unit_code varchar(255), -- 단위(매핑코드) + unit_self varchar(100), -- 단위(직접입력) + price int8, -- 현금(원) + estimated_value int8, -- 현물(평가액) + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 + + CONSTRAINT daily_income_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_income__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) ); COMMENT ON TABLE daily_income IS '수입내역 - 일계부'; @@ -193,7 +196,6 @@ COMMENT ON COLUMN daily_income.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_income.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_income.is_deleted IS '삭제여부'; - -- ============================================ -- TABLE : daily_expense -- DESC : 지출내역 - 일계부 @@ -201,31 +203,31 @@ COMMENT ON COLUMN daily_income.is_deleted IS '삭제여부'; CREATE SEQUENCE daily_expense_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_expense ( - id bigint DEFAULT nextval('daily_expense_seq') NOT NULL, -- 일계부 지출 ID - daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - input_type varchar(5), -- 입력 구분(SELF, OCR) - category varchar(10), -- 유형 - income_mark varchar(10), -- 수입부호 - expense_mark varchar(10), -- 지출부호 - is_credit boolean, -- 외상판매 여부 - expense_kind varchar(100), -- 지출의 종류 - expense_kind_mark varchar(10), -- 종류 부호 - source_purpose varchar(10), -- 지출원(용도) - quantity varchar(10), -- 수량 - unit_code varchar(255), -- 단위(매핑코드) - unit_self varchar(100), -- 단위(직접입력) - price bigint, -- 현금(원) - estimated_value bigint, -- 현물(평가액) - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 + id int8 DEFAULT nextval('daily_expense_seq'::regclass) NOT NULL, -- 일계부 지출 ID + daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK) + input_type varchar(5), -- 입력 구분(SELF, OCR) + category varchar(10), -- 유형 + income_mark varchar(10), -- 수입부호 + expense_mark varchar(10), -- 지출부호 + is_credit bool, -- 외상판매 여부 + expense_kind varchar(100), -- 지출의 종류 + expense_kind_mark varchar(10), -- 종류 부호 + source_purpose varchar(10), -- 지출원(용도) + quantity varchar(10), -- 수량 + unit_code varchar(255), -- 단위(매핑코드) + unit_self varchar(100), -- 단위(직접입력) + price int8, -- 현금(원) + estimated_value int8, -- 현물(평가액) + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 - CONSTRAINT daily_expense_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) + CONSTRAINT daily_expense_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_expense__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) ); COMMENT ON TABLE daily_expense IS '지출내역 - 일계부'; @@ -253,7 +255,6 @@ COMMENT ON COLUMN daily_expense.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_expense.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_expense.is_deleted IS '삭제여부'; - -- ============================================ -- TABLE : daily_work -- DESC : 임업노동 투입내역 - 일계부 @@ -261,38 +262,38 @@ COMMENT ON COLUMN daily_expense.is_deleted IS '삭제여부'; CREATE SEQUENCE daily_work_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_work ( - id bigint DEFAULT nextval('daily_work_seq') NOT NULL, - daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - item_name varchar(100), - item_mark varchar(10), - work_name varchar(100), - work_mark varchar(10), - work_land_area varchar(10), - area_unit_code varchar(255), - area_unit_self varchar(100), - harvest_quantity varchar(10), - harvest_unit_code varchar(255), - harvest_unit_self varchar(100), - owner_time varchar(10), -- 경영주 노동시간 - spouse_time varchar(10), -- 배우자 노동시간 - family_m_hours varchar(10), -- 가족 남 노동시간 - family_f_hours varchar(10), -- 가족 여 노동시간 - hired_m_hours varchar(10), -- 고용 남 - hired_f_hours varchar(10), -- 고용 여 - shared_m_hours varchar(10), -- 품앗이 남 - shared_f_hours varchar(10), -- 품앗이 여 - volunteer_m_hours varchar(10), -- 일손돕기 남 - volunteer_f_hours varchar(10), -- 일손돕기 여 - created_at timestamp(6), - created_by varchar(255), - updated_at timestamp(6), - updated_by varchar(255), - deleted_at timestamp(6), - deleted_by varchar(255), - is_deleted boolean NOT NULL DEFAULT false, + id int8 DEFAULT nextval('daily_work_seq'::regclass) NOT NULL, -- 투입내역 내부키 + daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK) + item_name varchar(100), -- 품목명 + item_mark varchar(10), -- 품목 부호 + work_name varchar(100), -- 작업명 + work_mark varchar(10), -- 작업 부호 + work_land_area varchar(10), -- 작업 면적 + area_unit_code varchar(255), -- 작업 면적 단위(코드매핑) + area_unit_self varchar(100), -- 작업 면적 단위(직접입력) + harvest_quantity varchar(10), -- 수확량 + harvest_unit_code varchar(255), -- 수확량 단위(코드매핑) + harvest_unit_self varchar(100), -- 수확량 단위(직접입력) + owner_time varchar(10), -- 경영주 노동시간 + spouse_time varchar(10), -- 배우자 노동시간 + family_m_hours varchar(10), -- 가족 남 노동시간 + family_f_hours varchar(10), -- 가족 여 노동시간 + hired_m_hours varchar(10), -- 고용 남 + hired_f_hours varchar(10), -- 고용 여 + shared_m_hours varchar(10), -- 품앗이 남 + shared_f_hours varchar(10), -- 품앗이 여 + volunteer_m_hours varchar(10), -- 일손돕기 남 + volunteer_f_hours varchar(10), -- 일손돕기 여 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 - CONSTRAINT daily_work_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_work__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) + CONSTRAINT daily_work_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_work__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) ); COMMENT ON TABLE daily_work IS '임업노동 투입내역 - 일계부'; @@ -327,7 +328,6 @@ COMMENT ON COLUMN daily_work.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_work.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_work.is_deleted IS '삭제여부'; - -- ============================================ -- TABLE : daily_power -- DESC : 동력 사용시간 - 일계부 @@ -335,19 +335,19 @@ COMMENT ON COLUMN daily_work.is_deleted IS '삭제여부'; CREATE SEQUENCE daily_power_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_power ( - id bigint DEFAULT nextval('daily_power_seq') NOT NULL, -- 동력사용시간 ID - daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - equipment_name varchar(100), -- 명칭 - equipment_mark varchar(10), -- 명칭 부호 - owned_hours varchar(10), -- 자가 시간 - leased_hours varchar(10), -- 임차 시간 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false, -- 삭제여부 + id int8 DEFAULT nextval('daily_power_seq'::regclass) NOT NULL, -- 동력사용시간 ID + daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK) + equipment_name varchar(100), -- 명칭 + equipment_mark varchar(10), -- 명칭 부호 + owned_hours varchar(10), -- 자가 시간 + leased_hours varchar(10), -- 임차 시간 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 CONSTRAINT daily_power_pkey PRIMARY KEY (id), CONSTRAINT fk_daily_power__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) @@ -369,7 +369,6 @@ COMMENT ON COLUMN daily_power.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_power.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_power.is_deleted IS '삭제여부'; - -- ============================================ -- TABLE : daily_forestry -- DESC : 자가임업 생산물 중 자가소비량 @@ -377,31 +376,31 @@ COMMENT ON COLUMN daily_power.is_deleted IS '삭제여부'; CREATE SEQUENCE daily_forestry_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_forestry ( - id bigint DEFAULT nextval('daily_forestry_seq') NOT NULL, -- 임업 자가소비량 일련번호 - daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - income_mark varchar(10), -- 수입부호 - expense_mark varchar(10), -- 지출부호 - product_name varchar(100), -- 생산물 - usage varchar(100), -- 용도 - quantity varchar(10), -- 수량 - unit_code varchar(255), -- 단위(매핑코드) - unit_self varchar(100), -- 단위(직접입력) - estimated_value bigint, -- 현물평가 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부 + id int8 DEFAULT nextval('daily_forestry_seq'::regclass) NOT NULL, -- 임업 자가소비량 일련번호 + daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK) + income_mark varchar(10), -- 수입 부호 + expense_mark varchar(10), -- 지출 부호 + product_name varchar(100), -- 생산물 + "usage" varchar(100), -- 용도 + quantity varchar(10), -- 수량 + unit_code varchar(255), -- 단위(매핑코드) + unit_self varchar(100), -- 단위(직접입력) + estimated_value int8, -- 현물평가 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 - CONSTRAINT daily_forestry_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_forestry__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) + CONSTRAINT daily_forestry_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_forestry__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) ); COMMENT ON TABLE daily_forestry IS '자가임업 생산물 중 자가소비량'; -COMMENT ON COLUMN daily_forestry.id IS '임가 일련번호'; +COMMENT ON COLUMN daily_forestry.id IS '임업 자가소비량 일련번호'; COMMENT ON COLUMN daily_forestry.daily_record_seq IS '일계부 작성상태 일련번호'; COMMENT ON COLUMN daily_forestry.income_mark IS '수입 부호'; COMMENT ON COLUMN daily_forestry.expense_mark IS '지출 부호'; @@ -419,7 +418,6 @@ COMMENT ON COLUMN daily_forestry.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_forestry.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_forestry.is_deleted IS '삭제여부'; - -- ============================================ -- TABLE : daily_farming -- DESC : 자가농업 생산물 중 자가소비량 @@ -427,35 +425,36 @@ COMMENT ON COLUMN daily_forestry.is_deleted IS '삭제여부'; CREATE SEQUENCE daily_farming_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_farming ( - id bigint DEFAULT nextval('daily_farming_seq') NOT NULL, -- 농업 자가소비량 내부키 - daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) - income_mark varchar(10), -- 수입 부호 - expense_mark varchar(10), -- 지출 부호 - product_code varchar(255), -- 생산물(매핑코드) - product_self varchar(100), -- 생산물(직접입력) - usage varchar(100), -- 용도 - quantity varchar(10), -- 수량 - unit_code varchar(255), -- 단위(매핑코드) - unit_self varchar(100), -- 단위(직접입력) - estimated_value bigint, -- 현물평가액 - created_at timestamp(6), -- 생성일 - created_by varchar(255), -- 생성자 - updated_at timestamp(6), -- 수정일 - updated_by varchar(255), -- 수정자 - deleted_at timestamp(6), -- 삭제일 - deleted_by varchar(255), -- 삭제자 - is_deleted boolean DEFAULT false NOT NULL, -- 삭제여부 + id int8 DEFAULT nextval('daily_farming_seq'::regclass) NOT NULL, -- 농업 자가소비량 내부키 + daily_record_seq int8 NOT NULL, -- 일계부 작성상태 일련번호 (FK) + income_mark varchar(10), -- 수입 부호 + expense_mark varchar(10), -- 지출 부호 + product_code varchar(255), -- 생산물(매핑코드) + product_self varchar(100), -- 생산물(직접입력) + "usage" varchar(100), -- 용도 + quantity varchar(10), -- 수량 + unit_code varchar(255), -- 단위(매핑코드) + unit_self varchar(100), -- 단위(직접입력) + estimated_value int8, -- 현물평가액 + created_at timestamp(6), -- 생성일 + created_by varchar(255), -- 생성자 + updated_at timestamp(6), -- 수정일 + updated_by varchar(255), -- 수정자 + deleted_at timestamp(6), -- 삭제일 + deleted_by varchar(255), -- 삭제자 + is_deleted bool DEFAULT false, -- 삭제여부 - CONSTRAINT daily_farming_pkey PRIMARY KEY (id), - CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) + CONSTRAINT daily_farming_pkey PRIMARY KEY (id), + CONSTRAINT fk_daily_farming__daily_record FOREIGN KEY (daily_record_seq) REFERENCES daily_record(id) ); COMMENT ON TABLE daily_farming IS '자가농업 생산물 중 자가소비량'; COMMENT ON COLUMN daily_farming.id IS '농업 자가소비량 내부키'; +COMMENT ON COLUMN daily_farming.daily_record_seq IS '일계부 작성상태 일련번호'; COMMENT ON COLUMN daily_farming.income_mark IS '수입부호'; COMMENT ON COLUMN daily_farming.expense_mark IS '지출부호'; -COMMENT ON COLUMN daily_farming.product_code IS '생산물(매핌코드)'; +COMMENT ON COLUMN daily_farming.product_code IS '생산물(매핑코드)'; COMMENT ON COLUMN daily_farming.product_self IS '생산물(직접입력)'; COMMENT ON COLUMN daily_farming.usage IS '용도'; COMMENT ON COLUMN daily_farming.quantity IS '수량'; @@ -470,6 +469,3 @@ COMMENT ON COLUMN daily_farming.deleted_at IS '삭제일'; COMMENT ON COLUMN daily_farming.deleted_by IS '삭제자'; COMMENT ON COLUMN daily_farming.is_deleted IS '삭제여부'; --- ============================================ --- 임가 일계부 입력 관련 테이블 E --- ============================================ diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index 5d0d586c..b7f5b357 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -1,19 +1,18 @@ package app.module.front.usecase.daily.calendar.adapters.persistence; +import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.enums.DailyTargetStatus; import app.module.core.config.application.enums.MonthStatus; -import app.module.front.config.application.util.DailyUtil; +import app.module.core.config.application.util.DailyUtil; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; -import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper; -import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.usecase.daily.calendar.adapters.persistence.model.MonthlyStatusDto; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; -import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren; +import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -43,14 +42,14 @@ public class RecordCalendarDao implements RecordCalendarPortOut { monthlyList.add(new CalendarChildren( "MONTHLY", "임산물 현황 등록", - null, // TODO + null, monthlyStatus.isForestNone() ? 0 : 1, monthlyStatus.isForestNone() ? "/info/monthly" : String.format("/info/monthly/month/%s", command.getSearchMonth()))); monthlyList.add(new CalendarChildren( "BANK", "은행 자동이체 내역 등록", - null, // TODO + null, monthlyStatus.isBankNone() ? 0 : 1, (LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth())) ? "/info/bank" : null)); @@ -60,9 +59,9 @@ public class RecordCalendarDao implements RecordCalendarPortOut { refine.setNo(calendar.getGroupNo()); refine.setStart(calendar.getStartDay()); refine.setEnd(calendar.getEndDay()); + refine.setStartDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay())); refine.setEndDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay())); - refine.setRegistrable(dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())); refine.setModifiable(dailyUtil.isModifiable(refine.getStartDate(), refine.getEndDate())); @@ -72,64 +71,59 @@ public class RecordCalendarDao implements RecordCalendarPortOut { List childList = new ArrayList<>(); if (findStatus == null) { + // 등록이 가능하지 않을 경우 미작성 데이터 반환 if (!dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())) { - childList.addAll(this.getNoneChildList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate()))); + childList.addAll(this.getNoneChildrenList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate()))); } } else { - if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus()) - || DailyTargetStatus.TODAY_NONE.equals(findStatus.getIncomeStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getIncomeStatus())) { childList.add(new CalendarChildren( DailySort.INCOME.name(), DailySort.INCOME.getDesc(), findStatus.getIncomeStatus(), findStatus.getIncomeCount(), - String.format(pathFormat, "income", command.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, DailySort.INCOME.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo()))); } - if (DailyTargetStatus.TARGET.equals(findStatus.getWorkStatus()) - || DailyTargetStatus.TODAY_NONE.equals(findStatus.getWorkStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getWorkStatus())) { childList.add(new CalendarChildren( DailySort.WORK.name(), DailySort.WORK.getDesc(), findStatus.getWorkStatus(), findStatus.getWorkCount(), - String.format(pathFormat, "work", command.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, DailySort.WORK.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo()))); } - if (DailyTargetStatus.TARGET.equals(findStatus.getExpenseStatus()) - || DailyTargetStatus.TODAY_NONE.equals(findStatus.getExpenseStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getExpenseStatus())) { childList.add(new CalendarChildren( DailySort.EXPENSE.name(), DailySort.EXPENSE.getDesc(), findStatus.getExpenseStatus(), findStatus.getExpenseCount(), - String.format(pathFormat, "expense", command.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, DailySort.EXPENSE.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo()))); } - if (DailyTargetStatus.TARGET.equals(findStatus.getPowerStatus()) - || DailyTargetStatus.TODAY_NONE.equals(findStatus.getPowerStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getPowerStatus())) { childList.add(new CalendarChildren( DailySort.POWER.name(), DailySort.POWER.getDesc(), findStatus.getPowerStatus(), findStatus.getPowerCount(), - String.format(pathFormat, "power", command.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, DailySort.POWER.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo()))); } - if (DailyTargetStatus.TARGET.equals(findStatus.getForestryStatus()) - || DailyTargetStatus.TODAY_NONE.equals(findStatus.getForestryStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getForestryStatus())) { childList.add(new CalendarChildren( DailySort.FORESTRY.name(), DailySort.FORESTRY.getDesc(), findStatus.getForestryStatus(), findStatus.getForestryCount(), - String.format(pathFormat, "forestry", command.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, DailySort.FORESTRY.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo()))); } - if (DailyTargetStatus.TARGET.equals(findStatus.getFarmingStatus()) - || DailyTargetStatus.TODAY_NONE.equals(findStatus.getFarmingStatus())) { + if (!DailyTargetStatus.NONE.equals(findStatus.getFarmingStatus())) { childList.add(new CalendarChildren( DailySort.FARMING.name(), DailySort.FARMING.getDesc(), findStatus.getFarmingStatus(), findStatus.getFarmingCount(), - String.format(pathFormat, "farming", command.getSearchMonth(), findStatus.getDayGroupNo()))); + String.format(pathFormat, DailySort.FARMING.name().toLowerCase(), command.getSearchMonth(), findStatus.getDayGroupNo()))); } } @@ -141,55 +135,23 @@ public class RecordCalendarDao implements RecordCalendarPortOut { return refineList; } - /** - * 미작성 목록 조회 - * - * @param farmingOpen - * @return 미작성 목록 - */ - private List getNoneChildList(boolean farmingOpen) { - List childList = new ArrayList<>(); - for (DailySort type : DailySort.values()) { - if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) { - childList.add(new CalendarChildren(type.name(),type.getDesc())); - } - } + @Override + public int getDataNoneCountBySomeDayAfter(Long householdSeq) { - return childList; + return recordCalendarMapper.getDataNoneCountBySomeDayAfter(householdSeq); } @Override - public boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command) { - int dataNoneCount = recordCalendarMapper.getDataNoneCountBySomeDayAfter(command); + public DailyRecordStatusDto getLatestDate(Long householdSeq) { - return dataNoneCount != 0; - } - - @Override - public String getLatestDate(RecordCalendarCmd command) { - String returnValue = null; - DailyRecordStatusDto detail = recordCalendarMapper.getLatestDate(command); - if (detail != null && detail.getStartDate() != null && detail.getEndDate() != null) { - if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { - // 종료일의 달이 변경되면 시작일=종료일 처리 - detail.setEndDate(detail.getStartDate()); - } - - if (detail.getStartDate().equals(detail.getEndDate())) { - returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d일")); - } else { - returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d")) + "~" + detail.getEndDate().format(DateTimeFormatter.ofPattern("d일")); - } - } - - return returnValue; + return recordCalendarMapper.getLatestDate(householdSeq); } /** * 특정월의 일 그룹 조회 * - * @param command - * @return + * @param command 검색 조건 + * @return 일 그룹 목록 */ private List getCalendarList(RecordCalendarCmd command) { List calendarList = recordCalendarMapper.getCalendarByDailyRecord(command); @@ -197,8 +159,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut { List refineList = new ArrayList<>(); for (DailyRecordCalendarDto calendar : calendarList) { LocalDate startDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay()); - LocalDate endDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay()); int lastDay = dailyUtil.getLastDay(startDate); + calendar.setStartDate(startDate.toString()); if ((lastDay == 28 || lastDay == 30) && calendar.getStartDay() == lastDay) { @@ -215,8 +177,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut { /** * 특정월의 일계부 등록 상태 조회 * - * @param command - * @return + * @param command 검색 조건 + * @return 일계부 목록 */ private List getDailyRecordStatus(RecordCalendarCmd command) { List statusList = dailyRecordMapper.getDailyRecordStatus(new GetDailyRecordCmd(command.getSearchMonth(), null, command.getHouseholdSeq())); @@ -238,4 +200,21 @@ public class RecordCalendarDao implements RecordCalendarPortOut { return detail == null ? new MonthlyStatusDto(MonthStatus.NONE, MonthStatus.NONE, MonthStatus.NONE) : detail; } + + /** + * 미작성 목록 조회 + * + * @param farmingOpen 자가농업 항목 오픈 여부 + * @return 미작성 목록 + */ + private List getNoneChildrenList(boolean farmingOpen) { + List childList = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) { + childList.add(new CalendarChildren(type.name(),type.getDesc())); + } + } + + return childList; + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java index 6565701f..c03d1f1e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java @@ -29,16 +29,16 @@ public interface RecordCalendarMapper { /** * 3일전 ~ 15일전 미등록된 데이터 개수 조회 * - * @param command 검색 조건 + * @param householdSeq 임가회원 일련번호 * @return 미등록 건 수 */ - Integer getDataNoneCountBySomeDayAfter(RecordCalendarCmd command); + Integer getDataNoneCountBySomeDayAfter(Long householdSeq); /** * 최신 등록일 데이터 조회 * - * @param command 검색 조건 + * @param householdSeq 임가회원 일련번호 * @return 최신 등록 데이터 */ - DailyRecordStatusDto getLatestDate(RecordCalendarCmd command); + DailyRecordStatusDto getLatestDate(Long householdSeq); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java index d3ce0f14..ebae3594 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java @@ -22,6 +22,11 @@ import java.util.List; public class RecordCalendarController { private final RecordCalendarPortIn recordCalendarPortIn; + /** + * 일계부 월별 목록 + * + * @param searchMonth 검색 월(yyyyMM) + */ @GetMapping(path = "/{searchMonth}") public ResponseEntity list(@PathVariable("searchMonth") String searchMonth) { RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchMonth); diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java index b33e7df4..1ea1440c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java @@ -16,6 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping; public class RecordCalendarUIController { private final RecordCalendarPortIn recordCalendarPortIn; + /** + * 일계부 월별 현황 화면 + * + * @param model Model + */ @GetMapping(path = "") public String index(Model model) { RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java index cd2df350..134ee23f 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java @@ -27,7 +27,7 @@ public class RecordCalendarUIReqVO extends DailyUIReqVO { } /** - * 검색 일(yyyy-MM-dd) + * 검색일(yyyy-MM-dd) */ private LocalDate searchDate; diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java index 762fe3c0..ae177f0c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java @@ -22,7 +22,7 @@ public interface RecordCalendarPortIn { boolean getDataNoneCountBySomeDayAfter(); /** - * 일계부 최신 데이터 조회 + * 일계부 최신 데이터 등록일 조회 * * @return 최신 등록 기간 */ diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java index d4af4217..fbfe177a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java @@ -2,13 +2,14 @@ package app.module.front.usecase.daily.calendar.ports; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import java.util.List; public interface RecordCalendarPortOut { List operate(RecordCalendarCmd command); - boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command); + int getDataNoneCountBySomeDayAfter(Long householdSeq); - String getLatestDate(RecordCalendarCmd command); + DailyRecordStatusDto getLatestDate(Long householdSeq); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java index 2cc7c6c2..8fa7112e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java @@ -1,14 +1,17 @@ package app.module.front.usecase.daily.calendar.ports.application; +import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.time.format.DateTimeFormatter; import java.util.List; @Service @@ -25,15 +28,28 @@ public class RecordCalendarService implements RecordCalendarPortIn { @Override public boolean getDataNoneCountBySomeDayAfter() { - RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); + int dataNoneCount = portOut.getDataNoneCountBySomeDayAfter(AuthUtil.getUserSeq()); - return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); + return dataNoneCount != 0; } @Override public String getLatestDate() { - RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); + String returnValue = null; + DailyRecordStatusDto detail = portOut.getLatestDate(AuthUtil.getUserSeq()); + if (detail != null && detail.getStartDate() != null && detail.getEndDate() != null) { + if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { + // 종료일의 달이 변경되면 시작일=종료일 처리 + detail.setEndDate(detail.getStartDate()); + } - return portOut.getLatestDate(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); + if (detail.getStartDate().equals(detail.getEndDate())) { + returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d일")); + } else { + returnValue = detail.getStartDate().format(DateTimeFormatter.ofPattern("yyyy년 M월 d")) + "~" + detail.getEndDate().format(DateTimeFormatter.ofPattern("d일")); + } + } + + return returnValue; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java index 1e6d2806..4d7cba59 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java @@ -1,7 +1,6 @@ package app.module.front.usecase.daily.calendar.ports.application.domain; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; -import lombok.AllArgsConstructor; +import app.module.core.config.application.enums.DailyTargetStatus; import lombok.Data; @Data diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java index cedce373..065a40af 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java @@ -6,7 +6,7 @@ import app.module.front.usecase.daily.expense.adapters.persistence.model.DailyEx import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java index 66fa7468..54d8f230 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java @@ -6,7 +6,7 @@ import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFa import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java index cb7c5090..10101976 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java @@ -6,7 +6,7 @@ import app.module.front.usecase.daily.forestry.adapters.persistence.model.DailyF import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java index 1ec144c5..9a3beccf 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java @@ -6,7 +6,7 @@ import app.module.front.usecase.daily.income.adapters.persistence.model.DailyInc import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java index 6a6dd934..ed02bb52 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java @@ -5,7 +5,7 @@ import app.module.front.usecase.daily.power.adapters.persistence.model.DailyPowe import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import lombok.RequiredArgsConstructor; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java index 7eaaeb0c..d5f00567 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -1,11 +1,11 @@ package app.module.front.usecase.daily.record.adapters.persistence; import app.module.front.config.application.util.AuditUtil; -import app.module.front.config.application.util.DailyUtil; +import app.module.core.config.application.util.DailyUtil; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.core.config.application.enums.DailyStatus; +import app.module.core.config.application.enums.DailyTargetStatus; import app.module.front.usecase.daily.record.ports.DailyRecordPortOut; import app.module.front.usecase.daily.record.ports.application.domain.CreateDailyRecordCmd; import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; @@ -14,11 +14,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Repository; -import java.text.SimpleDateFormat; -import java.time.LocalDate; -import java.util.Date; import java.util.List; -import java.util.Locale; @Slf4j @Repository diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java index eb74b6b6..cf592fe8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java @@ -1,8 +1,8 @@ package app.module.front.usecase.daily.record.adapters.persistence.model; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; -import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.enums.DailyStatus; +import app.module.core.config.application.enums.DailyTargetStatus; import lombok.Data; import lombok.extern.slf4j.Slf4j; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java index 615b9870..07b53374 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordStatusDto.java @@ -1,7 +1,7 @@ package app.module.front.usecase.daily.record.adapters.persistence.model; -import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.core.config.application.enums.DailyStatus; +import app.module.core.config.application.enums.DailyTargetStatus; import lombok.Data; import lombok.ToString; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index 0f4b9f4b..480075a0 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -2,7 +2,7 @@ package app.module.front.usecase.daily.record.adapters.web; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.core.config.application.enums.DailyTargetStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java index bf4b69d4..292f9359 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java @@ -7,15 +7,13 @@ import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIR import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; -import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; import app.module.front.usecase.daily.income.adapters.web.model.DailyIncomeUIReqVO; import app.module.front.usecase.daily.income.ports.DailyIncomePortIn; import app.module.front.usecase.daily.power.adapters.web.model.DailyPowerUIReqVO; import app.module.front.usecase.daily.power.ports.DailyPowerPortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; +import app.module.core.config.application.enums.DailyStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import app.module.front.usecase.daily.record.adapters.web.validator.CreateDailyRecordValidator; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.work.adapters.web.model.DailyWorkUIReqVO; import app.module.front.usecase.daily.work.ports.DailyWorkPortIn; @@ -27,8 +25,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; -import java.util.List; - @Slf4j @Controller @RequiredArgsConstructor diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java index 416e2795..c7425f68 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java @@ -1,5 +1,7 @@ package app.module.front.usecase.daily.record.adapters.web.model; +import app.module.core.config.application.enums.DailyStatus; +import app.module.core.config.application.enums.DailyTargetStatus; import lombok.Data; import lombok.ToString; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/validator/CreateDailyRecordValidator.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/validator/CreateDailyRecordValidator.java index 8bbb5a94..82e32955 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/validator/CreateDailyRecordValidator.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/validator/CreateDailyRecordValidator.java @@ -2,7 +2,7 @@ package app.module.front.usecase.daily.record.adapters.web.validator; import app.module.core.config.application.util.MessageUtil; import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; -import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; +import app.module.core.config.application.enums.DailyStatus; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.validation.Errors; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java index 966b49f9..62f18210 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java @@ -4,8 +4,8 @@ import app.module.front.config.application.util.AuditUtil; import app.module.front.config.application.util.AuthUtil; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.web.model.CreateDailyRecordReqVO; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.core.config.application.enums.DailySort; +import app.module.core.config.application.enums.DailyTargetStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.record.ports.DailyRecordPortOut; @@ -15,7 +15,6 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.time.LocalDate; import java.util.ArrayList; import java.util.List; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java index 4dd17d9a..fd5e627a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/domain/CreateDailyRecordCmd.java @@ -1,8 +1,8 @@ package app.module.front.usecase.daily.record.ports.application.domain; import app.module.front.config.adapters.persistence.component.FrontAuditCommand; -import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; -import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; +import app.module.core.config.application.enums.DailyStatus; +import app.module.core.config.application.enums.DailyTargetStatus; import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java index 5356c947..2ab1df9a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java @@ -3,7 +3,7 @@ package app.module.front.usecase.daily.work.adapters.web; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.core.config.application.enums.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; import app.module.front.usecase.daily.work.adapters.persistence.model.DailyWorkDto; diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 3131677a..d44136d1 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -74,16 +74,9 @@ -- 이전월 마지막 DAY 로 시작, 종료일이 같은지 여부 or start_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days') or end_day = DATE_PART('day', date_trunc('month', CURRENT_DATE) - INTERVAL '1 days') - - /* - -- 현재 DAY 로 시작, 종료일이 같은지 여부 - or start_day = DATE_PART('day', CURRENT_DATE - INTERVAL '3 days') - */ ) ) - --select count(tdg.group_no), count(dr.id) select case when count(tdg.group_no) = count(dr.id) then 0 else count(tdg.group_no) - count(dr.id) end - --select * from temp_day_group tdg left join daily_record dr on dr.record_month = tdg.current_month and dr.day_group_no = tdg.group_no diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index 067136c6..bd5932c6 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -8511,6 +8511,7 @@ button.swiper-pagination-bullet { font-size: 1.6rem; line-height: 140%; color: #868e96; + word-break: break-all; } .regist-item-area .item-list .list-item .detail-list li p::before { position: absolute; @@ -8523,7 +8524,8 @@ button.swiper-pagination-bullet { line-height: 140%; } .regist-item-area .item-list .list-item .detail-list li span { - max-width: 80%; + min-width: 40%; + word-break: break-all; color: #212529; } @@ -8667,13 +8669,20 @@ button.swiper-pagination-bullet { color: #ffffff; } -.btn-column-list li a { +.btn-column-list li { position: relative; display: block; padding: 2rem 1.6rem; background-color: #ffffff; border-radius: 0.8rem; - box-shadow: 0px 1px 8px -2px rgba(16, 24, 40, 0.05); + box-shadow: 0px 1px 4px -2px rgba(16, 24, 40, 0.04), 0px 1px 8px -2px rgba(16, 24, 40, 0.05); +} +.btn-column-list li a { + position: relative; + padding: 2rem 5.2rem 2rem 1.6rem; + display: block; + width: 100%; + height: 100%; } .btn-column-list li a::before { position: absolute; @@ -8685,8 +8694,19 @@ button.swiper-pagination-bullet { -webkit-transform: translateY(-50%); transform: translateY(-50%); right: 2rem; +} +.btn-column-list li.edit { + padding: 0; +} +.btn-column-list li.edit a::before { background: url("../images/common/ico_edit.svg") center/contain no-repeat; } +.btn-column-list li.view { + padding: 0; +} +.btn-column-list li.view a::before { + background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat; +} .btn-column-list li .label { font-size: 2rem; line-height: 140%; diff --git a/front/src/main/resources/templates/error/404.html b/front/src/main/resources/templates/error/404.html index 250df487..0033f833 100644 --- a/front/src/main/resources/templates/error/404.html +++ b/front/src/main/resources/templates/error/404.html @@ -1,37 +1,33 @@ - + 404 - -
-
-
- -
-
-

- Oops, 404 Not Found :-(

-

- 존재하지 않는 URI 주소로 접근했습니다. 다시 확인해주세요. -

-

+

+
+
+ 요청하신 페이지를
+ 찾을 수 없습니다
+ 페이지를 찾을 수 없습니다.
+ 일계부 첫 화면으로 이동해 주세요.
+
+
+ +
+
+ +
Error
Message -

-
-
-
-
-
+ + + diff --git a/front/src/main/resources/templates/error/500.html b/front/src/main/resources/templates/error/500.html index a991b61e..28acf1ce 100644 --- a/front/src/main/resources/templates/error/500.html +++ b/front/src/main/resources/templates/error/500.html @@ -1,43 +1,33 @@ + xmlns:th="http://www.thymeleaf.org" lang="ko"> - 500 - 에러발생 + 500 - -
-
-
- -
-
-

- Oops, 에러가 발생했습니다! :-(

-

- 아래 에러 메세지를 담당자에게 전달해주세요. -

-

+

+
+
+ 요청하신 작업을
완료할 수 없습니다.
+ 서비스 이용 중 문제가 발생했습니다.
+ 잠시 후 다시 시도해 주세요.
+
+
+ + +
+
+ +
Error
Message - - - - - - -

-
-
-
-
-
-
+ + + - + \ No newline at end of file diff --git a/front/src/main/resources/templates/info/user/password.html b/front/src/main/resources/templates/info/user/password.html index c862e938..bbb5f7b0 100644 --- a/front/src/main/resources/templates/info/user/password.html +++ b/front/src/main/resources/templates/info/user/password.html @@ -15,7 +15,7 @@
-
+
@@ -55,7 +55,8 @@ }; let formControl = { - authInfoUser() { + authInfoUser(event) { + event.preventDefault(); const f = document.reqForm; const obj = $(f).serializeObject(); diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 0158fe78..bc66c2e8 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -85,14 +85,14 @@
- +
- +
@@ -114,13 +114,13 @@
+ maxlength="4" inputmode="tel" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
+ maxlength="4" inputmode="tel" pattern="[0-9]*" oninput="kri.form.maxlength(this)">
diff --git a/front/src/main/resources/templates/layout/layout-error.html b/front/src/main/resources/templates/layout/layout-error.html index ebf195a9..9be74fac 100644 --- a/front/src/main/resources/templates/layout/layout-error.html +++ b/front/src/main/resources/templates/layout/layout-error.html @@ -1,19 +1,45 @@ - + + + + + + + Error | KRI 임가경제조사 일계부 + + + + + + + + + + + + + + - -
-

Page content goes here

-
- -
-
-
- © 2022 All rights reserved -
-
+
+
+ page content +
- + diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 7ee5c70b..6b045e1f 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -818,11 +818,33 @@ {{include tmpl="#titleTmpl" /}} {{include tmpl="#etcRowTmpl" /}} @@ -834,38 +856,6 @@

{{:date.start}} ~ {{:date.end}}

{{/if}} - -