[BO] 임가현황 작업 중 (12) - 임가리스트, 상세, 임가수정, 임가등록, 조사원매핑 작업
This commit is contained in:
@@ -29,9 +29,9 @@ class CreateHouseholdDao implements CreateHouseholdPortOut {
|
||||
}
|
||||
|
||||
// 임가 담당 조사원 등록
|
||||
if(outCmd.getAdminSeq() != null) {
|
||||
if(outCmd.getResearcherSeq() != null) {
|
||||
mapper.createResearcherHasHousehold(
|
||||
AuditUtil.create(new CreateResearcherHasHouseholdCmd(outCmd.getSeq(), outCmd.getAdminSeq())));
|
||||
AuditUtil.create(new CreateResearcherHasHouseholdCmd(outCmd.getSeq(), outCmd.getResearcherSeq())));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -20,7 +20,6 @@ import app.module.admin.usecase.household.createHousehold.adapters.web.validator
|
||||
class CreateHouseholdController {
|
||||
private final CreateHouseholdValidator validator;
|
||||
private final CreateHouseholdPortIn createHouseholdPortIn;
|
||||
private final MessageUtil messageUtil;
|
||||
|
||||
@PostMapping(path = "/api/household/households/create")
|
||||
ResponseEntity<?> operate(
|
||||
@@ -51,7 +50,7 @@ class CreateHouseholdController {
|
||||
reqVO.getIndustryMiddleCode(),
|
||||
reqVO.getIndustrySubMiddle(),
|
||||
reqVO.getIndustryDetail(),
|
||||
reqVO.getAdminSeq(),
|
||||
reqVO.getResearcherSeq(),
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getMemo()
|
||||
)
|
||||
|
||||
@@ -31,7 +31,7 @@ public class CreateHouseholdReqVO {
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long adminSeq;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
}
|
||||
|
||||
@@ -27,7 +27,7 @@ public class CreateHouseholdOutCmd extends AuditCommand {
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long adminSeq;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
private List<String> roleIds;
|
||||
|
||||
@@ -13,5 +13,5 @@ import lombok.Setter;
|
||||
@EqualsAndHashCode
|
||||
public class CreateResearcherHasHouseholdCmd extends AuditCommand {
|
||||
private Long householdSeq;
|
||||
private Long adminSeq;
|
||||
private Long researcherSeq;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package app.module.admin.usecase.household.createHouseholdUI.adapters.web;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@@ -7,28 +8,35 @@ import org.springframework.ui.Model;
|
||||
import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import app.module.admin.usecase.household.createHouseholdUI.adapters.web.model.CreateHouseholdUIReqVO;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class CreateHouseholdUIController {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/create")
|
||||
String operate(
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO) {
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
// 실사
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
||||
// 업종 대분류
|
||||
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
@GetMapping(path = "/household/households/create")
|
||||
String operate(Model model, @ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
return "household/households/create";
|
||||
}
|
||||
// 임가 등록 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
}
|
||||
|
||||
// 실사
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
||||
// 업종 대분류
|
||||
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
return "household/households/create";
|
||||
}
|
||||
}
|
||||
@@ -11,7 +11,7 @@ import lombok.Setter;
|
||||
@EqualsAndHashCode
|
||||
public class GetHouseholdStatus {
|
||||
// 가구 일련번후
|
||||
private Integer householdSeq;
|
||||
private Long householdSeq;
|
||||
// 임가번후
|
||||
private String householdNum;
|
||||
// 경영주명
|
||||
@@ -22,16 +22,26 @@ public class GetHouseholdStatus {
|
||||
private String householdTel;
|
||||
// 휴대폰번호
|
||||
private String householdPhone;
|
||||
// 실사 공통코드
|
||||
private String regionMainCode;
|
||||
// 실사
|
||||
private String regionMainName;
|
||||
// 지역 공통코드
|
||||
private String regionSubCode;
|
||||
// 지역
|
||||
private String regionSubName;
|
||||
// 세부지역 공통코드
|
||||
private String regionDetailCode;
|
||||
// 세부지역
|
||||
private String regionDetailName;
|
||||
// 주소
|
||||
private String address;
|
||||
// 업종 대분류 공통코드
|
||||
private String industryLargeCode;
|
||||
// 업종 대분류
|
||||
private String industryLargeName;
|
||||
// 업종 중분류1 공통코드
|
||||
private String industryMiddleCode;
|
||||
// 업종 중분류1
|
||||
private String industryMiddleName;
|
||||
// 업종 중분류2
|
||||
@@ -42,6 +52,8 @@ public class GetHouseholdStatus {
|
||||
private Boolean isPanel;
|
||||
// 비고
|
||||
private String memo;
|
||||
// 조사원 일련번호
|
||||
private Long researcherSeq;
|
||||
// 조사원
|
||||
private String researcherName;
|
||||
// 조사원 연락처
|
||||
|
||||
@@ -0,0 +1,35 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateResearcherHasHouseholdCmd;
|
||||
import app.module.core.config.application.util.AuditUtil;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortOut;
|
||||
import org.springframework.stereotype.Repository;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
@Repository
|
||||
@RequiredArgsConstructor
|
||||
class UpdateHouseholdDao implements UpdateHouseholdPortOut {
|
||||
private final UpdateHouseholdMapper mapper;
|
||||
|
||||
@Override
|
||||
@Transactional
|
||||
public void operate(UpdateHouseholdOutCmd outCmd) {
|
||||
// 임가 정보 수정
|
||||
mapper.updateHousehold(AuditUtil.update(outCmd));
|
||||
|
||||
// 임가 담당 조사원 수정
|
||||
if(outCmd.getResearcherSeq() != null) {
|
||||
// 매핑 정보 먼저 삭제
|
||||
mapper.deleteResearcherHasHousehold(AuditUtil.delete(
|
||||
new UpdateResearcherHasHouseholdCmd(outCmd.getResearcherSeq(),
|
||||
outCmd.getResearcherSeq())));
|
||||
|
||||
// 다시 등록
|
||||
mapper.createResearcherHasHousehold(AuditUtil.create(
|
||||
new UpdateResearcherHasHouseholdCmd(outCmd.getResearcherSeq(),
|
||||
outCmd.getResearcherSeq())));
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.adapters.persistence;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateResearcherHasHouseholdCmd;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
|
||||
@Mapper
|
||||
public interface UpdateHouseholdMapper {
|
||||
void updateHousehold(UpdateHouseholdOutCmd cmd);
|
||||
void deleteResearcherHasHousehold(UpdateResearcherHasHouseholdCmd cmd);
|
||||
void createResearcherHasHousehold(UpdateResearcherHasHouseholdCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,62 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.adapters.web;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortIn;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdInCmd;
|
||||
import jakarta.validation.Valid;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.http.ResponseEntity;
|
||||
import org.springframework.web.bind.annotation.PutMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
import org.springframework.validation.BindingResult;
|
||||
import app.module.admin.usecase.household.updateHousehold.adapters.web.model.UpdateHouseholdReqVO;
|
||||
import app.module.admin.usecase.household.updateHousehold.adapters.web.model.UpdateHouseholdResVO;
|
||||
import app.module.admin.usecase.household.updateHousehold.adapters.web.validator.UpdateHouseholdValidator;
|
||||
|
||||
@RestController
|
||||
@RequiredArgsConstructor
|
||||
class UpdateHouseholdController {
|
||||
private final UpdateHouseholdValidator validator;
|
||||
private final UpdateHouseholdPortIn updateHouseholdPortIn;
|
||||
|
||||
@PutMapping(path = "/api/household/households/update")
|
||||
ResponseEntity<?> operate(
|
||||
@Valid @RequestBody UpdateHouseholdReqVO reqVO, BindingResult bindingResult) {
|
||||
validator.validate(reqVO, bindingResult);
|
||||
|
||||
if (bindingResult.hasErrors()) {
|
||||
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
|
||||
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
|
||||
}
|
||||
|
||||
updateHouseholdPortIn.operate(
|
||||
new UpdateHouseholdInCmd(
|
||||
reqVO.getHouseholdSeq(),
|
||||
reqVO.getHouseholdNum(),
|
||||
reqVO.getOwnerName(),
|
||||
reqVO.getOwnerAge(),
|
||||
reqVO.getTel1(),
|
||||
reqVO.getTel2(),
|
||||
reqVO.getTel3(),
|
||||
reqVO.getPhone1(),
|
||||
reqVO.getPhone2(),
|
||||
reqVO.getPhone3(),
|
||||
reqVO.getRegionMainCode(),
|
||||
reqVO.getRegionSubCode(),
|
||||
reqVO.getRegionDetailCode(),
|
||||
reqVO.getAddress(),
|
||||
reqVO.getIndustryLargeCode(),
|
||||
reqVO.getIndustryMiddleCode(),
|
||||
reqVO.getIndustrySubMiddle(),
|
||||
reqVO.getIndustryDetail(),
|
||||
reqVO.getResearcherSeq(),
|
||||
reqVO.getIsPanel(),
|
||||
reqVO.getMemo()
|
||||
)
|
||||
);
|
||||
|
||||
return ResponseEntity.status(HttpStatus.OK)
|
||||
.body(new UpdateHouseholdResVO(reqVO.getHouseholdNum()));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,35 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.NoArgsConstructor;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@NoArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateHouseholdReqVO {
|
||||
private Long householdSeq;
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private Integer ownerAge;
|
||||
private String tel1;
|
||||
private String tel2;
|
||||
private String tel3;
|
||||
private String phone1;
|
||||
private String phone2;
|
||||
private String phone3;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
}
|
||||
@@ -0,0 +1,14 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateHouseholdResVO {
|
||||
private String householdNum;
|
||||
}
|
||||
@@ -0,0 +1,96 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.adapters.web.validator;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.adapters.web.model.UpdateHouseholdReqVO;
|
||||
import org.springframework.stereotype.Component;
|
||||
import org.springframework.util.StringUtils;
|
||||
import org.springframework.validation.Errors;
|
||||
import org.springframework.validation.Validator;
|
||||
|
||||
@Component
|
||||
public class UpdateHouseholdValidator implements Validator {
|
||||
|
||||
@Override
|
||||
public boolean supports(Class<?> clazz) {
|
||||
return UpdateHouseholdReqVO.class.equals(clazz);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void validate(Object target, Errors errors) {
|
||||
UpdateHouseholdReqVO vo = (UpdateHouseholdReqVO) target;
|
||||
|
||||
// 2. 경영주명
|
||||
if (!StringUtils.hasText(vo.getOwnerName())) {
|
||||
errors.reject("ownerName", "경영주명을 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (vo.getOwnerName().length() > 10) {
|
||||
errors.reject("ownerName", "경영주명은 최대 10자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 3. 연령
|
||||
if (vo.getOwnerAge() == null) {
|
||||
errors.reject("ownerAge", "연령을 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (vo.getOwnerAge().toString().length() > 3) {
|
||||
errors.reject("ownerAge", "연령은 최대 3자리 숫자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 4. 가구 연락처
|
||||
if (StringUtils.hasText(vo.getTel2()) || StringUtils.hasText(vo.getTel3())) {
|
||||
if ((vo.getTel2() != null && vo.getTel2().length() > 4) ||
|
||||
(vo.getTel3() != null && vo.getTel3().length() > 4)) {
|
||||
errors.reject("tel", "가구 연락처는 각 4자리까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
// 5. 휴대폰 번호
|
||||
if (!StringUtils.hasText(vo.getPhone1()) || !StringUtils.hasText(vo.getPhone2()) || !StringUtils.hasText(vo.getPhone3())) {
|
||||
errors.reject("phone", "휴대폰 번호를 모두 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (vo.getPhone2().length() > 4 || vo.getPhone3().length() > 4) {
|
||||
errors.reject("phone", "휴대폰 번호는 각 4자리까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 6. 지역 코드
|
||||
if (!StringUtils.hasText(vo.getRegionMainCode())) {
|
||||
errors.reject("regionMainCode", "실사를 선택해주세요.");
|
||||
return;
|
||||
}
|
||||
if (!StringUtils.hasText(vo.getRegionSubCode())) {
|
||||
errors.reject("regionSubCode", "지역을 선택해주세요.");
|
||||
return;
|
||||
}
|
||||
if (!StringUtils.hasText(vo.getRegionDetailCode())) {
|
||||
errors.reject("regionDetailCode", "세부지역을 선택해주세요.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 7. 주소
|
||||
if (!StringUtils.hasText(vo.getAddress())) {
|
||||
errors.reject("address", "주소를 입력해주세요.");
|
||||
return;
|
||||
}
|
||||
if (StringUtils.hasText(vo.getAddress()) && vo.getAddress().length() > 50) {
|
||||
errors.reject("address", "주소는 최대 50자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 8. 업종 중분류2
|
||||
if (StringUtils.hasText(vo.getIndustrySubMiddle()) && vo.getIndustrySubMiddle().length() > 20) {
|
||||
errors.reject("industrySubMiddle", "업종 중분류는 최대 20자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
|
||||
// 9. 업종 세부품목
|
||||
if (StringUtils.hasText(vo.getIndustryDetail()) && vo.getIndustryDetail().length() > 20) {
|
||||
errors.reject("industryDetail", "업종 세부품목은 최대 20자까지 입력 가능합니다.");
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.ports;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdInCmd;
|
||||
|
||||
public interface UpdateHouseholdPortIn {
|
||||
void operate(UpdateHouseholdInCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.ports;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd;
|
||||
|
||||
public interface UpdateHouseholdPortOut {
|
||||
void operate(UpdateHouseholdOutCmd cmd);
|
||||
}
|
||||
@@ -0,0 +1,40 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.ports.application;
|
||||
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdOutCmd;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.application.domain.UpdateHouseholdInCmd;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortIn;
|
||||
import app.module.admin.usecase.household.updateHousehold.ports.UpdateHouseholdPortOut;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
class UpdateHouseholdService implements UpdateHouseholdPortIn {
|
||||
private final UpdateHouseholdPortOut portOut;
|
||||
|
||||
@Override
|
||||
public void operate(UpdateHouseholdInCmd inCmd) {
|
||||
portOut.operate(new UpdateHouseholdOutCmd(
|
||||
inCmd.getHouseholdSeq(),
|
||||
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(),
|
||||
inCmd.getRegionMainCode(),
|
||||
inCmd.getRegionSubCode(),
|
||||
inCmd.getRegionDetailCode(),
|
||||
inCmd.getAddress(),
|
||||
inCmd.getIndustryLargeCode(),
|
||||
inCmd.getIndustryMiddleCode(),
|
||||
inCmd.getIndustrySubMiddle(),
|
||||
inCmd.getIndustryDetail(),
|
||||
inCmd.getResearcherSeq(),
|
||||
inCmd.getIsPanel(),
|
||||
inCmd.getMemo()
|
||||
));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.ports.application.domain;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateHouseholdInCmd {
|
||||
private Long householdSeq;
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private Integer ownerAge;
|
||||
private String tel1;
|
||||
private String tel2;
|
||||
private String tel3;
|
||||
private String phone1;
|
||||
private String phone2;
|
||||
private String phone3;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateHouseholdOutCmd extends AuditCommand {
|
||||
private Long householdSeq;
|
||||
private String householdNum;
|
||||
private String ownerName;
|
||||
private Integer ownerAge;
|
||||
private String tel;
|
||||
private String phone;
|
||||
private String regionMainCode;
|
||||
private String regionSubCode;
|
||||
private String regionDetailCode;
|
||||
private String address;
|
||||
private String industryLargeCode;
|
||||
private String industryMiddleCode;
|
||||
private String industrySubMiddle;
|
||||
private String industryDetail;
|
||||
private Long researcherSeq;
|
||||
private Boolean isPanel;
|
||||
private String memo;
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package app.module.admin.usecase.household.updateHousehold.ports.application.domain;
|
||||
|
||||
import app.module.core.config.adapters.persistence.component.AuditCommand;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateResearcherHasHouseholdCmd extends AuditCommand {
|
||||
private Long householdSeq;
|
||||
private Long researcherSeq;
|
||||
}
|
||||
@@ -1,8 +1,11 @@
|
||||
package app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web;
|
||||
|
||||
import app.module.admin.config.application.util.AdminUtil;
|
||||
import app.module.admin.config.application.util.DateUiUtil;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.GetHouseholdStatusPortIn;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus;
|
||||
import app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatusCmd;
|
||||
import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIResVO;
|
||||
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Controller;
|
||||
@@ -11,37 +14,72 @@ import org.springframework.web.bind.annotation.GetMapping;
|
||||
import org.springframework.web.bind.annotation.ModelAttribute;
|
||||
import org.springframework.web.bind.annotation.PathVariable;
|
||||
import app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model.UpdateHouseholdStatusUIReqVO;
|
||||
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
|
||||
|
||||
@Controller
|
||||
@RequiredArgsConstructor
|
||||
class UpdateHouseholdStatusUIController {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
@GetMapping(path = "/household/households/update/{seq}")
|
||||
String operate(
|
||||
@PathVariable Long seq,
|
||||
Model model,
|
||||
@ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO) {
|
||||
private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
|
||||
private final UICodeListPortIn uiCodeListPortIn;
|
||||
|
||||
model.addAttribute("seq", seq);
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
@GetMapping(path = "/household/households/update/{seq}")
|
||||
String operate(@PathVariable Long seq, Model model,
|
||||
@ModelAttribute("reqVO") UpdateHouseholdStatusUIReqVO reqVO,
|
||||
RedirectAttributes redirectAttributes) {
|
||||
|
||||
// 실사
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
||||
// 업종 대분류
|
||||
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
// 임가 수정 페이지는 관리자만 접근 가능
|
||||
if (!AdminUtil.getLoginUserRole().equals("ROLE_ADMIN")) {
|
||||
redirectAttributes.addFlashAttribute("alertMessage", "접근 권한이 없습니다.");
|
||||
return "redirect:/household/households";
|
||||
}
|
||||
|
||||
// 임가 상세 정보
|
||||
model.addAttribute("householdInfo",
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
|
||||
model.addAttribute("seq", seq);
|
||||
model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
|
||||
|
||||
return "household/households/update/{seq}";
|
||||
}
|
||||
// 실사
|
||||
model.addAttribute("regionMainList", uiCodeListPortIn.connect("code.region.main"));
|
||||
// 지역
|
||||
model.addAttribute("regionSubList", uiCodeListPortIn.connect("code.region.sub"));
|
||||
// 세부지역
|
||||
model.addAttribute("regionDetailList", uiCodeListPortIn.connect("code.region.detail"));
|
||||
// 업종 대분류
|
||||
model.addAttribute("industryLargeList", uiCodeListPortIn.connect("code.industry.large"));
|
||||
// 업종 중분류1
|
||||
model.addAttribute("industryMiddleList", uiCodeListPortIn.connect("code.industry.middle"));
|
||||
|
||||
|
||||
// 임가 상세 정보
|
||||
GetHouseholdStatus result =
|
||||
getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null);
|
||||
|
||||
model.addAttribute("householdInfo",
|
||||
new UpdateHouseholdStatusUIResVO(
|
||||
result.getHouseholdSeq(),
|
||||
result.getHouseholdNum(),
|
||||
result.getHouseholdName(),
|
||||
result.getHouseholdAge(),
|
||||
result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[0] : "",
|
||||
result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[1] : "",
|
||||
result.getHouseholdTel() != null ? result.getHouseholdTel().split("-")[2] : "",
|
||||
result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[0] : "",
|
||||
result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[1] : "",
|
||||
result.getHouseholdPhone() != null ? result.getHouseholdPhone().split("-")[2] : "",
|
||||
result.getRegionMainCode(),
|
||||
result.getRegionSubCode(),
|
||||
result.getRegionDetailCode(),
|
||||
result.getAddress(),
|
||||
result.getIndustryLargeCode(),
|
||||
result.getIndustryMiddleCode(),
|
||||
result.getIndustrySubMiddleName(),
|
||||
result.getIndustryDetailName(),
|
||||
result.getIsPanel(),
|
||||
result.getMemo(),
|
||||
result.getResearcherSeq(),
|
||||
result.getResearcherName(),
|
||||
result.getResearcherPhone()
|
||||
));
|
||||
|
||||
return "household/households/update/{seq}";
|
||||
}
|
||||
}
|
||||
@@ -10,4 +10,42 @@ import lombok.Setter;
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateHouseholdStatusUIReqVO {
|
||||
// 가구 일련번후
|
||||
private Integer householdSeq;
|
||||
// 임가번후
|
||||
private String householdNum;
|
||||
// 경영주명
|
||||
private String householdName;
|
||||
// 연령
|
||||
private String householdAge;
|
||||
// 가구 연락처
|
||||
private String householdTel1;
|
||||
private String householdTel2;
|
||||
private String householdTel3;
|
||||
// 휴대폰번호
|
||||
private String householdPhone1;
|
||||
private String householdPhone2;
|
||||
private String householdPhone3;
|
||||
// 실사
|
||||
private String regionMainName;
|
||||
// 지역
|
||||
private String regionSubName;
|
||||
// 세부지역
|
||||
private String regionDetailName;
|
||||
// 주소
|
||||
private String address;
|
||||
// 업종 대분류
|
||||
private String industryLargeCode;
|
||||
// 업종 중분류1
|
||||
private String industryMiddleCode;
|
||||
// 업종 중분류2
|
||||
private String industrySubMiddle;
|
||||
// 규모/세부품목
|
||||
private String industryDetail;
|
||||
// 유지여부
|
||||
private Boolean isPanel;
|
||||
// 비고
|
||||
private String memo;
|
||||
// 조사원 일련번호
|
||||
private String researcherSeq;
|
||||
}
|
||||
|
||||
@@ -0,0 +1,55 @@
|
||||
package app.module.admin.usecase.household.updateHouseholdStatusUI.adapters.web.model;
|
||||
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.EqualsAndHashCode;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@AllArgsConstructor
|
||||
@EqualsAndHashCode
|
||||
public class UpdateHouseholdStatusUIResVO {
|
||||
// 가구 일련번후
|
||||
private Long householdSeq;
|
||||
// 임가번후
|
||||
private String householdNum;
|
||||
// 경영주명
|
||||
private String householdName;
|
||||
// 연령
|
||||
private String householdAge;
|
||||
// 가구 연락처
|
||||
private String householdTel1;
|
||||
private String householdTel2;
|
||||
private String householdTel3;
|
||||
// 휴대폰번호
|
||||
private String householdPhone1;
|
||||
private String householdPhone2;
|
||||
private String householdPhone3;
|
||||
// 실사 공통코드
|
||||
private String regionMainCode;
|
||||
// 지역 공통코드
|
||||
private String regionSubCode;
|
||||
// 세부지역 공통코드
|
||||
private String regionDetailCode;
|
||||
// 주소
|
||||
private String address;
|
||||
// 업종 대분류 공통코드
|
||||
private String industryLargeCode;
|
||||
// 업종 중분류1 공통코드
|
||||
private String industryMiddleCode;
|
||||
// 업종 중분류2
|
||||
private String industrySubMiddle;
|
||||
// 규모/세부품목
|
||||
private String industryDetail;
|
||||
// 유지여부
|
||||
private Boolean isPanel;
|
||||
// 비고
|
||||
private String memo;
|
||||
// 조사원 일련번호
|
||||
private Long researcherSeq;
|
||||
// 조사원
|
||||
private String researcherName;
|
||||
// 조사원 연락처
|
||||
private String researcherPhone;
|
||||
}
|
||||
Reference in New Issue
Block a user