diff --git a/admin/src/main/java/app/module/admin/config/application/enums/EmploymentType.java b/admin/src/main/java/app/module/admin/config/application/enums/EmploymentType.java new file mode 100644 index 00000000..448b62fd --- /dev/null +++ b/admin/src/main/java/app/module/admin/config/application/enums/EmploymentType.java @@ -0,0 +1,14 @@ +package app.module.admin.config.application.enums; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum EmploymentType { + FULLTIME( "1. 임업전업"), + MAIN( "2. 임업주업"), + PART( "3. 임업부업"); + + private final String desc; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java index 231c72e1..8df8bcd8 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/persistence/CreateHouseholdDao.java @@ -16,7 +16,6 @@ class CreateHouseholdDao implements CreateHouseholdPortOut { private final CreateHouseholdMapper mapper; @Override - @Transactional @CreateCommand public void operate(CreateHouseholdOutCmd outCmd) { // 임가 등록 diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java index f5bdc35e..87162c27 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/CreateHouseholdController.java @@ -52,6 +52,8 @@ class CreateHouseholdController { reqVO.getIndustryDetail(), reqVO.getResearcherSeq(), reqVO.getIsPanel(), + reqVO.getUsageType().name(), + reqVO.getEmploymentType().name(), reqVO.getMemo() ) ); diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java index 8c0399d6..aa2c9210 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/adapters/web/model/CreateHouseholdReqVO.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.createHousehold.adapters.web.model; +import app.module.admin.config.application.enums.EmploymentType; +import app.module.admin.config.application.enums.UsageType; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import lombok.AllArgsConstructor; @@ -33,5 +35,7 @@ public class CreateHouseholdReqVO { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private UsageType usageType; + private EmploymentType employmentType; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java index 41334cb2..38dd6dc9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/CreateHouseholdService.java @@ -7,12 +7,16 @@ import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdP import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd; import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd; +import app.module.admin.usecase.schedule.autoSchedules.ports.AutoSchedulesPortIn; import java.util.List; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import org.springframework.util.StringUtils; +@Slf4j @Service @RequiredArgsConstructor class CreateHouseholdService implements CreateHouseholdPortIn { @@ -20,8 +24,10 @@ class CreateHouseholdService implements CreateHouseholdPortIn { private final CreateHouseholdPortOut portOut; private final BCryptPasswordEncoder passwordEncoder; private final CheckHouseholdNumPortIn checkHouseholdNumPortIn; + private final AutoSchedulesPortIn autoSchedulesPortIn; @Override + @Transactional public void operate(CreateHouseholdInCmd inCmd) { // 임가번호 중복체크 @@ -34,28 +40,40 @@ class CreateHouseholdService implements CreateHouseholdPortIn { }); } - portOut.operate(new CreateHouseholdOutCmd( - null, - inCmd.getHouseholdNum(), - inCmd.getOwnerName(), - inCmd.getOwnerAge(), - (!StringUtils.hasText(inCmd.getTel2()) || !StringUtils.hasText(inCmd.getTel3())) - ? null - : inCmd.getTel1() + "-" + inCmd.getTel2() + "-" + inCmd.getTel3(), - inCmd.getPhone1() + "-" + inCmd.getPhone2() + "-" + inCmd.getPhone3(), - passwordEncoder.encode(inCmd.getPhone3()), // 비밀번호 핸드폰 뒤 네자리 - inCmd.getRegionMainCode(), - inCmd.getRegionSubCode(), - inCmd.getRegionDetailCode(), - inCmd.getAddress(), - inCmd.getIndustryLargeCode(), - inCmd.getIndustryMiddleCode(), - inCmd.getIndustrySubMiddle(), - inCmd.getIndustryDetail(), - inCmd.getResearcherSeq(), - inCmd.getIsPanel(), - inCmd.getMemo(), - List.of("ROLE_GENERAL") - )); + // 임가 등록 + try { + portOut.operate(new CreateHouseholdOutCmd( + null, + inCmd.getHouseholdNum(), + inCmd.getOwnerName(), + inCmd.getOwnerAge(), + (!StringUtils.hasText(inCmd.getTel2()) || !StringUtils.hasText(inCmd.getTel3())) + ? null + : inCmd.getTel1() + "-" + inCmd.getTel2() + "-" + inCmd.getTel3(), + inCmd.getPhone1() + "-" + inCmd.getPhone2() + "-" + inCmd.getPhone3(), + passwordEncoder.encode(inCmd.getPhone3()), + inCmd.getRegionMainCode(), + inCmd.getRegionSubCode(), + inCmd.getRegionDetailCode(), + inCmd.getAddress(), + inCmd.getIndustryLargeCode(), + inCmd.getIndustryMiddleCode(), + inCmd.getIndustrySubMiddle(), + inCmd.getIndustryDetail(), + inCmd.getResearcherSeq(), + inCmd.getIsPanel(), + inCmd.getUsageType(), + inCmd.getEmploymentType(), + inCmd.getMemo(), + List.of("ROLE_GENERAL") + )); + + // 월별 입력 현황 레코드 추가 + autoSchedulesPortIn.operate(); + + } catch (Exception e) { + log.info(e.getMessage()); + throw e; + } } } \ No newline at end of file diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java index 4fc08ea8..09bdbf74 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdInCmd.java @@ -29,5 +29,7 @@ public class CreateHouseholdInCmd { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String usageType; + private String employmentType; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java index fbf52db5..f83b44c6 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/createHousehold/ports/application/domain/CreateHouseholdOutCmd.java @@ -29,6 +29,8 @@ public class CreateHouseholdOutCmd extends AuditCommand { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String usageType; + private String employmentType; private String memo; private List roleIds; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java index 11a831da..6a6b068a 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/excelUploadCreateHousehold/adapters/persistence/ExcelUploadCreateHouseholdDao.java @@ -103,6 +103,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut household.getIndustryDetail(), household.getResearcherSeq(), household.getIsPanel(), + null, + null, household.getMemo(), List.of("ROLE_GENERAL") ); diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java index f2c8a2e8..bb1ffbb0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java +++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatus/ports/application/domain/GetHouseholdStatus.java @@ -50,6 +50,10 @@ public class GetHouseholdStatus { private String industryDetailName; // 유지여부 private Boolean isPanel; + // 이용구분 + private String usageType; + // 전겸업 구분 + private String employmentType; // 비고 private String memo; // 조사원 일련번호 diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java index 61b44814..2e46555c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/UpdateHouseholdController.java @@ -52,6 +52,8 @@ class UpdateHouseholdController { reqVO.getIndustryDetail(), reqVO.getResearcherSeq(), reqVO.getIsPanel(), + reqVO.getUsageType().name(), + reqVO.getEmploymentType().name(), reqVO.getMemo() ) ); diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java index 9dbf69ad..5f724501 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/adapters/web/model/UpdateHouseholdReqVO.java @@ -1,5 +1,7 @@ package app.module.admin.usecase.household.updateHousehold.adapters.web.model; +import app.module.admin.config.application.enums.EmploymentType; +import app.module.admin.config.application.enums.UsageType; import lombok.AllArgsConstructor; import lombok.EqualsAndHashCode; import lombok.Getter; @@ -31,5 +33,7 @@ public class UpdateHouseholdReqVO { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private UsageType usageType; + private EmploymentType employmentType; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java index e2f716f6..08f82f26 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/UpdateHouseholdService.java @@ -34,6 +34,8 @@ class UpdateHouseholdService implements UpdateHouseholdPortIn { inCmd.getIndustryDetail(), inCmd.getResearcherSeq(), inCmd.getIsPanel(), + inCmd.getUsageType(), + inCmd.getEmploymentType(), inCmd.getMemo() )); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdInCmd.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdInCmd.java index 3822ad94..f2603836 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdInCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdInCmd.java @@ -30,5 +30,7 @@ public class UpdateHouseholdInCmd { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String usageType; + private String employmentType; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdOutCmd.java b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdOutCmd.java index 1378b1c9..175c27b5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdOutCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHousehold/ports/application/domain/UpdateHouseholdOutCmd.java @@ -27,5 +27,7 @@ public class UpdateHouseholdOutCmd extends AuditCommand { private String industryDetail; private Long researcherSeq; private Boolean isPanel; + private String usageType; + private String employmentType; private String memo; } diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java index 2355b213..c338737e 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/UpdateHouseholdStatusUIController.java @@ -73,6 +73,8 @@ class UpdateHouseholdStatusUIController { result.getIndustrySubMiddleName(), result.getIndustryDetailName(), result.getIsPanel(), + result.getUsageType(), + result.getEmploymentType(), result.getMemo(), result.getResearcherSeq(), result.getResearcherName(), diff --git a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIResVO.java b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIResVO.java index 390bf076..065e1886 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIResVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/updateHouseholdStatusUI/adapters/web/model/UpdateHouseholdStatusUIResVO.java @@ -44,6 +44,10 @@ public class UpdateHouseholdStatusUIResVO { private String industryDetail; // 유지여부 private Boolean isPanel; + // 이용구분 + private String usageType; + // 전겸업 구분 + private String employmentType; // 비고 private String memo; // 조사원 일련번호 diff --git a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml index 8da3bc93..d76fd0ce 100644 --- a/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/CreateHouseholdMapper.xml @@ -36,10 +36,9 @@ industry_detail, - - - is_panel, + usage_type, + employment_type, memo, @@ -70,10 +69,9 @@ #{industryDetail}, - - - #{isPanel}, + #{usageType}, + #{employmentType}, #{memo}, diff --git a/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml b/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml index 33d894c6..9c81ff81 100644 --- a/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml +++ b/admin/src/main/resources/mappers/household/GetHouseholdStatusMapper.xml @@ -27,6 +27,8 @@ h.industry_sub_middle AS industrySubMiddleName, h.industry_detail AS industryDetailName, h.is_panel AS isPanel, + h.usage_type AS usageType, + h.employment_type AS employmentType, h.memo AS memo, r.admin_seq AS researcherSeq, r.researcher_name AS researcherName, diff --git a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml index 084fddf8..5d16fa24 100644 --- a/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml +++ b/admin/src/main/resources/mappers/household/UpdateHouseholdMapper.xml @@ -31,6 +31,12 @@ industry_detail = #{industryDetail}, is_panel = #{isPanel}, + + usage_type = #{usageType}, + + + employment_type = #{employmentType}, + memo = #{memo}, diff --git a/admin/src/main/resources/templates/households/create.html b/admin/src/main/resources/templates/households/create.html index 058bba7e..b648a311 100644 --- a/admin/src/main/resources/templates/households/create.html +++ b/admin/src/main/resources/templates/households/create.html @@ -205,27 +205,79 @@ + + 유지 여부 + +
+
+ +
+
+ +
+
+ - 유지 여부 + 구분
+ + 전·겸업 + +
+
+ +
+
+ +
+
+ +
+
+ 비고 diff --git a/admin/src/main/resources/templates/households/update/{seq}.html b/admin/src/main/resources/templates/households/update/{seq}.html index 04d55286..b2447382 100644 --- a/admin/src/main/resources/templates/households/update/{seq}.html +++ b/admin/src/main/resources/templates/households/update/{seq}.html @@ -224,29 +224,86 @@ + + 유지 여부 + +
+
+ +
+
+ +
+
+ - 유지 여부 + 구분
+ + 전·겸업 + +
+
+ +
+
+ +
+
+ +
+
+ 비고 diff --git a/core/src/main/resources/sql/schema/04_create-view.sql b/core/src/main/resources/sql/schema/04_create-view.sql index e0779f7b..a9e91808 100644 --- a/core/src/main/resources/sql/schema/04_create-view.sql +++ b/core/src/main/resources/sql/schema/04_create-view.sql @@ -43,8 +43,9 @@ SELECT h.industry_sub_middle, h.industry_detail, h.is_panel, - h.memo, - h.usage_type + h.usage_type, + h.employment_type, + h.memo FROM household h LEFT JOIN uicode main ON h.region_main_code = main.id LEFT JOIN v_uicode_view_name sub ON h.region_sub_code = sub.id