[BO] 일계부 노동투입 등록, 수정

This commit is contained in:
김현주
2025-07-01 10:40:28 +09:00
parent e5e941c397
commit 2d67455a06
21 changed files with 1013 additions and 11 deletions

View File

@@ -4,6 +4,8 @@ import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapte
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.SaveDailyIncomeCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain.GetDailyIncomeCmd;
import app.module.core.config.application.annotation.CreateCommand;
import app.module.core.config.application.annotation.UpdateCommand;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -20,6 +22,7 @@ public class SaveDailyIncomeDao implements SaveDailyIncomePortOut {
return dailyIncomeMapper.getDailyIncome(command);
}
@CreateCommand
@Override
public void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command) {
Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);

View File

@@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
public class SaveDailyIncomeController {
private final DailyRecordPortIn dailyRecordPortIn;
private final SaveDailyIncomePortIn dailyIncomePortIn;
private final SaveDailyIncomeValidator sailyIncomeValidator;
private final SaveDailyIncomeValidator dailyIncomeValidator;
/**
* 일계부 수입 조회
@@ -53,7 +53,7 @@ public class SaveDailyIncomeController {
@PostMapping(path = "/save")
ResponseEntity<?> create(@Valid @RequestBody SaveDailyIncomeReqVO formVO, BindingResult bindingResult) {
sailyIncomeValidator.validate(formVO, bindingResult);
dailyIncomeValidator.validate(formVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());

View File

@@ -38,7 +38,7 @@ public class SaveDailyIncomeService implements SaveDailyIncomePortIn {
formVO.getHouseholdSeq(),
formVO.getId());
SaveDailyIncomeCmd command = AuditUtil.create(
SaveDailyIncomeCmd command =
new SaveDailyIncomeCmd(
formVO.getId(),
formVO.getDailyId(),
@@ -53,7 +53,7 @@ public class SaveDailyIncomeService implements SaveDailyIncomePortIn {
formVO.getUnitCode(),
formVO.getUnitSelf(),
formVO.getPrice(),
formVO.getEstimatedValue()));
formVO.getEstimatedValue());
portOut.create(findCmd, command);

View File

@@ -0,0 +1,40 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut;
import app.module.core.config.application.annotation.CreateCommand;
import app.module.core.config.application.annotation.UpdateCommand;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@Slf4j
@Service
@RequiredArgsConstructor
public class SaveDailyWorkDao implements SaveDailyWorkPortOut {
private final SaveDailyWorkMapper dailyWorkMapper;
@Override
public GetDailyWorkDto detail(GetDailyWorkCmd command) {
return dailyWorkMapper.getDailyWork(command);
}
@CreateCommand
@Override
public void create(GetDailyWorkCmd findCmd, SaveDailyWorkCmd command) {
Integer existCount = dailyWorkMapper.getRecordExistCount(findCmd);
if (existCount == 0) {
dailyWorkMapper.createDailyWork(command);
log.debug("[CreateDailyWork] command={}", command);
} else {
dailyWorkMapper.updateDailyWork(command);
log.debug("[UpdateDailyWork] command={}", command);
}
}
}

View File

@@ -0,0 +1,39 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd;
import org.apache.ibatis.annotations.Mapper;
@Mapper
public interface SaveDailyWorkMapper {
/**
* 일계부 노동투입 데이터 조회
*
* @param command 검색 조건
* @return 노동투입 데이터
*/
GetDailyWorkDto getDailyWork(GetDailyWorkCmd command);
/**
* 일계부 노동투입 데이터 존재 여부
*
* @param command 검색 조건
* @return 중복 개수
*/
Integer getRecordExistCount(GetDailyWorkCmd command);
/**
* 일계부 노동투입 등록
*
* @param command 등록 데이터
*/
void createDailyWork(SaveDailyWorkCmd command);
/**
* 일계부 노동투입 수정
*
* @param command 수정 데이터
*/
void updateDailyWork(SaveDailyWorkCmd command);
}

View File

