Merge branch 'kangsun' into 'dev'

[BO] 임가 현황 - 임가 등록 작업 중 (5)

See merge request korea-research/korea-research!9
This commit is contained in:
이강선 매니저/ST
2025-06-15 13:08:41 +00:00
43 changed files with 1341 additions and 216 deletions

View File

@@ -0,0 +1,19 @@
package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut;
import java.util.Optional;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class CheckHouseholdNumDao implements CheckHouseholdNumPortOut {
private final CheckHouseholdNumMapper mapper;
@Override
public Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd) {
return mapper.checkHouseholdNum(cmd);
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.checkHouseholdNum.adapters.persistence;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import java.util.Optional;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CheckHouseholdNumMapper {
Optional<CheckHouseholdNum> checkHouseholdNum(CheckHouseholdNumCmd cmd);
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.checkHouseholdNum.adapters.web;
import app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model.CheckHouseholdNumReqVO;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequiredArgsConstructor
class CheckHouseholdNumController {
private final CheckHouseholdNumPortIn portIn;
@GetMapping(path = "/api/household/households/check")
ResponseEntity<CheckHouseholdNum> operate(
@Valid CheckHouseholdNumReqVO reqVO) {
return ResponseEntity.status(HttpStatus.OK)
.body(portIn.operate(new CheckHouseholdNumCmd(reqVO.getHouseholdNum())).orElse(null));
}
}

View File

@@ -0,0 +1,16 @@
package app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CheckHouseholdNumReqVO {
@NotEmpty
private String householdNum;
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.checkHouseholdNum.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CheckHouseholdNumResVO {
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports;
import java.util.Optional;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
public interface CheckHouseholdNumPortIn {
Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd);
}

View File

@@ -0,0 +1,9 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports;
import java.util.Optional;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
public interface CheckHouseholdNumPortOut {
Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd);
}

View File

@@ -0,0 +1,20 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports.application;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortOut;
import java.util.Optional;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class CheckHouseholdNumService implements CheckHouseholdNumPortIn {
private final CheckHouseholdNumPortOut portOut;
@Override
public Optional<CheckHouseholdNum> operate(CheckHouseholdNumCmd cmd) {
return portOut.operate(cmd);
}
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CheckHouseholdNum {
private Boolean isDuplicated; // 사용여부
}

View File

@@ -0,0 +1,14 @@
package app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CheckHouseholdNumCmd {
private String householdNum;
}

View File

@@ -0,0 +1,26 @@
package app.module.admin.usecase.household.createHousehold.adapters.persistence;
import app.module.core.config.application.annotation.CreateCommand;
import app.module.core.config.application.util.AuditUtil;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import lombok.RequiredArgsConstructor;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class CreateHouseholdDao implements CreateHouseholdPortOut {
private final CreateHouseholdMapper mapper;
@Override
@CreateCommand
public void operate(CreateHouseholdOutCmd outCmd) {
mapper.createHousehold(outCmd);
if(outCmd.getResearcherSeq() != null) {
mapper.createHouseholdHasRole(
AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds())));
}
}
}

View File

@@ -0,0 +1,11 @@
package app.module.admin.usecase.household.createHousehold.adapters.persistence;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateHouseholdMapper {
void createHousehold(CreateHouseholdOutCmd outCmd);
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
}

View File

@@ -0,0 +1,62 @@
package app.module.admin.usecase.household.createHousehold.adapters.web;
import app.module.core.config.application.util.MessageUtil;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
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.createHousehold.adapters.web.model.CreateHouseholdReqVO;
import app.module.admin.usecase.household.createHousehold.adapters.web.validator.CreateHouseholdValidator;
@RestController
@RequiredArgsConstructor
class CreateHouseholdController {
private final CreateHouseholdValidator validator;
private final CreateHouseholdPortIn createHouseholdPortIn;
private final MessageUtil messageUtil;
@PostMapping(path = "/api/household/households/create")
ResponseEntity<?> operate(
@Valid @RequestBody CreateHouseholdReqVO reqVO, BindingResult bindingResult) {
validator.validate(reqVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getAllErrors().get(0).getDefaultMessage());
}
createHouseholdPortIn.operate(
new CreateHouseholdInCmd(
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(messageUtil.getMessage("operation.common.save.done"));
}
}

View File

@@ -0,0 +1,37 @@
package app.module.admin.usecase.household.createHousehold.adapters.web.model;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode
public class CreateHouseholdReqVO {
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,13 @@
package app.module.admin.usecase.household.createHousehold.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateHouseholdResVO {
}

View File

@@ -0,0 +1,115 @@
package app.module.admin.usecase.household.createHousehold.adapters.web.validator;
import app.module.admin.usecase.household.createHousehold.adapters.web.model.CreateHouseholdReqVO;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
@Component
public class CreateHouseholdValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return CreateHouseholdReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
CreateHouseholdReqVO vo = (CreateHouseholdReqVO) target;
// 1. 임가번호
if (!StringUtils.hasText(vo.getHouseholdNum())) {
errors.reject("householdNum", "임가번호는 필수 입력 항목입니다.");
return;
}
if (StringUtils.hasText(vo.getHouseholdNum()) && vo.getHouseholdNum().length() < 5) {
errors.reject("householdNum", "임가번호는 5자리 숫자로 입력해주세요.");
return;
}
// 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. 가구 연락처
// TODO : 필수입력값 맞는지 체크
// if (!StringUtils.hasText(vo.getTel1()) || !StringUtils.hasText(vo.getTel2()) || !StringUtils.hasText(vo.getTel3())) {
// errors.reject("tel", "가구 연락처를 모두 입력해주세요.");
// return;
// }
// if (vo.getTel2().length() > 4 || vo.getTel3().length() > 4) {
// errors.reject("tel", "가구 연락처는 각 4자리까지 입력 가능합니다.");
// return;
// }
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.createHousehold.ports;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
public interface CreateHouseholdPortIn {
void operate(CreateHouseholdInCmd inCmd);
}

View File

@@ -0,0 +1,7 @@
package app.module.admin.usecase.household.createHousehold.ports;
import app.module.admin.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
public interface CreateHouseholdPortOut {
void operate(CreateHouseholdOutCmd outCmd);
}

View File

@@ -0,0 +1,61 @@
package app.module.admin.usecase.household.createHousehold.ports.application;
import app.module.admin.usecase.household.checkHouseholdNum.ports.CheckHouseholdNumPortIn;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum;
import app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNumCmd;
import app.module.admin.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
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 java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
@Service
@RequiredArgsConstructor
class CreateHouseholdService implements CreateHouseholdPortIn {
private final CreateHouseholdPortOut portOut;
private final BCryptPasswordEncoder passwordEncoder;
private final CheckHouseholdNumPortIn checkHouseholdNumPortIn;
@Override
public void operate(CreateHouseholdInCmd inCmd) {
// 임가번호 중복체크
if (!inCmd.getHouseholdNum().isEmpty()) {
checkHouseholdNumPortIn
.operate(new CheckHouseholdNumCmd(inCmd.getHouseholdNum()))
.filter(CheckHouseholdNum::getIsDuplicated)
.ifPresent(result -> {
throw new IllegalArgumentException("입력하신 번호는 중복입니다. 다른 임가번호를 입력해주세요.");
});
}
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")
));
}
}

View File

@@ -1,4 +1,4 @@
package app.module.core.usecase.household.createHousehold.ports.application.domain;
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;

View File

@@ -1,4 +1,4 @@
package app.module.core.usecase.household.createHousehold.ports.application.domain;
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
@@ -13,18 +13,21 @@ public class CreateHouseholdInCmd {
private String householdNum;
private String ownerName;
private Integer ownerAge;
private String tel;
private String phone;
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 Integer industryLargeCode;
private Integer industryMiddleCode;
private Integer industrySubMiddle;
private Integer industryDetail;
private Integer employmentCode;
private String industryLargeCode;
private String industryMiddleCode;
private String industrySubMiddle;
private String industryDetail;
private Long researcherSeq;
private Boolean isPanel;
private String memo;
private String dropReason;
}

View File

@@ -1,4 +1,4 @@
package app.module.core.usecase.household.createHousehold.ports.application.domain;
package app.module.admin.usecase.household.createHousehold.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import java.util.List;
@@ -23,13 +23,12 @@ public class CreateHouseholdOutCmd extends AuditCommand {
private String regionSubCode;
private String regionDetailCode;
private String address;
private Integer industryLargeCode;
private Integer industryMiddleCode;
private Integer industrySubMiddle;
private Integer industryDetail;
private Integer employmentCode;
private String industryLargeCode;
private String industryMiddleCode;
private String industrySubMiddle;
private String industryDetail;
private Long researcherSeq;
private Boolean isPanel;
private String memo;
private String dropReason;
private List<String> roleIds;
}

View File

@@ -0,0 +1,34 @@
package app.module.admin.usecase.household.createHouseholdUI.adapters.web;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Controller;
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;
@Controller
@RequiredArgsConstructor
class CreateHouseholdUIController {
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/household/households/create")
String operate(
Model model,
@ModelAttribute("reqVO") CreateHouseholdUIReqVO reqVO) {
// 실사
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

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.createHouseholdUI.adapters.web.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class CreateHouseholdUIReqVO {
}

View File

@@ -0,0 +1,24 @@
package app.module.admin.usecase.household.getRegionMainCodes;
import app.module.core.usecase.uicode.list.ports.UICodeListPortIn;
import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.GetMapping;
import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesReqVO;
import app.module.admin.usecase.household.getRegionMainCodes.model.GetRegionMainCodesResVO;
@RestController
@RequiredArgsConstructor
class GetRegionMainCodesController {
private final UICodeListPortIn uiCodeListPortIn;
@GetMapping(path = "/api/regionMainCodes")
ResponseEntity<List<UICodeElement>> operate() {
return ResponseEntity.status(HttpStatus.OK)
.body(uiCodeListPortIn.connect("code.region.main"));
}
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.getRegionMainCodes.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetRegionMainCodesReqVO {
}

View File

@@ -0,0 +1,13 @@
package app.module.admin.usecase.household.getRegionMainCodes.model;
import lombok.AllArgsConstructor;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
@EqualsAndHashCode
public class GetRegionMainCodesResVO {
}

View File

@@ -0,0 +1,12 @@
<?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.checkHouseholdNum.adapters.persistence.CheckHouseholdNumMapper">
<select id="checkHouseholdNum"
resultType="app.module.admin.usecase.household.checkHouseholdNum.ports.application.domain.CheckHouseholdNum">
SELECT COUNT(*) > 0 AS is_duplicated
FROM household
WHERE household_num = #{householdNum};
</select>
</mapper>

View File

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
<mapper
namespace="app.module.core.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper">
namespace="app.module.admin.usecase.household.createHousehold.adapters.persistence.CreateHouseholdMapper">
<insert id="createHousehold">
<selectKey keyProperty="seq" resultType="long" order="BEFORE">
@@ -14,42 +14,68 @@
household_num,
owner_name,
owner_age,
<if test="tel != null and tel != ''">
tel,
</if>
phone,
password,
region_main_code,
region_sub_code,
region_detail_code,
address,
<if test="industryLargeCode != null and industryLargeCode != ''">
industry_large_code,
</if>
<if test="industryMiddleCode != null and industryMiddleCode != ''">
industry_middle_code,
</if>
<if test="industrySubMiddle != null and industrySubMiddle != ''">
industry_sub_middle,
</if>
<if test="industryDetail != null and industryDetail != ''">
industry_detail,
employment_code,
</if>
<!-- <if test="employmentCode != null or employmentCode != ''">-->
<!-- employment_code,-->
<!-- </if>-->
is_panel,
<if test="memo != null and memo != ''">
memo,
drop_reason,
</if>
<include refid="common.fields.CreateUpdateBaseColumns"/>
) VALUES (
#{seq},
#{householdNum},
#{ownerName},
#{ownerAge},
<if test="tel != null and tel != ''">
#{tel},
</if>
#{phone},
#{encodedPassword},
#{regionMainCode},
#{regionSubCode},
#{regionDetailCode},
#{address},
<if test="industryLargeCode != null and industryLargeCode != ''">
#{industryLargeCode},
</if>
<if test="industryMiddleCode != null and industryMiddleCode != ''">
#{industryMiddleCode},
</if>
<if test="industrySubMiddle != null and industrySubMiddle != ''">
#{industrySubMiddle},
</if>
<if test="industryDetail != null and industryDetail != ''">
#{industryDetail},
#{employmentCode},
</if>
<!-- <if test="employmentCode != null or employmentCode != ''">-->
<!-- #{employmentCode},-->
<!-- </if>-->
#{isPanel},
<if test="memo != null and memo != ''">
#{memo},
#{dropReason},
</if>
<include refid="common.fields.CreateUpdateBaseValues"/>
)
</insert>

View File

@@ -7,36 +7,36 @@
resultType="app.module.admin.usecase.household.getDailyRecordsCount.ports.application.domain.GetDailyRecordsCount">
/* getDailyRecordsCount : 일계부 상태 요약 및 진행률 조회 */
WITH 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
),
record_status AS (
SELECT
CASE
/* 현재 월이고 오늘 이후인 경우만 WAITING */
WHEN mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING'
WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE'
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE'
WHEN dr.all_status IS NULL THEN 'EMPTY'
ELSE 'EMPTY'
END AS all_status
FROM daily_day_group ddg
CROSS JOIN month_check mc
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
SELECT
CASE
/* 현재 월이고 오늘 이후인 경우만 WAITING */
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'
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE'
WHEN dr.all_status IS NULL THEN 'EMPTY'
ELSE 'EMPTY'
END AS all_status
FROM daily_day_group ddg
CROSS JOIN month_check mc
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
)
SELECT
COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count,
COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count,
COUNT(*) FILTER (WHERE all_status = 'INCOMPLETE') AS incomplete_count,
COUNT(*) FILTER (WHERE all_status = 'WAITING') AS waiting_count,
ROUND(
100.0 *
COUNT(*) FILTER (WHERE all_status = 'DONE')
/ NULLIF(COUNT(*) FILTER (WHERE all_status != 'WAITING'), 0),
2
) AS progress_percent
COUNT(*) FILTER (WHERE all_status = 'DONE') AS done_count,
COUNT(*) FILTER (WHERE all_status = 'EMPTY') AS empty_count,
COUNT(*) FILTER (WHERE all_status = 'INCOMPLETE') AS incomplete_count,
COUNT(*) FILTER (WHERE all_status = 'WAITING') AS waiting_count,
ROUND(
100.0 *
COUNT(*) FILTER (WHERE all_status = 'DONE')
/ NULLIF(COUNT(*) FILTER (WHERE all_status != 'WAITING'), 0),
2
) AS progress_percent
FROM record_status
</select>
</mapper>

View File

@@ -33,23 +33,23 @@
dr.id AS id,
ddg.start_day || CASE WHEN ddg.start_day = ddg.end_day THEN '' ELSE '-' || ddg.end_day END AS day_group,
CASE
WHEN mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE) THEN 'WAITING' /* 대기 */
WHEN dr.all_status IN ('DONE', 'TODAY_NONE') THEN 'DONE' /* 작성완료 */
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */
ELSE 'EMPTY' /* 미작성 */
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' /* 작성완료 */
WHEN dr.all_status = 'WAITING' THEN 'INCOMPLETE' /* 미완료 */
ELSE 'EMPTY' /* 미작성 */
END AS all_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
fn_get_status(mc.is_current_month AND ddg.end_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.income_status, dc.income_cnt) AS income_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.work_status, dc.work_cnt) AS work_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.expense_status, dc.expense_cnt) AS expense_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.power_status, dc.power_cnt) AS power_status,
fn_get_status(mc.is_current_month AND ddg.start_day > EXTRACT(DAY FROM CURRENT_DATE), dr.forestry_status, dc.forestry_cnt) AS forestry_status
-- TODO : 농업 자가소비량 테이블 수정 후 추가
FROM daily_day_group ddg
CROSS JOIN month_check mc
LEFT JOIN daily_record dr ON ddg.group_no = dr.day_group_no
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
AND dr.household_seq = #{householdSeq}
AND dr.record_month = #{recordMonth}
AND dr.is_deleted = false
LEFT JOIN data_counts dc ON dc.id = dr.id
ORDER BY ddg.start_day
</select>

