[BO] 임가현황 작업 중 (12) - 임가리스트, 상세, 임가수정, 임가등록, 조사원매핑 작업

This commit is contained in:
kangsunlee
2025-06-20 15:14:47 +09:00
parent 79a4f64bd2
commit 23dfffaa43
31 changed files with 892 additions and 159 deletions

View File

@@ -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())));
}
}
}

View File

@@ -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()
)

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -13,5 +13,5 @@ import lombok.Setter;
@EqualsAndHashCode
public class CreateResearcherHasHouseholdCmd extends AuditCommand {
private Long householdSeq;
private Long adminSeq;
private Long researcherSeq;
}

View File

@@ -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";
}
}

View File

@@ -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;
// 조사원 연락처

View File

@@ -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())));
}
}
}

View File

@@ -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);
}

View File

@@ -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()));
}
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}
}
}

View File

@@ -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);
}

View File

@@ -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);
}

View File

@@ -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()
));
}
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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}";
}
}

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -111,7 +111,7 @@
(
nextval('researcher_has_household_seq'),
#{householdSeq},
#{adminSeq},
#{researcherSeq},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>

View File

@@ -28,7 +28,7 @@
<foreach collection="householdSeqs" item="householdSeq" separator=",">
(
nextval('researcher_has_household_seq'),
#{adminSeq},
#{researcherSeq},
#{householdSeq},
<include refid="common.fields.CreateUpdateBaseValues"/>
)

View File

@@ -28,11 +28,19 @@
GROUP BY dr.id
),
month_check AS (
SELECT #{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month
SELECT
#{recordMonth} = TO_CHAR(CURRENT_DATE, 'YYYYMM') AS is_current_month,
EXTRACT(DAY FROM (TO_DATE(#{recordMonth}, 'YYYYMM') + INTERVAL '1 MONTH - 1 day')) AS month_last_day /* recordMonth 의 말일 */
)
SELECT
dr.id AS id,
ddg.start_day || CASE WHEN ddg.start_day = ddg.end_day THEN '' ELSE '-' || ddg.end_day END AS day_group,
/* 해당 월의 말일을 기준으로 종료일을 제한하여 일자 그룹 표시 */
ddg.start_day ||
CASE
WHEN ddg.start_day = LEAST(ddg.end_day, mc.month_last_day)
THEN ''
ELSE '-' || LEAST(ddg.end_day, mc.month_last_day)
END AS day_group,
CASE
WHEN mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */
WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' /* 작성완료 */
@@ -58,6 +66,7 @@
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
LEFT JOIN data_counts dc ON dc.id = dr.id
WHERE ddg.start_day &lt;= mc.month_last_day
ORDER BY ddg.start_day
</select>
</mapper>

View File

@@ -5,6 +5,7 @@
namespace="app.module.admin.usecase.household.getHouseholdStatus.adapters.persistence.GetHouseholdStatusMapper">
<select id="getHouseholdStatusById"
resultType="app.module.admin.usecase.household.getHouseholdStatus.ports.application.domain.GetHouseholdStatus">
/* getHouseholdStatusById : 임가 정보 상세 */
SELECT
h.seq AS householdSeq,
h.household_num AS householdNum,
@@ -12,16 +13,22 @@
h.owner_age AS householdAge,
h.tel AS householdTel,
h.phone AS householdPhone,
h.region_main_code AS regionMainCode,
h.region_main_name AS regionMainName,
h.region_sub_code AS regionSubCode,
h.region_sub_name AS regionSubName,
h.region_detail_code AS regionDetailCode,
h.region_detail_name AS regionDetailName,
h.address AS address,
h.industry_large_code AS industryLargeCode,
h.industry_large_name AS industryLargeName,
h.industry_middle_code AS industryMiddleCode,
h.industry_middle_name AS industryMiddleName,
h.industry_sub_middle AS industrySubMiddleName,
h.industry_detail AS industryDetailName,
h.is_panel AS isPanel,
h.memo AS memo,
r.admin_seq AS researcherSeq,
r.researcher_name AS researcherName,
r.researcher_phone AS researcherPhone
FROM v_household_with_code h

View File

@@ -0,0 +1,66 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.admin.usecase.household.updateHousehold.adapters.persistence.UpdateHouseholdMapper">
<update id="updateHousehold">
/* updateHousehold : 임가 정보 수정 */
UPDATE household
SET
owner_name = #{ownerName},
owner_age = #{ownerAge},
<if test="tel != null and tel != ''">
tel = #{tel},
</if>
phone = #{phone},
region_main_code = #{regionMainCode},
region_sub_code = #{regionSubCode},
region_detail_code = #{regionDetailCode},
address = #{address},
<if test="industryLargeCode != null and industryLargeCode != ''">
industry_large_code = #{industryLargeCode},
</if>
<if test="industryMiddleCode != null and industryMiddleCode != ''">
industry_middle_code = #{industryMiddleCode},
</if>
<if test="industrySubMiddle != null and industrySubMiddle != ''">
industry_sub_middle = #{industrySubMiddle},
</if>
<if test="industryDetail != null and industryDetail != ''">
industry_detail = #{industryDetail},
</if>
is_panel = #{isPanel},
<if test="memo != null and memo != ''">
memo = #{memo},
</if>
<include refid="common.fields.UpdateBaseSet"/>
WHERE seq = #{householdSeq}
</update>
<update id="deleteResearcherHasHousehold">
/* deleteResearcherHasHousehold : 임가에 매핑된 담당 조사원 삭제 */
UPDATE researcher_has_household
SET <include refid="common.fields.DeleteBaseSet"/>
WHERE is_deleted = false
AND household_seq = #{householdSeq}
</update>
<insert id="createResearcherHasHousehold">
/* createResearcherHasHousehold : 임가에 담당 조사원 매핑 */
INSERT INTO researcher_has_household
(
id,
admin_seq,
household_seq,
<include refid="common.fields.CreateUpdateBaseColumns"/>
)
VALUES
(
nextval('researcher_has_household_seq'),
#{researcherSeq},
#{householdSeq},
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>
</mapper>

View File

@@ -149,47 +149,47 @@
</select>
</div>
</div>
<div class="input-group">
<div class="d-flex">
<div class="component-select">
<div class="input-label">
<p class="label-txt">
당일 1차 방문
</p>
</div>
<select class="select-list" name="isFirstVisited" th:field="*{isFirstVisited}">
<option value="">전체</option>
<option value="true">방문</option>
<option value="false">미방문</option>
</select>
</div>
<div class="component-select">
<div class="input-label">
<p class="label-txt">
당월 2차 방문
</p>
</div>
<select class="select-list" name="isSecondVisited" th:field="*{isSecondVisited}">
<option value="">전체</option>
<option value="true">방문</option>
<option value="false">미방문</option>
</select>
</div>
<div class="component-select">
<div class="input-label">
<p class="label-txt">
답례품 방문
</p>
</div>
<select class="select-list" name="isGiftSent" th:field="*{isGiftSent}">
<option value="">전체</option>
<option value="true">전달</option>
<option value="false">미전달</option>
</select>
</div>
</div>
</div>
<!-- TODO : 2차 오픈 -->
<!-- <div class="input-group">-->
<!-- <div class="d-flex">-->
<!-- <div class="component-select">-->
<!-- <div class="input-label">-->
<!-- <p class="label-txt">-->
<!-- 당일 1차 방문-->
<!-- </p>-->
<!-- </div>-->
<!-- <select class="select-list" name="isFirstVisited" th:field="*{isFirstVisited}">-->
<!-- <option value="">전체</option>-->
<!-- <option value="true">방문</option>-->
<!-- <option value="false">미방문</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="component-select">-->
<!-- <div class="input-label">-->
<!-- <p class="label-txt">-->
<!-- 당월 2차 방문-->
<!-- </p>-->
<!-- </div>-->
<!-- <select class="select-list" name="isSecondVisited" th:field="*{isSecondVisited}">-->
<!-- <option value="">전체</option>-->
<!-- <option value="true">방문</option>-->
<!-- <option value="false">미방문</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="component-select">-->
<!-- <div class="input-label">-->
<!-- <p class="label-txt">-->
<!-- 답례품 방문-->
<!-- </p>-->
<!-- </div>-->
<!-- <select class="select-list" name="isGiftSent" th:field="*{isGiftSent}">-->
<!-- <option value="">전체</option>-->
<!-- <option value="true">전달</option>-->
<!-- <option value="false">미전달</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<div class="input-group">
<div class="input-label">
@@ -265,9 +265,10 @@
<th>업종(대분류)</th>
<th>업종(중분류)</th>
<th>당월 일계부 현황</th>
<th>당월 1차 임가방문</th>
<th>당월 2차 임가방문</th>
<th>답례품 전달</th>
<!-- TODO : 2차 오픈 -->
<!-- <th>당월 1차 임가방문</th>-->
<!-- <th>당월 2차 임가방문</th>-->
<!-- <th>답례품 전달</th>-->
<th class="hide-role-researcher">조사원</th>
<th class="hide-role-researcher">조사원 휴대전화</th>
</tr>
@@ -281,7 +282,7 @@
<!-- 페이지네이션 -->
<div class="row paging"></div>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
@@ -343,9 +344,6 @@
<td>${ifNullHyphen(ct.industryLargeName)}</td><!-- 업종 대분류 -->
<td>${ifNullHyphen(ct.industryMiddleName)}</td><!-- 업종 중분류1 -->
<td>${ct.progressPercent}%</td><!-- 임가 진행 상황 -->
<td>${ifNullHyphen(ct.firstVisitDate)}</td><!-- 1차방문날짜 -->
<td>${ifNullHyphen(ct.secondVisitDate)}</td><!-- 2차방문날짜 -->
<td>${ct.isGiftSent ? "전달" : "미전달"}</td> <!-- 답례품 -->
<td class="hide-role-researcher">${ifNullHyphen(ct.researcherName)}</td> <!-- 조사원이름 -->
<td class="hide-role-researcher">${ifNullHyphen(ct.researcherPhone)}</td> <!-- 조사원번호 -->
</tr>
@@ -353,6 +351,32 @@
);
});
// `
// <tr>
// <td>
// <div class="component-input">
// <label class="checkbox-inner">
// <input type="checkbox" id="chkBox_${ct.householdSeq}" name="chkBox" value="${ct.householdSeq}">
// </label>
// </div>
// </td>
// <td class="underline"><a href="/household/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdNum}</a></td><!-- 임가번호 -->
// <td class="underline"><a href="/household/households/${ct.householdSeq}?recordMonth=${f.recordMonth.value}">${ct.householdName}</a></td><!-- 경영주 이름 -->
// <td>${ct.householdPhone}</td><!-- 경영주 번호 -->
// <td>${ct.regionMainName}</td><!-- 실사 -->
// <td>${ct.regionSubName}</td><!-- 지역 -->
// <td>${ct.regionDetailName}</td><!-- 세부지역 -->
// <td>${ifNullHyphen(ct.industryLargeName)}</td><!-- 업종 대분류 -->
// <td>${ifNullHyphen(ct.industryMiddleName)}</td><!-- 업종 중분류1 -->
// <td>${ct.progressPercent}%</td><!-- 임가 진행 상황 -->
// <td>${ifNullHyphen(ct.firstVisitDate)}</td><!-- 1차방문날짜 -->
// <td>${ifNullHyphen(ct.secondVisitDate)}</td><!-- 2차방문날짜 -->
// <td>${ct.isGiftSent ? "전달" : "미전달"}</td> <!-- 답례품 -->
// <td class="hide-role-researcher">${ifNullHyphen(ct.researcherName)}</td> <!-- 조사원이름 -->
// <td class="hide-role-researcher">${ifNullHyphen(ct.researcherPhone)}</td> <!-- 조사원번호 -->
// </tr>
// `
// 현재 로그인한 유저의 역할
const isResearcher = f.userRole.value === 'ROLE_RESEARCHER';
const colspanLength = isResearcher ? 13 : 15;
@@ -447,6 +471,10 @@
});
});
</script>
<script th:inline="javascript" th:if="${alertMessage != null}">
alert([[${alertMessage}]]);
</script>
</section>
</html>