@@ -0,0 +1,34 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal;
import app.module.core.config.application.enums.DailyInputType;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class GetDailyWorkDto {
private Long id;
private Long dailyRecordSeq;
private String itemName;
private String itemMark;
private String workName;
private String workMark;
private String workLandArea;
private String areaUnitCode;
private String areaUnitLabel;
private String areaUnitSelf;
private String harvestQuantity;
private String harvestUnitCode;
private String harvestUnitLabel;
private String harvestUnitSelf;
private String ownerTime;
private String spouseTime;
private String familyMHours;
private String familyFHours;
private String hiredMHours;
private String hiredFHours;
private String sharedMHours;
private String sharedFHours;
private String volunteerMHours;
private String volunteerFHours;
}

View File

@@ -0,0 +1,87 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.DailyWorkUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.validator.SaveDailyWorkValidator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortIn;
import app.module.core.config.application.exception.NoRecordDataException;
import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.validation.BindingResult;
import org.springframework.web.bind.annotation.*;
@Slf4j
@RestController
@RequiredArgsConstructor
@RequestMapping(path = "/api/household/daily/work")
public class SaveDailyWorkController {
private final DailyRecordPortIn dailyRecordPortIn;
private final SaveDailyWorkPortIn dailyWorkPortIn;
private final SaveDailyWorkValidator dailyWorkValidator;
/**
* 일계부 노동투입 조회
*
* @param id 노동투입 일련번호
* @param reqVO 검색 조건
*/
@GetMapping(path = "/{id}")
ResponseEntity<?> detail(@PathVariable("id") String id, @ModelAttribute DailyWorkUIReqVO reqVO) {
reqVO.setId(Long.parseLong(id));
GetDailyWorkDto detail = dailyWorkPortIn.detail(reqVO);
if (detail == null) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null);
}
return ResponseEntity.status(HttpStatus.OK).body(detail);
}
/**
* 일계부 노동투입 등록 처리
*
* @param formVO 입력 데이터
* @param bindingResult BindingResult
*/
@PostMapping(path = "/save")
ResponseEntity<?> create(@Valid @RequestBody SaveDailyWorkReqVO formVO, BindingResult bindingResult) {
dailyWorkValidator.validate(formVO, bindingResult);
if (bindingResult.hasErrors()) {
return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY)
.body(bindingResult.getFieldErrors());
}
DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId());
formVO.setSearchMonth(dailyRecord.getRecordMonth());
formVO.setGroupNo(dailyRecord.getGroupNo());
formVO.setDailyId(dailyRecord.getId());
log.debug("formVO: {}", formVO);
dailyWorkPortIn.create(formVO);
return ResponseEntity.status(HttpStatus.OK).body(formVO);
}
/**
* 일계부 유효성 체크 및 데이터 조회
*
* @param dailyRecordSeq 항목 일련번호
*/
private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) {
DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq);
if (dailyRecord == null || dailyRecord.getId() == null) {
throw new NoRecordDataException();
}
return dailyRecord;
}
}

View File

@@ -0,0 +1,30 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
public class DailyWorkUIReqVO {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
/**
* 일계부 항목 일련번호
*/
private Long dailyId;
/**
* 노동투입 일련번호
*/
private Long id;
}

View File

@@ -0,0 +1,86 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model;
import jakarta.validation.constraints.NotBlank;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@ToString(callSuper = true)
public class SaveDailyWorkReqVO extends DailyWorkUIReqVO {
/**
* 품목명
*/
@NotBlank(message = "품목명을 입력해 주세요.")
private String itemName;
/**
* 작업명
*/
@NotBlank(message = "작업명을 입력해 주세요.")
private String workName;
/**
* 작업 면적
*/
private Double workLandArea;
/**
* 작업 면적 단위 코드
*/
private String areaUnitCode;
/**
* 작업 면적 단위 직업입력
*/
private String areaUnitSelf;
/**
* 수확량
*/
private Double harvestQuantity;
/**
* 수확량 단위 코드
*/
private String harvestUnitCode;
/**
* 수확량 단위 직접입력
*/
private String harvestUnitSelf;
/**
* 경영주 시간
*/
private Double ownerTime;
/**
* 배우자 시간
*/
private Double spouseTime;
/**
* 가족노동 남 시간
*/
private Double familyMHours;
/**
* 가족노동 여 시간
*/
private Double familyFHours;
/**
* 고용노동 남 시간
*/
private Double hiredMHours;
/**
* 고용돈 여 시간
*/
private Double hiredFHours;
/**
* 품앗이 남 시간
*/
private Double sharedMHours;
/**
* 품앗이 여 시간
*/
private Double sharedFHours;
/**
* 일손돕기 남 시간
*/
private Double volunteerMHours;
/**
* 일손돕기 여 시간
*/
private Double volunteerFHours;
}

