diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java index ad37cec4..ed6948d1 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java @@ -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); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java index ee98794c..30412897 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java @@ -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()); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java index 28a06502..817eeff3 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java @@ -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); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java new file mode 100644 index 00000000..a6af3580 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkDao.java @@ -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); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java new file mode 100644 index 00000000..0243f089 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/SaveDailyWorkMapper.java @@ -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); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java new file mode 100644 index 00000000..a272f0bf --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/persistence/modal/GetDailyWorkDto.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java new file mode 100644 index 00000000..47b0a340 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/SaveDailyWorkController.java @@ -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; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java new file mode 100644 index 00000000..a3126482 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/DailyWorkUIReqVO.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java new file mode 100644 index 00000000..b851f06d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/model/SaveDailyWorkReqVO.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java new file mode 100644 index 00000000..2cc1ef22 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/adapters/web/validator/SaveDailyWorkValidator.java @@ -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"); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java new file mode 100644 index 00000000..1367d20c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortIn.java @@ -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); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java new file mode 100644 index 00000000..2bb4fa0c --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/SaveDailyWorkPortOut.java @@ -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); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java new file mode 100644 index 00000000..112905dc --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/SaveDailyWorkService.java @@ -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()); + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java new file mode 100644 index 00000000..f1818a09 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/GetDailyWorkCmd.java @@ -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; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java new file mode 100644 index 00000000..ff53c3fe --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyWork/ports/application/domain/SaveDailyWorkCmd.java @@ -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; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml new file mode 100644 index 00000000..47d2d626 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyWorkMapper.xml @@ -0,0 +1,71 @@ + + + + + + + + + + insert into daily_work ( + daily_record_seq + , item_name, work_name + , work_land_area, area_unit_code, area_unit_self, harvest_quantity, harvest_unit_code, harvest_unit_self + , owner_time, spouse_time, family_m_hours, family_f_hours, hired_m_hours, hired_f_hours, shared_m_hours, shared_f_hours, volunteer_m_hours, volunteer_f_hours + , is_deleted + , + ) values ( + #{dailyRecordSeq} + , #{itemName}, #{workName} + , #{workLandArea}, #{areaUnitCode}, #{areaUnitSelf}, #{harvestQuantity}, #{harvestUnitCode}, #{harvestUnitSelf} + , #{ownerTime}, #{spouseTime}, #{familyMHours}, #{familyFHours}, #{hiredMHours}, #{hiredFHours}, #{sharedMHours}, #{sharedFHours}, #{volunteerMHours}, #{volunteerFHours} + , false + , + ) + + + + update daily_work set + , item_name = #{itemName} + , work_name = #{workName} + , work_land_area = #{workLandArea} + , area_unit_code = #{areaUnitCode} + , area_unit_self = #{areaUnitSelf} + , harvest_quantity = #{harvestQuantity} + , harvest_unit_code = #{harvestUnitCode} + , harvest_unit_self = #{harvestUnitSelf} + , owner_time = #{ownerTime} + , spouse_time = #{spouseTime} + , family_m_hours = #{familyMHours} + , family_f_hours = #{familyFHours} + , hired_m_hours = #{hiredMHours} + , hired_f_hours = #{hiredFHours} + , shared_m_hours = #{sharedMHours} + , shared_f_hours = #{sharedFHours} + , volunteer_m_hours = #{volunteerMHours} + , volunteer_f_hours = #{volunteerFHours} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-income.html b/admin/src/main/resources/templates/households/modal/modal-daily-income.html index 35cb2afb..1961a6ff 100644 --- a/admin/src/main/resources/templates/households/modal/modal-daily-income.html +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -159,7 +159,7 @@ + + + + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/daily-record.html b/admin/src/main/resources/templates/households/tab/daily-record.html index 6653bb1d..d02d07a9 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -548,7 +548,7 @@ - ${ifNullHyphen(item.itemName)} + ${ifNullHyphen(item.itemName)} ${ifNullHyphen(item.workName)} ${ifNullHyphen(item.workLandArea)} ${ifNullHyphen(item.areaUnitText)} @@ -810,6 +810,8 @@ if (currentStep === 'INCOME') { showDailyIncomeModal(); + } else if (currentStep === 'WORK') { + showDailyWorkModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 9d4bd5ea..bab55e44 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -177,6 +177,7 @@ + @@ -315,7 +316,7 @@ const unitArea = tr.querySelector('.unit-self-input'); const unitInput = tr.querySelector('.unit-self-input input'); - if (el.value === 'code.record.unit.self') { + if (el.value.indexOf('.self') !== -1) { unitInput.disabled = false; unitArea.classList.remove('input-disabled'); } else { diff --git a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml index 2dd2b588..5f440c69 100644 --- a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml @@ -9,7 +9,6 @@ , ds.work_land_area, ds.area_unit_code, ds.area_unit_self, ds.harvest_quantity, ds.harvest_unit_code, ds.harvest_unit_self , ds.owner_time, ds.spouse_time, ds.family_m_hours, ds.family_f_hours, ds.hired_m_hours , ds.hired_f_hours, ds.shared_m_hours, ds.shared_f_hours, ds.volunteer_m_hours, ds.volunteer_f_hours - , ds.is_deleted from daily_work ds where ds.is_deleted = false