View File

@@ -326,12 +326,12 @@
document.getElementById('researcherName').value = `${data.name}`;
const form = document.reqForm;
let input = form.querySelector('input[name="adminSeq"]');
let input = form.querySelector('input[name="researcherSeq"]');
if (!input) {
input = document.createElement('input');
input.type = 'hidden';
input.name = 'adminSeq';
input.name = 'researcherSeq';
form.appendChild(input);
}

View File

@@ -4,6 +4,8 @@
<section layout:fragment="content">
<form autocomplete="off" method="get" name="reqForm">
<input type="hidden" name="householdSeq" th:value="${householdInfo.householdSeq}">
<div class="content-inner">
<!-- 테이블 영역 -->
<table class="type-form">
@@ -15,11 +17,10 @@
<div class="component-input">
<div class="d-flex">
<div class="input-field">
<input type="number" name="householdNum" id="householdNum"
placeholder=""
oninput="numberMaxLengthChk(this, 5);">
<input type="number" name="householdNum" id="householdNum" placeholder=""
th:value="*{householdInfo.householdNum}" readonly>
</div>
<button type="button" class="btn" onclick="checkHouseholdNum();">
<button type="button" class="btn" disabled>
<span class="btn-txt">중복확인</span>
</button>
</div>
@@ -30,7 +31,9 @@
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="ownerName" name="ownerName" placeholder="" maxlength="10">
<input type="text" id="ownerName" name="ownerName" placeholder=""
maxlength="10"
th:value="*{householdInfo.householdName}">
</div>
</div>
</td>
@@ -39,6 +42,7 @@
<div class="component-input">
<div class="input-field">
<input type="number" id="ownerAge" name="ownerAge" placeholder=""
th:value="*{householdInfo.householdAge}"
oninput="numberMaxLengthChk(this, 3);">
</div>
</div>
@@ -51,34 +55,36 @@
<div class="component-select">
<select class="select-list" name="tel1">
<option value="" disabled hidden>선택해주세요.</option>
<option value="02">02</option>
<option value="031" selected>031</option>
<option value="032">032</option>
<option value="033">033</option>
<option value="041">041</option>
<option value="042">042</option>
<option value="043">043</option>
<option value="044">044</option>
<option value="051">051</option>
<option value="052">052</option>
<option value="053">053</option>
<option value="054">054</option>
<option value="055">055</option>
<option value="061">061</option>
<option value="062">062</option>
<option value="063">063</option>
<option value="064">064</option>
<option value="02" th:selected="${householdInfo.householdTel1 == '02'}">02</option>
<option value="031" th:selected="${householdInfo.householdTel1 == '031'}">031</option>
<option value="032" th:selected="${householdInfo.householdTel1 == '032'}">032</option>
<option value="033" th:selected="${householdInfo.householdTel1 == '033'}">033</option>
<option value="041" th:selected="${householdInfo.householdTel1 == '041'}">041</option>
<option value="042" th:selected="${householdInfo.householdTel1 == '042'}">042</option>
<option value="043" th:selected="${householdInfo.householdTel1 == '043'}">043</option>
<option value="044" th:selected="${householdInfo.householdTel1 == '044'}">044</option>
<option value="051" th:selected="${householdInfo.householdTel1 == '051'}">051</option>
<option value="052" th:selected="${householdInfo.householdTel1 == '052'}">052</option>
<option value="053" th:selected="${householdInfo.householdTel1 == '053'}">053</option>
<option value="054" th:selected="${householdInfo.householdTel1 == '054'}">054</option>
<option value="055" th:selected="${householdInfo.householdTel1 == '055'}">055</option>
<option value="061" th:selected="${householdInfo.householdTel1 == '061'}">061</option>
<option value="062" th:selected="${householdInfo.householdTel1 == '062'}">062</option>
<option value="063" th:selected="${householdInfo.householdTel1 == '063'}">063</option>
<option value="064" th:selected="${householdInfo.householdTel1 == '064'}">064</option>
</select>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="tel2" name="tel2" placeholder=""
th:value="*{householdInfo.householdTel2}"
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="tel3" name="tel3" placeholder=""
th:value="*{householdInfo.householdTel3}"
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
@@ -90,18 +96,20 @@
<div class="component-select">
<select class="select-list" name="phone1" required>
<option value="" disabled hidden>선택해주세요.</option>
<option value="010" selected>010</option>
<option value="010" th:selected="${householdInfo.householdPhone1 == '010'}">010</option>
</select>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" name="phone2" id="phone2" placeholder=""
th:value="*{householdInfo.householdPhone2}"
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" name="phone3" id="phone3" placeholder=""
th:value="*{householdInfo.householdPhone3}"
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
@@ -116,7 +124,9 @@
<option value="">전체</option>
<option th:each="item : ${regionMainList}"
th:value="${item.id}"
th:text="${item.codeText}">
th:text="${item.codeText}"
th:selected="${item.id == householdInfo.regionMainCode}">
</option>
</select>
</div>
</td>
@@ -127,7 +137,8 @@
<option value="">전체</option>
<option th:each="item : ${regionSubList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.regionSubCode}">
</select>
</div>
</td>
@@ -138,7 +149,8 @@
<option value="">전체</option>
<option th:each="item : ${regionDetailList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.regionDetailCode}">
</select>
</div>
</td>
@@ -148,7 +160,8 @@
<td>
<div class="component-input">
<div class="input-field">
<input type="text" name="address" id="address" placeholder="">
<input type="text" name="address" id="address" placeholder=""
th:value="*{householdInfo.address}">
</div>
</div>
</td>
@@ -161,7 +174,8 @@
<option value="">전체</option>
<option th:each="item : ${industryLargeList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.industryLargeCode}">
</select>
</div>
</td>
@@ -172,7 +186,8 @@
<option value="">전체</option>
<option th:each="item : ${industryMiddleList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
th:text="${item.codeValue + '. ' + item.codeText}"
th:selected="${item.id == householdInfo.industryMiddleCode}">
</select>
</div>
</td>
@@ -180,7 +195,9 @@
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="industrySubMiddle" name="industrySubMiddle" placeholder="" maxlength="20">
<input type="text" id="industrySubMiddle" name="industrySubMiddle"
placeholder="" maxlength="20"
th:value="${householdInfo.industrySubMiddle}">
</div>
</div>
</td>
@@ -190,7 +207,9 @@
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="industryDetail" name="industryDetail" placeholder="" maxlength="20">
<input type="text" id="industryDetail" name="industryDetail"
placeholder="" maxlength="20"
th:value="${householdInfo.industryDetail}">
</div>
</div>
</td>
@@ -201,7 +220,11 @@
<div class="d-flex">
<div class="component-input">
<div class="input-field">
<input type="text" name="researcherName" id="researcherName" placeholder="">
<input type="text" name="researcherName" id="researcherName"
placeholder=""
th:value="${householdInfo.researcherName}">
<input type="hidden" name="researcherSeq" id="researcherSeq"
th:value="${householdInfo.researcherSeq}">
</div>
</div>
<button type="button" class="btn" onclick="showResearcherModal();">
@@ -215,7 +238,8 @@
<td class="radio-group">
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="isPanel_Y" name="isPanel" value="true" checked>
<input type="radio" id="isPanel_Y" name="isPanel" value="true"
th:checked="${householdInfo.isPanel == true}">
<span class="radio-item">
<span class="radio-txt">유지</span>
</span>
@@ -223,10 +247,11 @@
</div>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="isPanel_N" name="isPanel" value="false">
<input type="radio" id="isPanel_N" name="isPanel" value="false"
th:checked="${householdInfo.isPanel == false}">
<span class="radio-item">
<span class="radio-txt">탈락</span>
</span>
<span class="radio-txt">탈락</span>
</span>
</label>
</div>
</td>
@@ -236,7 +261,9 @@
<td colspan="5">
<div class="component-input">
<div class="input-textarea-field">
<textarea id="memo" name="memo" class="textarea" placeholder=""></textarea>
<textarea id="memo" name="memo" class="textarea"
placeholder=""
th:value="${householdInfo.memo}"></textarea>
</div>
</div>
</td>
@@ -249,7 +276,7 @@
<button type="button" class="btn btn-secondary" onclick="location.href='/household/households'">
<span class="btn-txt">취소</span>
</button>
<button type="button" class="btn btn-primary" onclick="createHousehold();">
<button type="button" class="btn btn-primary" onclick="updateHousehold();">
<span class="btn-txt">등록</span>
</button>
</div>
@@ -262,7 +289,57 @@
<section layout:fragment="script">
<script th:inline="javascript">
// 임가 수정
const updateHousehold= () => {
const f = document.reqForm;
let dataOj = $(f).serializeObject();
ajaxUtil._ajaxMethod(
'/api/household/households/update',
JSON.stringify(dataOj),
function(response) { // 성공
alert("등록이 완료되었습니다.");
location.href = '/household/households';
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);
if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
},
'put',
'json',
{ handle422Type: 'alert' }
);
}
</script>
<script>
// 조사원 매핑 팝업의 선택된 조사원 가져오기.
const getSelectedResearcher = (data, closeModal) => {
document.getElementById('researcherName').value = `${data.name}`;
const form = document.reqForm;
let input = form.querySelector('input[name="researcherSeq"]');
if (!input) {
input = document.createElement('input');
input.type = 'hidden';
input.name = 'researcherSeq';
form.appendChild(input);
}
// adminSeq 값 세팅
input.value = data.adminSeq;
closeModal();
}
</script>
<script>
// 휴대폰번호 길이 체크
const numberMaxLengthChk = (el, number) => {
el.value = el.value.slice(0, number);
}
</script>
</section>

