From 40d873780af7f60d04d953e14b1e776bfe52a342 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 9 Jun 2025 21:53:34 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9E=84=EA=B0=80=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../initData/InitFrontUserData.java | 19 +- .../persistence/initData/InitUICodeData.java | 223 +++++++++++++++++- .../application/CreateHouseholdService.java | 11 +- .../domain/CreateHouseholdInCmd.java | 11 +- .../domain/CreateHouseholdOutCmd.java | 11 +- .../application/domain/GetHousehold.java | 11 +- .../domain/UpdateFrontHouseholdCmd.java | 4 +- .../household/CreateHouseholdMapper.xml | 22 +- .../mappers/household/GetHouseholdMapper.xml | 11 +- .../household/UpdateFrontHouseholdMapper.xml | 4 +- .../resources/sql/schema/02_create-all.sql | 73 +++--- .../web/UpdateFrontHouseholdController.java | 4 +- .../web/model/UpdateFrontHouseholdReqVO.java | 4 +- .../main/resources/templates/user/info.html | 24 +- 14 files changed, 324 insertions(+), 108 deletions(-) diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java index 83616ee1..c292b6ae 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitFrontUserData.java @@ -32,15 +32,16 @@ public class InitFrontUserData implements ApplicationRunner { "테스트임가", 58, null, - "01011111111", - "서울", - "마포구", - "와와빌딩 2층", - 14, - 13, - 11, - 10, - 10, + "010-1111-1111", + "code.region.main.1", // 서울 + "code.region.sub.31", // 경기도 + "code.region.detail.9", // 경기 + "경기도 성남시 분당구 산성대로 437번길", + null, + null, + null, + null, + null, true, null, null diff --git a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java index faa90706..5c65bba5 100644 --- a/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java +++ b/core/src/main/java/app/module/core/config/adapters/persistence/initData/InitUICodeData.java @@ -47,22 +47,237 @@ public class InitUICodeData implements ApplicationRunner { uiCodeSavePortIn.connect( new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 1, "10", "10", null, true), + UICODE_PAGEABLE_ROWS + ".10", UICODE_PAGEABLE_ROWS, 0, "10", "10", null, true), false); uiCodeSavePortIn.connect( new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 2, "20", "20", null, true), + UICODE_PAGEABLE_ROWS + ".20", UICODE_PAGEABLE_ROWS, 1, "20", "20", null, true), false); uiCodeSavePortIn.connect( new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 3, "50", "50", null, true), + UICODE_PAGEABLE_ROWS + ".50", UICODE_PAGEABLE_ROWS, 2, "50", "50", null, true), false); uiCodeSavePortIn.connect( new UICodeSaveCommand( - UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 4, "100", "100", null, true), + UICODE_PAGEABLE_ROWS + ".100", UICODE_PAGEABLE_ROWS, 3, "100", "100", null, true), false); + + + // 조사 지역 + final String UICODE_REGION = "code.region"; + // 실사 + final String UICODE_REGION_MAIN = "code.region.main"; + + // code - region + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE_REGION, UICODE, 1, "조사 지역", "", null, true), false); + + // code - region - main : 실사 + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE_REGION_MAIN, UICODE_REGION, 0, "실사", "", null, + true), + false); + + // 1. 서울 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_MAIN + ".1", UICODE_REGION_MAIN, 0, "서울", "1", null, true), + false); + + // 2. 강원 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_MAIN + ".2", UICODE_REGION_MAIN, 1, "강원", "2", null, true), + false); + + // 3. 대전 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_MAIN + ".3", UICODE_REGION_MAIN, 2, "대전", "3", null, true), + false); + + // 4. 광주 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_MAIN + ".4", UICODE_REGION_MAIN, 3, "광주", "4", null, true), + false); + + // 5. 대구 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_MAIN + ".5", UICODE_REGION_MAIN, 4, "대구", "5", null, true), + false); + + // 6. 부산 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_MAIN + ".6", UICODE_REGION_MAIN, 5, "부산", "6", null, true), + false); + // 실사 끝 + + + // 지역 시작 + final String UICODE_REGION_SUB = "code.region.sub"; + + // code - region - sub : 지역 + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE_REGION_SUB, UICODE_REGION, 1, "지역", "", null, + true), + false); + + // 31. 경기도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".31", UICODE_REGION_SUB, 0, "경기도", "31", null, true), + false); + + // 32. 강원도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".32", UICODE_REGION_SUB, 1, "강원도", "32", null, true), + false); + + // 33. 충청북도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".33", UICODE_REGION_SUB, 2, "충청북도", "33", null, true), + false); + + // 34. 충청남도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".34", UICODE_REGION_SUB, 3, "충청남도", "34", null, true), + false); + + // 35. 전라북도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".35", UICODE_REGION_SUB, 4, "전라북도", "35", null, true), + false); + + // 36. 전라남도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".36", UICODE_REGION_SUB, 5, "전라남도", "36", null, true), + false); + + // 37. 경상북도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".37", UICODE_REGION_SUB, 6, "경상북도", "37", null, true), + false); + + // 38. 경상남도 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".38", UICODE_REGION_SUB, 7, "경상남도", "38", null, true), + false); + + // 40. 특광역시 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_SUB + ".40", UICODE_REGION_SUB, 8, "특광역시", "40", null, true), + false); + // 지역 - 끝 + + + // 세부지역 시작 + final String UICODE_REGION_DETAIL = "code.region.detail"; + + // code - region - detail : 세부지역 + uiCodeSavePortIn.connect( + new UICodeSaveCommand(UICODE_REGION_DETAIL, UICODE_REGION, 2, "세부지역", "", null, + true), + false); + + // 2. 부산 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".2", UICODE_REGION_DETAIL, 0, "부산", "2", null, true), + false); + + // 3. 대구 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".3", UICODE_REGION_DETAIL, 1, "대구", "3", null, true), + false); + + // 5. 광주 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".5", UICODE_REGION_DETAIL, 2, "광주", "5", null, true), + false); + + // 6. 대전 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".6", UICODE_REGION_DETAIL, 3, "대전", "6", null, true), + false); + + // 7. 울산 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".7", UICODE_REGION_DETAIL, 4, "울산", "7", null, true), + false); + + // 8. 세종 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".8", UICODE_REGION_DETAIL, 5, "세종", "8", null, true), + false); + + // 9. 경기 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".9", UICODE_REGION_DETAIL, 6, "경기", "9", null, true), + false); + + // 10. 강원 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".10", UICODE_REGION_DETAIL, 7, "강원", "10", null, true), + false); + + // 11. 충북 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".11", UICODE_REGION_DETAIL, 8, "충북", "11", null, true), + false); + + // 12. 충남 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".12", UICODE_REGION_DETAIL, 9, "충남", "12", null, true), + false); + + // 13. 전북 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".13", UICODE_REGION_DETAIL, 10, "전북", "13", null, true), + false); + + // 14. 전남 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".14", UICODE_REGION_DETAIL, 11, "전남", "14", null, true), + false); + + // 15. 경북 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".15", UICODE_REGION_DETAIL, 12, "경북", "15", null, true), + false); + + // 16. 경남 + uiCodeSavePortIn.connect( + new UICodeSaveCommand( + UICODE_REGION_DETAIL + ".16", UICODE_REGION_DETAIL, 13, "경남", "16", null, true), + false); + + + } } diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java index 30001aa1..4afec35d 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -27,13 +27,14 @@ class CreateHouseholdService implements CreateHouseholdPortIn { inCmd.getTel(), inCmd.getPhone(), passwordEncoder.encode(StringUtils.right(inCmd.getPhone(), 4)), // 비밀번호 핸드폰 뒤 네자리 - inCmd.getRegion(), - inCmd.getCity(), - inCmd.getAddressDetail(), + inCmd.getRegionMainCode(), + inCmd.getRegionSubCode(), + inCmd.getRegionDetailCode(), + inCmd.getAddress(), inCmd.getIndustryLargeCode(), inCmd.getIndustryMiddleCode(), - inCmd.getIndustrySmallCode(), - inCmd.getScaleCode(), + inCmd.getIndustrySubMiddleCode(), + inCmd.getIndustryDetailCode(), inCmd.getEmploymentCode(), inCmd.getIsPanel(), inCmd.getMemo(), diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java index 2853dd18..6feb3408 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java @@ -15,13 +15,14 @@ public class CreateHouseholdInCmd { private Integer ownerAge; private String tel; private String phone; - private String region; - private String city; - private String addressDetail; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private String address; private Integer industryLargeCode; private Integer industryMiddleCode; - private Integer industrySmallCode; - private Integer scaleCode; + private Integer industrySubMiddleCode; + private Integer industryDetailCode; private Integer employmentCode; private Boolean isPanel; private String memo; diff --git a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index dcd2a679..267f8059 100644 --- a/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/core/src/main/java/app/module/core/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -19,13 +19,14 @@ public class CreateHouseholdOutCmd extends AuditCommand { private String tel; private String phone; private String encodedPassword; - private String region; - private String city; - private String addressDetail; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private String address; private Integer industryLargeCode; private Integer industryMiddleCode; - private Integer industrySmallCode; - private Integer scaleCode; + private Integer industrySubMiddleCode; + private Integer industryDetailCode; private Integer employmentCode; private Boolean isPanel; private String memo; diff --git a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java index b9d19e99..7897588b 100644 --- a/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java +++ b/core/src/main/java/app/module/core/usecase/household/getHousehold/ports/application/domain/GetHousehold.java @@ -22,13 +22,14 @@ public class GetHousehold { private String tel; private String phone; private String password; - private String region; - private String city; - private String addressDetail; + private String regionMainCode; + private String regionSubCode; + private String regionDetailCode; + private String address; private Integer industryLargeCode; private Integer industryMiddleCode; - private Integer industrySmallCode; - private Integer scaleCode; + private Integer industrySubMiddleCode; + private Integer industryDetailCode; private Integer employmentCode; private Boolean isPanel; private String memo; diff --git a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java index 62fdc095..bdf63b83 100644 --- a/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java +++ b/core/src/main/java/app/module/core/usecase/household/updateFrontHousehold/ports/application/domain/UpdateFrontHouseholdCmd.java @@ -18,7 +18,5 @@ public class UpdateFrontHouseholdCmd extends AuditCommand { private Integer ownerAge; private String tel; private String phone; - private String region; - private String city; - private String addressDetail; + private String address; } diff --git a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml index 91f88ca8..dfce3cea 100644 --- a/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -17,13 +17,14 @@ tel, phone, password, - region, - city, - address_detail, + region_main_code, + region_sub_code, + region_detail_code, + address, industry_large_code, industry_middle_code, - industry_small_code, - scale_code, + industry_sub_middle_code, + industry_detail_code, employment_code, is_panel, memo, @@ -37,13 +38,14 @@ #{tel}, #{phone}, #{encodedPassword}, - #{region}, - #{city}, - #{addressDetail}, + #{regionMainCode}, + #{regionSubCode}, + #{regionDetailCode}, + #{address}, #{industryLargeCode}, #{industryMiddleCode}, - #{industrySmallCode}, - #{scaleCode}, + #{industrySubMiddleCode}, + #{industryDetailCode}, #{employmentCode}, #{isPanel}, #{memo}, diff --git a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml index 7738c982..6eb4ce01 100644 --- a/core/src/main/resources/mappers/household/GetHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/GetHouseholdMapper.xml @@ -14,13 +14,14 @@ tel, phone, password, - region, - city, - address_detail, + region_main_code, + region_sub_code, + region_detail_code, + address, industry_large_code, industry_middle_code, - industry_small_code, - scale_code, + industry_sub_middle_code, + industry_detail_code, employment_code, is_panel, memo, diff --git a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml index 1431cca7..2f5bb94d 100644 --- a/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml +++ b/core/src/main/resources/mappers/household/UpdateFrontHouseholdMapper.xml @@ -11,9 +11,7 @@ owner_age = #{ownerAge}, tel = #{tel}, phone = #{phone}, - region = #{region}, - city = #{city}, - address_detail = #{addressDetail}, + address = #{address}, WHERE seq = ${seq} 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 badde9b4..fd770373 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -270,37 +270,37 @@ COMMENT ON COLUMN admin_has_role.is_deleted IS '삭제여부'; CREATE SEQUENCE household_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE household ( - seq bigint NOT NULL DEFAULT nextval('household_seq'), -- 가구 일련번호 (PK) - household_num varchar(255) NOT NULL, -- 가구 번호 - owner_name varchar(10) NOT NULL, -- 소유자 이름 - owner_age integer NOT NULL, -- 소유자 나이 - tel varchar(20), -- 유선 전화번호 - phone varchar(15) NOT NULL, -- 휴대폰 번호 - password varchar(255) NOT NULL, -- 비밀번호 - region varchar(255), -- 지역 - city varchar(255), -- 도시 - address_detail varchar(100), -- 상세 주소 - industry_large_code varchar(255), -- 산업 대분류 코드(매핑코드) - industry_middle_code varchar(255), -- 산업 중분류 코드(매핑코드) - industry_small_code varchar(255), -- 산업 소분류 코드(매핑코드) - scale_code varchar(255), -- 사업장 규모 코드(매핑코드) - employment_code varchar(255), -- 전/겸업 코드(매핑코드) - is_panel boolean DEFAULT true, -- 패널 여부 - memo varchar(255), -- 메모 - drop_reason varchar(50), -- 탈락 사유 - 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, -- 삭제 여부 + seq bigint NOT NULL DEFAULT nextval('household_seq'), -- 가구 일련번호 (PK) + household_num varchar(255) NOT NULL, -- 가구 번호 + owner_name varchar(10) NOT NULL, -- 소유자 이름 + owner_age integer NOT NULL, -- 소유자 나이 + tel varchar(20), -- 유선 전화번호 + phone varchar(15) NOT NULL, -- 휴대폰 번호 + password varchar(255) NOT NULL, -- 비밀번호 + region_main_code varchar(255), -- 실사(공통코드) + region_sub_code varchar(255), -- 지역(공통코드) + region_detail_code varchar(255), -- 상세지역(공통코드) + address varchar(255), -- 전체 주소 + industry_large_code varchar(255), -- 업종 대분류 코드(공통코드) + industry_middle_code varchar(255), -- 업종 중분류 코드(공통코드) + industry_sub_middle_code varchar(255), -- 업종 중분류2 코드(공통코드) + industry_detail_code varchar(255), -- 규모/세부품목 코드(공통코드) + employment_code varchar(255), -- 전/겸업 코드(공통코드) -- TODO: 필요한지 체크 + is_panel boolean DEFAULT true, -- 패널 여부 + memo varchar(255), -- 메모 + drop_reason varchar(50), -- 탈락 사유 + 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, -- 삭제 여부 CONSTRAINT household_pkey PRIMARY KEY (seq) ); COMMENT ON TABLE household IS '가구(패널) 정보 테이블'; - COMMENT ON COLUMN household.seq IS '가구 일련번호 (PK)'; COMMENT ON COLUMN household.household_num IS '가구 번호'; COMMENT ON COLUMN household.owner_name IS '소유자 이름'; @@ -308,14 +308,15 @@ COMMENT ON COLUMN household.owner_age IS '소유자 나이'; COMMENT ON COLUMN household.tel IS '유선 전화번호'; COMMENT ON COLUMN household.phone IS '휴대폰 번호'; COMMENT ON COLUMN household.password IS '비밀번호'; -COMMENT ON COLUMN household.region IS '지역'; -COMMENT ON COLUMN household.city IS '도시'; -COMMENT ON COLUMN household.address_detail IS '상세 주소'; -COMMENT ON COLUMN household.industry_large_code IS '산업 대분류 코드 (매핑코드)'; -COMMENT ON COLUMN household.industry_middle_code IS '산업 중분류 코드(매핑코드)'; -COMMENT ON COLUMN household.industry_small_code IS '산업 소분류 코드(매핑코드)'; -COMMENT ON COLUMN household.scale_code IS '사업장 규모 코드(매핑코드)'; -COMMENT ON COLUMN household.employment_code IS '전/겸업 코드(매핑코드)'; +COMMENT ON COLUMN household.region_main_code IS '실사(공통코드)'; +COMMENT ON COLUMN household.region_sub_code IS '지역(공통코드)'; +COMMENT ON COLUMN household.region_detail_code IS '상세지역(공통코드)'; +COMMENT ON COLUMN household.address IS '전체 주소'; +COMMENT ON COLUMN household.industry_large_code IS '업종 대분류 코드(공통코드)'; +COMMENT ON COLUMN household.industry_middle_code IS '업종 중분류 코드(공통코드)'; +COMMENT ON COLUMN household.industry_sub_middle_code IS '업종 중분류2 코드(공통코드)'; +COMMENT ON COLUMN household.industry_detail_code IS '규모/세부품목 코드(공통코드)'; +COMMENT ON COLUMN household.employment_code IS '전/겸업 코드(공통코드)'; COMMENT ON COLUMN household.is_panel IS '패널 여부'; COMMENT ON COLUMN household.memo IS '메모'; COMMENT ON COLUMN household.drop_reason IS '탈락 사유'; @@ -749,8 +750,8 @@ CREATE TABLE uicode( code_text varchar(255), code_value varchar(255), msg_code varchar(255), - in_use boolean , - order_no integer , + in_use boolean, + order_no integer, created_at timestamp(6), created_by varchar(255), updated_at timestamp(6), diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java index 6b8ee006..47f8463d 100644 --- a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java +++ b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/UpdateFrontHouseholdController.java @@ -32,9 +32,7 @@ class UpdateFrontHouseholdController { reqVO.getOwnerAge(), reqVO.getTel(), reqVO.getPhone(), - reqVO.getRegion(), - reqVO.getCity(), - reqVO.getAddressDetail() + reqVO.getAddress() )); return ResponseEntity.status(HttpStatus.OK).body(reqVO); diff --git a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java index 7790fae7..5da30bba 100644 --- a/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java +++ b/front/src/main/java/app/module/front/usecase/household/updateFrontHousehold/adapters/web/model/UpdateFrontHouseholdReqVO.java @@ -16,7 +16,5 @@ public class UpdateFrontHouseholdReqVO { private Integer ownerAge; private String tel; private String phone; - private String region; - private String city; - private String addressDetail; + private String address; } diff --git a/front/src/main/resources/templates/user/info.html b/front/src/main/resources/templates/user/info.html index 036111c0..b9885f53 100644 --- a/front/src/main/resources/templates/user/info.html +++ b/front/src/main/resources/templates/user/info.html @@ -64,19 +64,19 @@
+ + + + + + + + + +
- - -
-
-
- - -
-
-
- - + +