View File

@@ -0,0 +1,76 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.validator;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO;
import app.module.core.config.constants.CommonConstants;
import lombok.RequiredArgsConstructor;
import org.apache.tika.utils.StringUtils;
import org.springframework.stereotype.Component;
import org.springframework.validation.Errors;
import org.springframework.validation.Validator;
@Component
@RequiredArgsConstructor
public class SaveDailyWorkValidator implements Validator {
@Override
public boolean supports(Class<?> clazz) {
return SaveDailyWorkReqVO.class.equals(clazz);
}
@Override
public void validate(Object target, Errors errors) {
SaveDailyWorkReqVO vo = (SaveDailyWorkReqVO) target;
if (vo.getWorkLandArea() == null && !StringUtils.isBlank(vo.getAreaUnitCode())) {
errors.rejectValue(
"workLandArea", "valid.common.required",
"작업 면적을 입력해 주세요.");
}
if (vo.getWorkLandArea() != null && StringUtils.isBlank(vo.getAreaUnitCode())) {
errors.rejectValue(
"areaUnitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.AREA_CODE_OTHER.equals(vo.getAreaUnitCode()) && StringUtils.isBlank(vo.getAreaUnitSelf())) {
errors.rejectValue(
"areaUnitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getHarvestQuantity() == null && !StringUtils.isBlank(vo.getHarvestUnitCode())) {
errors.rejectValue(
"harvestQuantity", "valid.common.required",
"수확량을 입력해 주세요.");
}
if (vo.getHarvestQuantity() != null && StringUtils.isBlank(vo.getHarvestUnitCode())) {
errors.rejectValue(
"harvestUnitCode", "valid.common.required",
"단위를 선택해 주세요.");
}
if (CommonConstants.UNIT_CODE_SELF.equals(vo.getHarvestUnitCode()) && StringUtils.isBlank(vo.getHarvestUnitSelf())) {
errors.rejectValue(
"harvestUnitSelf", "valid.common.required",
"단위를 입력해 주세요.");
}
if (vo.getOwnerTime() == null && vo.getSpouseTime() == null
&& vo.getFamilyMHours() == null && vo.getFamilyFHours() == null
&& vo.getHiredMHours() == null && vo.getHiredFHours() == null
&& vo.getSharedMHours() == null && vo.getSharedFHours() == null
&& vo.getVolunteerMHours() == null && vo.getVolunteerFHours() == null) {
errors.rejectValue("ownerTime", "valid.common.required", "최소 1개의 노동투입시간을 입력해 주세요.");
errors.rejectValue("spouseTime", "valid.common.required");
errors.rejectValue("familyMHours", "valid.common.required");
errors.rejectValue("familyFHours", "valid.common.required");
errors.rejectValue("hiredMHours", "valid.common.required");
errors.rejectValue("hiredFHours", "valid.common.required");
errors.rejectValue("sharedMHours", "valid.common.required");
errors.rejectValue("sharedFHours", "valid.common.required");
errors.rejectValue("volunteerMHours", "valid.common.required");
errors.rejectValue("volunteerFHours", "valid.common.required");
}
}
}

View File

@@ -0,0 +1,22 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.DailyWorkUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO;
public interface SaveDailyWorkPortIn {
/**
* 일계부 노동투입 조회
*
* @param reqVO 검색 조건
* @return 노동투입 상세
*/
GetDailyWorkDto detail(DailyWorkUIReqVO reqVO);
/**
* 일계부 노동투입 등록
*
* @param formVO 입력 데이터
*/
void create(SaveDailyWorkReqVO formVO);
}

View File

@@ -0,0 +1,23 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd;
public interface SaveDailyWorkPortOut {
/**
* 일계부 노동투입 조회
*
* @param command 검색 조건
* @return 노동투입 상세
*/
GetDailyWorkDto detail(GetDailyWorkCmd command);
/**
* 일계부 노동투입 등록
*
* @param findCmd 검색 조건
* @param command 입력 데이터
*/
void create(GetDailyWorkCmd findCmd, SaveDailyWorkCmd command);
}

View File

@@ -0,0 +1,66 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.persistence.modal.GetDailyWorkDto;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.DailyWorkUIReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.adapters.web.model.SaveDailyWorkReqVO;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortIn;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.SaveDailyWorkPortOut;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.GetDailyWorkCmd;
import app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain.SaveDailyWorkCmd;
import app.module.core.usecase.daily.record.ports.DailyRecordPortIn;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@Service
@RequiredArgsConstructor
public class SaveDailyWorkService implements SaveDailyWorkPortIn {
private final SaveDailyWorkPortOut portOut;
private final DailyRecordPortIn dailyRecordPortIn;
@Override
public GetDailyWorkDto detail(DailyWorkUIReqVO reqVO) {
GetDailyWorkCmd findCmd = new GetDailyWorkCmd(
reqVO.getSearchMonth(),
reqVO.getGroupNo(),
reqVO.getHouseholdSeq(),
reqVO.getId());
return portOut.detail(findCmd);
}
@Override
public void create(SaveDailyWorkReqVO formVO) {
GetDailyWorkCmd findCmd = new GetDailyWorkCmd(
formVO.getSearchMonth(),
formVO.getGroupNo(),
formVO.getHouseholdSeq(),
formVO.getId());
SaveDailyWorkCmd command =
new SaveDailyWorkCmd(
formVO.getId(),
formVO.getDailyId(),
formVO.getItemName(),
formVO.getWorkName(),
formVO.getWorkLandArea(),
formVO.getAreaUnitCode(),
formVO.getAreaUnitSelf(),
formVO.getHarvestQuantity(),
formVO.getHarvestUnitCode(),
formVO.getHarvestUnitSelf(),
formVO.getOwnerTime(),
formVO.getSpouseTime(),
formVO.getFamilyMHours(),
formVO.getFamilyFHours(),
formVO.getHiredMHours(),
formVO.getHiredFHours(),
formVO.getSharedMHours(),
formVO.getSharedFHours(),
formVO.getVolunteerMHours(),
formVO.getVolunteerFHours());
portOut.create(findCmd, command);
dailyRecordPortIn.updateByAllStatus(findCmd.getSearchMonth(), findCmd.getGroupNo(), findCmd.getHouseholdSeq());
}
}

View File

@@ -0,0 +1,27 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
@Getter
@Setter
@AllArgsConstructor
public class GetDailyWorkCmd {
/**
* 검색 월(yyyyMM)
*/
private String searchMonth;
/**
* 검색 그룸번호
*/
private Integer groupNo;
/**
* 임가 일련번호
*/
private Long householdSeq;
/**
* 노동투입 일련번호
*/
private Long id;
}

View File

@@ -0,0 +1,34 @@
package app.module.admin.usecase.household.tab.dailyRecord.saveDailyWork.ports.application.domain;
import app.module.core.config.adapters.persistence.component.AuditCommand;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.Setter;
import lombok.ToString;
@Getter
@Setter
@AllArgsConstructor
@ToString
public class SaveDailyWorkCmd extends AuditCommand {
private Long id;
private Long dailyRecordSeq;
private String itemName;
private String workName;
private Double workLandArea;
private String areaUnitCode;
private String areaUnitSelf;
private Double harvestQuantity;
private String harvestUnitCode;
private String harvestUnitSelf;
private Double ownerTime;
private Double spouseTime;
private Double familyMHours;
private Double familyFHours;
private Double hiredMHours;
private Double hiredFHours;
private Double sharedMHours;
private Double sharedFHours;
private Double volunteerMHours;
private Double volunteerFHours;
}