View File

@@ -27,7 +27,8 @@
<tr>
<th>가구 연락처</th>
<td>
<span th:text="${householdInfo.householdTel != null ? householdInfo.householdTel : '-'}">031-0000-0000</span>
<span
th:text="${householdInfo.householdTel != null && householdInfo.householdTel != '' ? householdInfo.householdTel : '-'}">031-0000-0000</span>
</td>
<th>휴대폰 번호</th>
<td>
@@ -57,31 +58,37 @@
<tr>
<th>업종 대분류</th>
<td>
<span th:text="${householdInfo.industryLargeName != null ? householdInfo.industryLargeName : '-'}">40. 수실류재배업</span>
<span
th:text="${householdInfo.industryLargeName != null && householdInfo.industryLargeName != '' ? householdInfo.industryLargeName : '-'}">40. 수실류재배업</span>
</td>
<th>업종 중분류1</th>
<td>
<span th:text="${householdInfo.industryMiddleName != null ? householdInfo.industryMiddleName : '-'}">42. 대추재배업</span>
<span
th:text="${householdInfo.industryMiddleName != null && householdInfo.industryMiddleName != '' ? householdInfo.industryMiddleName : '-'}">42. 대추재배업</span>
</td>
<th>업종 중분류2</th>
<td>
<span th:text="${householdInfo.industrySubMiddleName != null ? householdInfo.industrySubMiddleName : '-'}">52_1. 조경수</span>
<span
th:text="${householdInfo.industrySubMiddleName != null && householdInfo.industrySubMiddleName != '' ? householdInfo.industrySubMiddleName : '-'}">52_1. 조경수</span>
</td>
</tr>
<tr>
<th>규모/세부품목</th>
<td>
<span th:text="${householdInfo.industryDetailName != null ? householdInfo.industryDetailName : '-'}">52_1_1. 조경수</span>
<span
th:text="${householdInfo.industryDetailName != null && householdInfo.industryDetailName != '' ? householdInfo.industryDetailName : '-'}">52_1_1. 조경수</span>
</td>
</tr>
<tr>
<th>담당 조사원</th>
<td>
<span th:text="${householdInfo.researcherName != null ? householdInfo.researcherName : '-'}">김조사</span>
<span
th:text="${householdInfo.researcherName != null && householdInfo.researcherName != '' ? householdInfo.researcherName : '-'}">김조사</span>
</td>
<th>담당조사원 연락처</th>
<td>
<span th:text="${householdInfo.researcherPhone != null ? householdInfo.researcherPhone : '-'}">010-0000-0000</span>
<span
th:text="${householdInfo.researcherPhone != null && householdInfo.researcherPhone != '' ? householdInfo.researcherPhone : '-'}">010-0000-0000</span>
</td>
<th>유지여부</th>
<td class="radio-group">
@@ -97,7 +104,7 @@
</tbody>
</table>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}" onclick="showResearcherModal();">
<span class="btn-txt">조사원 매핑</span>
@@ -113,9 +120,9 @@
<div class="component-tab" data-active="tab1">
<div class="tab-head">
<button type="button" class="tab-label select-tab" data-tab-type="daily-record" data-tab-value="tab1">일계부 등록 현황</button>
<button type="button" class="tab-label select-tab" data-tab-type="forest-product" data-tab-value="tab2">임산물 현황</button>
<button type="button" class="tab-label select-tab" data-tab-type="bank-auto-transfer" data-tab-value="tab3">은행자동이체 내역</button>
<button type="button" class="tab-label select-tab" data-tab-type="household-visit" data-tab-value="tab4">임가방문정보</button>
<button type="button" class="tab-label select-tab" data-tab-type="forest-product" data-tab-value="tab2" th:unless="${activeProfile != 'local'}">임산물 현황</button>
<button type="button" class="tab-label select-tab" data-tab-type="bank-auto-transfer" data-tab-value="tab3" th:unless="${activeProfile != 'local'}">은행자동이체 내역</button>
<button type="button" class="tab-label select-tab" data-tab-type="household-visit" data-tab-value="tab4" th:unless="${activeProfile != 'local'}">임가방문정보</button>
<div class="component-select select-date">
<select class="select-list" name="recordMonth" required onchange="onRecordMonthChange();">
@@ -184,7 +191,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>수입 <strong>(<span id="incomeCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
@@ -224,7 +231,7 @@
<!-- 임업노동 투입 내역 -->
<section class="table-group">
<div class="table-tit-group">
<div class="table-tit-group" th:unless="${activeProfile != 'local'}">
<h3>임업노동 투입 내역 <strong>(<span id="workCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
@@ -278,7 +285,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>지출 <strong>(<span id="expenseCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">영수증 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
@@ -319,7 +326,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>동력사용시간 <strong>(<span id="powerCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
@@ -353,7 +360,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>자가임업 생산물 중 자가소비량 <strong>(<span id="forestryCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
@@ -389,7 +396,7 @@
<section class="table-group">
<div class="table-tit-group">
<h3>자가농업 생산물 중 자가소비량 <strong>(<span id="farmingCount">0</span>건)</strong></h3>
<div class="component-btns bottom-btn-group">
<div class="component-btns bottom-btn-group" th:unless="${activeProfile != 'local'}">
<div class="btns-row align-right">
<button type="button" class="btn small">
<span class="btn-txt">등록여부</span>
@@ -592,7 +599,7 @@
<span class="btn-txt">목록</span>
</button>
</div>
<div class="btns-col-2 align-right">
<div class="btns-col-2 align-right" th:unless="${activeProfile != 'local'}">
<button type="button" class="btn">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download" aria-hidden="true"></i></span>
</button>