Merge branch 'bo_household' into 'dev'
[BO] 임가현황 등록 필드 추가, 임가 등록 시 월별 입력상태 fn_monthly_input_status() 실행 See merge request korea-research/korea-research!81
This commit is contained in:
@@ -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;
|
||||
}
|
||||
@@ -16,7 +16,6 @@ class CreateHouseholdDao implements CreateHouseholdPortOut {
|
||||
private final CreateHouseholdMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
@CreateCommand
|
||||
public void operate(CreateHouseholdOutCmd outCmd) {
|
||||
// 임가 등록
|
||||
|
||||
@@ -52,6 +52,8 @@ class CreateHouseholdController {
|
||||
reqVO.getIndustryDetail(),
|
||||
reqVO.getResearcherSeq(),
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getUsageType().name(),
|
||||
reqVO.getEmploymentType().name(),
|
||||
reqVO.getMemo()
|
||||
)
|
||||
);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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<String> roleIds;
|
||||
}
|
||||
|
||||
@@ -103,6 +103,8 @@ class ExcelUploadCreateHouseholdDao implements ExcelUploadCreateHouseholdPortOut
|
||||
household.getIndustryDetail(),
|
||||
household.getResearcherSeq(),
|
||||
household.getIsPanel(),
|
||||
null,
|
||||
null,
|
||||
household.getMemo(),
|
||||
List.of("ROLE_GENERAL")
|
||||
);
|
||||
|
||||
@@ -50,6 +50,10 @@ public class GetHouseholdStatus {
|
||||
private String industryDetailName;
|
||||
// 유지여부
|
||||
private Boolean isPanel;
|
||||
// 이용구분
|
||||
private String usageType;
|
||||
// 전겸업 구분
|
||||
private String employmentType;
|
||||
// 비고
|
||||
private String memo;
|
||||
// 조사원 일련번호
|
||||
|
||||
@@ -52,6 +52,8 @@ class UpdateHouseholdController {
|
||||
reqVO.getIndustryDetail(),
|
||||
reqVO.getResearcherSeq(),
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getUsageType().name(),
|
||||
reqVO.getEmploymentType().name(),
|
||||
reqVO.getMemo()
|
||||
)
|
||||
);
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -34,6 +34,8 @@ class UpdateHouseholdService implements UpdateHouseholdPortIn {
|
||||
inCmd.getIndustryDetail(),
|
||||
inCmd.getResearcherSeq(),
|
||||
inCmd.getIsPanel(),
|
||||
inCmd.getUsageType(),
|
||||
inCmd.getEmploymentType(),
|
||||
inCmd.getMemo()
|
||||
));
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
@@ -73,6 +73,8 @@ class UpdateHouseholdStatusUIController {
|
||||
result.getIndustrySubMiddleName(),
|
||||
result.getIndustryDetailName(),
|
||||
result.getIsPanel(),
|
||||
result.getUsageType(),
|
||||
result.getEmploymentType(),
|
||||
result.getMemo(),
|
||||
result.getResearcherSeq(),
|
||||
result.getResearcherName(),
|
||||
|
||||
@@ -44,6 +44,10 @@ public class UpdateHouseholdStatusUIResVO {
|
||||
private String industryDetail;
|
||||
// 유지여부
|
||||
private Boolean isPanel;
|
||||
// 이용구분
|
||||
private String usageType;
|
||||
// 전겸업 구분
|
||||
private String employmentType;
|
||||
// 비고
|
||||
private String memo;
|
||||
// 조사원 일련번호
|
||||
|
||||
Reference in New Issue
Block a user