View File

@@ -180,6 +180,7 @@
</if>
</where>
ORDER BY hvr.householdNum ASC
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
</select>
</mapper>

View File

@@ -110,7 +110,7 @@ var ajaxUtil = {
/**
* ajax 공통 처리
*/
_ajaxMethod : function (url, jsonObj, successCallback, errorCallback, method, dataType, async) {
_ajaxMethod : function (url, jsonObj, successCallback, errorCallback, method, dataType, options = {}, async) {
if (typeof ENV != 'undefined' && typeof ENV.submitted == 'boolean') {
ENV.submitted = true;
}
@@ -148,21 +148,31 @@ var ajaxUtil = {
kri.logger.error('statusCode: 403');
},
422:function(rstData, status) {
console.log(rstData)
$(rstData.responseJSON).each((idx, oj) => {
// TODO : form id? or body
let target = $('body').find('[name=' + oj.field + ']');
target.addClass('is-invalid');
target.parent().find('.invalid-feedback').text(oj.defaultMessage);
});
if ($('.invalid-feedback').length === 0) {
let fieldErrors = rstData.responseJSON != null ? rstData.responseJSON : null;
if (fieldErrors != null && fieldErrors.length > 0) {
ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');
console.log(rstData);
// options type : 1. alert, 2. field
if (options.handle422Type === 'alert') {
if (typeof errorCallback !== 'undefined') {
errorCallback(422, rstData); // 호출한 쪽에서 alert 처리
}
return;
}
if (options.handle422Type === 'field' || !options.handle422Type) {
$(rstData.responseJSON).each((idx, oj) => {
// TODO : form id? or body
let target = $('body').find('[name=' + oj.field + ']');
target.addClass('is-invalid');
target.parent().find('.invalid-feedback').text(oj.defaultMessage);
});
if ($('.invalid-feedback').length === 0) {
let fieldErrors = rstData.responseJSON != null ? rstData.responseJSON : null;
if (fieldErrors != null && fieldErrors.length > 0) {
ajaxUtil._alert(fieldErrors[0].defaultMessage, '유효성 체크');
}
}
}
},
500:function(rstData){

View File

@@ -0,0 +1,244 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<div class="layer-wrap" th:fragment="modalFragment">
<form autocomplete="off" method="get" name="reqResearcherForm">
<input name="page" value="0" type="hidden"/>
<div class="component-modal mypage-wrap modal01" data-props-dimm-click="true" data-state="close">
<div class="modal-dimm"></div>
<div class="modal-frame">
<div class="modal-container">
<div class="modal-header">
<h3 class="modal-tit">
조사원 매핑
</h3>
</div>
<div class="modal-content">
<div class="modal-content-inner">
<section class="filter-wrap">
<div class="form-area">
<!-- 조사원 -->
<div class="input-group">
<div class="input-label">
<p class="label-txt">
조사원
</p>
</div>
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="searchField" required>
<option value="" disabled hidden>선택해주세요.</option>
<option value="" selected>전체</option>
<option value="name">이름</option>
<option value="phone">전화번호</option>
</select>
</div>
<div class="component-input">
<div class="input-field">
<input type="text" id="searchField" name="searchValue" placeholder="">
</div>
</div>
</div>
</div>
<div class="input-group">
<div class="d-flex">
<div class="component-select">
<div class="input-label">
<p class="label-txt">
실사
</p>
</div>
<select class="select-list" name="searchArea" id="regionMainCodeSelect" required>
<option value="" disabled hidden>선택해주세요.</option>
<option value="" selected>전체</option>
<!-- ajax 호출 -->
</select>
</div>
</div>
</div>
</div>
<!-- 버튼 그룹 -->
<div class="component-btns">
<div class="btns-row">
<button type="button" class="btn">
<span class="btn-txt">초기화</span>
</button>
<button type="button" class="btn btn-primary">
<span class="btn-txt">검색</span>
</button>
</div>
</div>
</section>
<section>
<!-- 테이블 영역 -->
<table>
<thead>
<tr>
<th>
</th>
<th>조사원명</th>
<th>전화번호</th>
<th>실사</th>
<th>담당임가 수</th>
</tr>
</thead>
<tbody id="listTBody">
<tr>
<td>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="temp_radio_0001" name="temp_radio_0001">
</label>
</div>
</td>
<td>홍길동</td>
<td>010-0000-0000</td>
<td>서울</td>
<td>40</td>
</tr>
<tr>
<td>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="temp_radio_0002" name="temp_radio_0002">
</label>
</div>
</td>
<td>홍길동</td>
<td>010-0000-0000</td>
<td>서울</td>
<td>40</td>
</tr>
<tr>
<td>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="temp_radio_0003" name="temp_radio_0003">
</label>
</div>
</td>
<td>홍길동</td>
<td>010-0000-0000</td>
<td>서울</td>
<td>40</td>
</tr>
</tbody>
</table>
<!-- 페이지네이션 -->
<div class="row paging"></div>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<button type="button" class="btn btn-primary">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</section>
</div>
</div>
<button class="modal-close"></button>
</div>
</div>
</div>
</form>
<script th:inline="javascript">
const showResearcherModal = () => {
document.querySelector(".modal01").ui.open();
// 실사 공통코드 가져오기
ajaxUtil._ajaxMethod(
'/api/regionMainCodes',
{},
(response) => {
const select = document.getElementById('regionMainCodeSelect');
response.forEach(item => {
const option = document.createElement('option');
option.value = item.id;
option.textContent = item.codeText;
select.appendChild(option);
});
},
function (code, rstData) {
console.log("error : ", code);
},
'get',
'json'
);
}
const getResearchers = (pageNo) => {
const f = document.reqResearcherForm;
f.page.value = pageNo;
let dataOj = $(f).serializeObject();
ajaxUtil._ajaxMethod(
'/api/mapping/researchers',
dataOj,
function (response) {
$('#totalElements').text(response.totalElements);
// List 구성하기
const tbody = $('#listTBody');
tbody.empty();
$(response.content).each((idx, ct) => {
tbody.append(
`
<!-- <tr>-->
<!-- <td>-->
<!-- <div class="component-input">-->
<!-- <label class="radio-inner">-->
<!-- <input type="radio" id="temp_radio_0003" name="temp_radio_0003">-->
<!-- </label>-->
<!-- </div>-->
<!-- </td>-->
<!-- <td>홍길동</td>-->
<!-- <td>010-0000-0000</td>-->
<!-- <td>서울</td>-->
<!-- <td>40</td>-->
<!-- </tr>-->
`
);
});
if (!$(response.content).length) {
tbody.append(`
<tr>
<td colspan="5" class="text-center text-muted">조사원이 존재하지 않습니다.</td>
</tr>
`);
}
// Pagination 구성하기
const paging = $('.paging');
paging.empty();
paging.append(
uiUtil.getPagingUI(pageNo, f.size.value, response.totalPages,
(movePageNo) => {
f.page.value = movePageNo;
goSearch();
}));
},
function (code, rstData) {
},
'get',
'json',
null
);
}
</script>
</div>
</html>

View File

@@ -223,7 +223,7 @@
<select class="select-list" name="isPanel" th:field="*{isPanel}">
<option value="">전체</option>
<option value="true">유지</option>
<option value="false">비유지</option>
<option value="false">탈락</option>
</select>
</div>
</div>
@@ -286,10 +286,13 @@
<button type="button" class="btn">
<span class="btn-txt">엑셀 다운로드 <i class="ico-download ico-small" aria-hidden="true"></i></span>
</button>
<button type="button" class="btn">
<!-- 관리자만 노출 -->
<button type="button" class="btn" th:if="${userRole == 'ROLE_ADMIN'}"
onclick="location.href='/household/households/create'">
<span class="btn-txt">임가 등록</span>
</button>
<button type="button" class="btn">
<!-- 관리자, 지방실사만 노출 -->
<button type="button" class="btn" th:if="${userRole != 'ROLE_RESEARCHER'}">
<span class="btn-txt">조사원 매핑</span>
</button>
</div>
@@ -297,32 +300,26 @@
</div>
</form>
<div>
<!-- <button>엑셀 다운로드</button>-->
<!-- <button>임가 등록</button>-->
<!-- <button>조사원 매핑</button>-->
</div>
</section>
<section layout:fragment="script">
<script th:inline="javascript">
// TODO : ajax 공통화 작업 후 수정해야
// 임가 목록 조회
const getHouseholds = (pageNo) => {
const f = document.reqForm;
f.page.value = pageNo;
let dataOj = $(f).serializeObject();
$.ajax({
method: 'GET',
url: '/api/household/households',
data: dataOj,
success(response) {
ajaxUtil._ajaxMethod(
'/api/household/households',
dataOj,
function(response) { // 성공
console.log("response", response);
$('#totalElements').text(response.totalElements);
// List 구성하기
const tbody = $('#listTBody');
tbody.empty();
@@ -356,21 +353,22 @@
);
});
// 현재 로그인한 유저의 역할
const isResearcher = f.userRole.value === 'ROLE_RESEARCHER';
const colspanLength = isResearcher ? 13 : 15;
// 조사원일 경우 조사원이름, 번호 칼럼 hide
$('.hide-role-researcher').toggle(!isResearcher);
// nodata 처리
if (!$(response.content).length) {
tbody.append(`
<tr>
<td colspan="15" class="text-center text-muted">게시물이 존재하지 않습니다.</td>
<td colspan="${colspanLength}" class="text-center text-muted">임가정보가 존재하지 않습니다.</td>
</tr>
`);
}
// 조사원일 경우 조사원이름, 번호 hide
if (f.userRole.value === 'ROLE_RESEARCHER') {
$('.hide-role-researcher').hide();
} else {
$('.hide-role-researcher').show();
}
// Pagination 구성하기
const paging = $('.paging');
paging.empty();
@@ -380,9 +378,13 @@
f.page.value = movePageNo;
goSearch();
}));
}
})
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
// 최초 리스트 로드

View File

@@ -0,0 +1,330 @@
<!DOCTYPE html>
<html xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" xmlns:th="http://www.thymeleaf.org"
layout:decorate="~{layout/layout}">
<section layout:fragment="content">
<form autocomplete="off" method="get" name="reqForm">
<div class="content-inner">
<!-- 테이블 영역 -->
<table class="type-form">
<tbody>
<tr>
<th>임가번호<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="d-flex">
<div class="component-input">
<div class="d-flex">
<div class="input-field">
<input type="number" name="householdNum" id="householdNum"
placeholder=""
oninput="numberMaxLengthChk(this, 5);">
</div>
<button type="button" class="btn" onclick="checkHouseholdNum();">
<span class="btn-txt">중복확인</span>
</button>
</div>
</div>
</div>
</td>
<th>경영주명<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="ownerName" name="ownerName" placeholder="" maxlength="10">
</div>
</div>
</td>
<th>연령(만 나이)<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="number" id="ownerAge" name="ownerAge" placeholder=""
oninput="numberMaxLengthChk(this, 3);">
</div>
</div>
</td>
</tr>
<tr>
<th>가구 연락처</th>
<td>
<div class="d-flex">
<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>
</select>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="tel2" name="tel2" placeholder=""
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" id="tel3" name="tel3" placeholder=""
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
</div>
</td>
<th>휴대폰 번호<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="d-flex">
<div class="component-select">
<select class="select-list" name="phone1" required>
<option value="" disabled hidden>선택해주세요.</option>
<option value="010" selected>010</option>
</select>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" name="phone2" id="phone2" placeholder=""
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
<div class="component-input">
<div class="input-field">
<input type="number" name="phone3" id="phone3" placeholder=""
oninput="numberMaxLengthChk(this, 4);">
</div>
</div>
</div>
</td>
</tr>
<tr>
<th>실사<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionMainCode" required>
<option value="">전체</option>
<option th:each="item : ${regionMainList}"
th:value="${item.id}"
th:text="${item.codeText}">
</select>
</div>
</td>
<th>지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionSubCode" required>
<option value="">전체</option>
<option th:each="item : ${regionSubList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
<th>세부 지역<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-select">
<select class="select-list" name="regionDetailCode" required>
<option value="">전체</option>
<option th:each="item : ${regionDetailList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
</tr>
<tr>
<th>전체 주소<i class="ico-required-mark" role="img" aria-label="필수">*</i></th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" name="address" id="address" placeholder="">
</div>
</div>
</td>
</tr>
<tr>
<th>업종 대분류</th>
<td>
<div class="component-select">
<select class="select-list" name="industryLargeCode">
<option value="">전체</option>
<option th:each="item : ${industryLargeList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
<th>업종 중분류1</th>
<td>
<div class="component-select">
<select class="select-list" name="industryMiddleCode">
<option value="">전체</option>
<option th:each="item : ${industryMiddleList}"
th:value="${item.id}"
th:text="${item.codeValue + '. ' + item.codeText}">
</select>
</div>
</td>
<th>업종 중분류2</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="industrySubMiddle" name="industrySubMiddle" placeholder="" maxlength="20">
</div>
</div>
</td>
</tr>
<tr>
<th>세부품목</th>
<td>
<div class="component-input">
<div class="input-field">
<input type="text" id="industryDetail" name="industryDetail" placeholder="" maxlength="20">
</div>
</div>
</td>
</tr>
<tr>
<th>담당 조사원</th>
<td>
<div class="d-flex">
<div class="component-input">
<div class="input-field">
<input type="text" name="researcherSeq" id="researcherSeq" placeholder="">
</div>
</div>
<button type="button" class="btn" onclick="showResearcherModal();">
<span class="btn-txt">검색</span>
</button>
</div>
</td>
</tr>
<tr>
<th>유지 여부</th>
<td class="radio-group">
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="isPanel_Y" name="isPanel" value="true" checked>
<span class="radio-item">
<span class="radio-txt">유지</span>
</span>
</label>
</div>
<div class="component-input">
<label class="radio-inner">
<input type="radio" id="isPanel_N" name="isPanel" value="false">
<span class="radio-item">
<span class="radio-txt">탈락</span>
</span>
</label>
</div>
</td>
</tr>
<tr>
<th>비고</th>
<td colspan="5">
<div class="component-input">
<div class="input-textarea-field">
<textarea id="memo" name="memo" class="textarea" placeholder=""></textarea>
</div>
</div>
</td>
</tr>
</tbody>
</table>
<div class="component-btns bottom-btn-group">
<div class="btns-row align-right">
<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();">
<span class="btn-txt">등록</span>
</button>
</div>
</div>
</div>
</form>
<div th:replace="common/modal-researcher-mapping :: modalFragment"></div>
</section>
<section layout:fragment="script">
<script th:inline="javascript">
// 임가번호 중복확인 변수
let checkDuplicate = false;
// 임가번호 중복확인
const checkHouseholdNum = () => {
const f = document.reqForm;
ajaxUtil._ajaxMethod(
'/api/household/households/check',
{ householdNum : f.householdNum.value },
function(response) { // 성공
const message = response.isDuplicated
? "입력하신 번호는 중복입니다. 다른 임가번호를 입력해주세요."
: "사용 가능합니다.";
alert(message);
// 중복이 아니어야 (false여야) 사용 가능
checkDuplicate = !response.isDuplicated;
},
function (code, rstData) { // 실패
console.log("error : ", code);
if(code == 400) alert("임가번호를 입력해주세요.");
},
'get',
'json'
);
}
</script>
<script>
// 임가등록
const createHousehold = () => {
if(!checkDuplicate) {
alert("임가번호 중복확인을 해주세요.");
return;
}
const f = document.reqForm;
let dataOj = $(f).serializeObject();
ajaxUtil._ajaxMethod(
'/api/household/households/create',
JSON.stringify(dataOj),
function(response) { // 성공
console.log("임가저장 결과 : ", response);
},
function (code, rstData) {
if(code == 422) alert(rstData.responseText);
if(code == 400) alert(rstData.responseJSON.message); //임가번호 중복체크
},
'post',
'json',
{ handle422Type: 'alert' }
);
}
</script>
<script>
// 휴대폰번호 길이 체크
const numberMaxLengthChk = (el, number) => {
el.value = el.value.slice(0, number);
}
</script>
</section>
</html>

View File

@@ -27,7 +27,7 @@
<tr>
<th>가구 연락처</th>
<td>
<span th:text="${householdInfo.householdTel}">031-0000-0000</span>
<span th:text="${householdInfo.householdTel != null ? householdInfo.householdTel : '-'}">031-0000-0000</span>
</td>
<th>휴대폰 번호</th>
<td>
@@ -57,11 +57,11 @@
<tr>
<th>업종 대분류</th>
<td>
<span th:text="${householdInfo.industryLargeName}">40. 수실류재배업</span>
<span th:text="${householdInfo.industryLargeName != null ? householdInfo.industryLargeName : '-'}">40. 수실류재배업</span>
</td>
<th>업종 중분류1</th>
<td>
<span th:text="${householdInfo.industryMiddleName}">42. 대추재배업</span>
<span th:text="${householdInfo.industryMiddleName != null ? householdInfo.industryMiddleName : '-'}">42. 대추재배업</span>
</td>
<th>업종 중분류2</th>
<td>
@@ -91,7 +91,7 @@
<tr>
<th>비고</th>
<td class="radio-group">
<span th:text="${householdInfo.memo != null ? householdInfo.memo : '-'}">-</span>
<span th:text="${householdInfo.memo != null && householdInfo.memo != '' ? householdInfo.memo : '-'}">-</span>
</td>
</tr>
</tbody>
@@ -375,14 +375,13 @@
const getDailyRecords = () => {
const f = document.reqForm;
$.ajax({
method: 'GET',
url: '/api/household/dailyRecordsStatus',
data: {
ajaxUtil._ajaxMethod(
'/api/household/dailyRecordsStatus',
{
householdSeq: f.householdSeq.value,
recordMonth: f.recordMonth.value
},
success(response) {
function(response) { // 성공
console.log("일계부 현황 리스트 조회 : ", response);
const listArea = $('.tab-content .daily-record-list');
const detailArea = $('.tab-content .daily-record-detail');
@@ -420,8 +419,13 @@
});
tbody.append(tmpl);
}
});
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
// 임산물 등록 현황 상세
@@ -438,22 +442,26 @@
listArea.hide();
detailArea.show();
$.ajax({
method: 'GET',
url: '/api/household/dailyRecordStatus',
data: {
ajaxUtil._ajaxMethod(
'/api/household/dailyRecordStatus',
{
householdSeq: f.householdSeq.value,
recordSeq: id,
recordMonth: f.recordMonth.value
},
success(response) {
function(response) { // 성공
console.log("일계부 등록 상세 데이터~ : ", response);
gridIncomeTable(response.incomes);
gridExpenseTable(response.expenses);
gridPowerTable(response.powers);
gridForestryTable(response.forestries);
}
});
},
function (code, rstData) { // 실패
console.log("error : ", code);
},
'get',
'json'
);
}
// 수입 테이블 그리기

View File

@@ -1,7 +1,5 @@
package app.module.core.config.adapters.persistence.initData;
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
@@ -16,8 +14,6 @@ import org.springframework.stereotype.Component;
@Order(5)
public class InitFrontUserData implements ApplicationRunner {
private final CreateHouseholdPortIn createHouseholdPortIn;
@Value("${app.initData.core}")
private boolean isCoreDataRequired;

View File

@@ -1,24 +0,0 @@
package app.module.core.usecase.household.createHousehold.adapters.persistence;
import app.module.core.config.application.annotation.CreateCommand;
import app.module.core.config.application.util.AuditUtil;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import lombok.RequiredArgsConstructor;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
import org.springframework.stereotype.Repository;
@Repository
@RequiredArgsConstructor
class CreateHouseholdDao implements CreateHouseholdPortOut {
private final CreateHouseholdMapper mapper;
@Override
@CreateCommand
public void operate(CreateHouseholdOutCmd outCmd) {
mapper.createHousehold(outCmd);
mapper.createHouseholdHasRole(
AuditUtil.create(new CreateHouseholdHasRoleCmd(outCmd.getSeq(), outCmd.getRoleIds())));
}
}

View File

@@ -1,11 +0,0 @@
package app.module.core.usecase.household.createHousehold.adapters.persistence;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdHasRoleCmd;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface CreateHouseholdMapper {
void createHousehold(CreateHouseholdOutCmd outCmd);
void createHouseholdHasRole(CreateHouseholdHasRoleCmd cmd);
}

View File

@@ -1,7 +0,0 @@
package app.module.core.usecase.household.createHousehold.ports;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
public interface CreateHouseholdPortIn {
void operate(CreateHouseholdInCmd inCmd);
}

View File

@@ -1,7 +0,0 @@
package app.module.core.usecase.household.createHousehold.ports;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
public interface CreateHouseholdPortOut {
void operate(CreateHouseholdOutCmd outCmd);
}

View File

@@ -1,45 +0,0 @@
package app.module.core.usecase.household.createHousehold.ports.application;
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortIn;
import app.module.core.usecase.household.createHousehold.ports.CreateHouseholdPortOut;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdInCmd;
import app.module.core.usecase.household.createHousehold.ports.application.domain.CreateHouseholdOutCmd;
import java.util.List;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
class CreateHouseholdService implements CreateHouseholdPortIn {
private final CreateHouseholdPortOut portOut;
private final BCryptPasswordEncoder passwordEncoder;
@Override
public void operate(CreateHouseholdInCmd inCmd) {
portOut.operate(new CreateHouseholdOutCmd(
null,
inCmd.getHouseholdNum(),
inCmd.getOwnerName(),
inCmd.getOwnerAge(),
inCmd.getTel(),
inCmd.getPhone(),
passwordEncoder.encode(StringUtils.right(inCmd.getPhone(), 4)), // 비밀번호 핸드폰 뒤 네자리
inCmd.getRegionMainCode(),
inCmd.getRegionSubCode(),
inCmd.getRegionDetailCode(),
inCmd.getAddress(),
inCmd.getIndustryLargeCode(),
inCmd.getIndustryMiddleCode(),
inCmd.getIndustrySubMiddle(),
inCmd.getIndustryDetail(),
inCmd.getEmploymentCode(),
inCmd.getIsPanel(),
inCmd.getMemo(),
inCmd.getDropReason(),
List.of("ROLE_GENERAL")
));
}
}