From 5e6365d620a8d8ba5a10d12f24ba589305537420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 1 Jul 2025 14:53:10 +0900 Subject: [PATCH] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=9E=84?= =?UTF-8?q?=EC=97=85=EC=83=9D=EC=82=B0=EB=AC=BC=20=EB=93=B1=EB=A1=9D,=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/SaveDailyForestryDao.java | 39 ++++ .../persistence/SaveDailyForestryMapper.java | 39 ++++ .../modal/GetDailyForestryDto.java | 18 ++ .../web/SaveDailyForestryController.java | 87 ++++++++ .../web/model/DailyForestryUIReqVO.java | 30 +++ .../web/model/SaveDailyForestryReqVO.java | 38 ++++ .../validator/SaveDailyForestryValidator.java | 47 ++++ .../ports/SaveDailyForestryPortIn.java | 22 ++ .../ports/SaveDailyForestryPortOut.java | 23 ++ .../application/SaveDailyForestryService.java | 56 +++++ .../domain/GetDailyForestryCmd.java | 27 +++ .../domain/SaveDailyForestryCmd.java | 23 ++ .../daily/SaveDailyForestryMapper.xml | 56 +++++ .../modal/modal-daily-forestry.html | 207 ++++++++++++++++++ .../households/tab/daily-record.html | 4 +- .../resources/templates/households/{seq}.html | 1 + .../constants/DailyRecordConstants.java | 6 + .../application/DailyForestryService.java | 3 +- 18 files changed, 724 insertions(+), 2 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-forestry.html diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java new file mode 100644 index 00000000..ca54c0f4 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryDao.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; +import app.module.core.config.application.annotation.CreateCommand; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class SaveDailyForestryDao implements SaveDailyForestryPortOut { + private final SaveDailyForestryMapper dailyForestryMapper; + + @Override + public GetDailyForestryDto detail(GetDailyForestryCmd command) { + + return dailyForestryMapper.getDailyForestry(command); + } + + @CreateCommand + @Override + public void create(GetDailyForestryCmd findCmd, SaveDailyForestryCmd command) { + Integer existCount = dailyForestryMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyForestryMapper.createDailyForestry(command); + + log.debug("[CreateDailyForestry] command={}", command); + } else { + dailyForestryMapper.updateDailyForestry(command); + + log.debug("[UpdateDailyForestry] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java new file mode 100644 index 00000000..5df9912b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/SaveDailyForestryMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyForestryMapper { + /** + * 일계부 임업생산 데이터 조회 + * + * @param command 검색 조건 + * @return 임업생산 데이터 + */ + GetDailyForestryDto getDailyForestry(GetDailyForestryCmd command); + + /** + * 일계부 임업생산 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyForestryCmd command); + + /** + * 일계부 임업생산 등록 + * + * @param command 등록 데이터 + */ + void createDailyForestry(SaveDailyForestryCmd command); + + /** + * 일계부 임업생산 수정 + * + * @param command 수정 데이터 + */ + void updateDailyForestry(SaveDailyForestryCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java new file mode 100644 index 00000000..7afc0639 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/persistence/modal/GetDailyForestryDto.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyForestryDto { + private Long id; + private Long dailyRecordSeq; + private String productName; + private String usage; + private String quantity; + private String unitCode; + private String unitLabel; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java new file mode 100644 index 00000000..71d59875 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/SaveDailyForestryController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.validator.SaveDailyForestryValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortIn; +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/forestry") +public class SaveDailyForestryController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyForestryPortIn dailyForestryPortIn; + private final SaveDailyForestryValidator dailyForestryValidator; + + /** + * 일계부 임업생산 조회 + * + * @param id 임업생산 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyForestryUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyForestryDto detail = dailyForestryPortIn.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 SaveDailyForestryReqVO formVO, BindingResult bindingResult) { + + dailyForestryValidator.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); + + dailyForestryPortIn.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/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java new file mode 100644 index 00000000..dd89b338 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/DailyForestryUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyForestryUIReqVO { + /** + * 검색 월(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/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java new file mode 100644 index 00000000..a1238b0b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/model/SaveDailyForestryReqVO.java @@ -0,0 +1,38 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyPower.adapters.web.model.DailyPowerUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class SaveDailyForestryReqVO extends DailyForestryUIReqVO { + /** + * 생산물 + */ + @NotBlank(message = "생산물을 입력해 주세요.") + private String productName; + /** + * 용도 + */ + private String usage; + /** + * 수량 + */ + private Double quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 단위 직접 입력 + */ + private String unitSelf; + /** + * 현물평가액 + */ + private Long estimatedValue; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java new file mode 100644 index 00000000..3d363449 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/adapters/web/validator/SaveDailyForestryValidator.java @@ -0,0 +1,47 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; +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 SaveDailyForestryValidator implements Validator { + @Override + public boolean supports(Class clazz) { + return SaveDailyForestryReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyForestryReqVO vo = (SaveDailyForestryReqVO) target; + + if (vo.getQuantity() == null && !StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "quantity", "valid.common.required", + "수량을 입력해 주세요."); + } + + if (vo.getQuantity() != null && StringUtils.isBlank(vo.getUnitCode())) { + errors.rejectValue( + "unitCode", "valid.common.required", + "단위를 선택해 주세요."); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) { + errors.rejectValue( + "unitSelf", "valid.common.required", + "단위를 입력해 주세요."); + } + + if (vo.getEstimatedValue() == null) { + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현물평가액을 입력해 주세요."); + } + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java new file mode 100644 index 00000000..1fce46d0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortIn.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; + +public interface SaveDailyForestryPortIn { + /** + * 일계부 임업생산 조회 + * + * @param reqVO 검색 조건 + * @return 임업생산 상세 + */ + GetDailyForestryDto detail(DailyForestryUIReqVO reqVO); + + /** + * 일계부 임업생산 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyForestryReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java new file mode 100644 index 00000000..b6f31637 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/SaveDailyForestryPortOut.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; + +public interface SaveDailyForestryPortOut { + /** + * 일계부 임업생산 조회 + * + * @param command 검색 조건 + * @return 임업생산 상세 + */ + GetDailyForestryDto detail(GetDailyForestryCmd command); + + /** + * 일계부 임업생산 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyForestryCmd findCmd, SaveDailyForestryCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java new file mode 100644 index 00000000..1a277c62 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/SaveDailyForestryService.java @@ -0,0 +1,56 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.persistence.modal.GetDailyForestryDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.DailyForestryUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.adapters.web.model.SaveDailyForestryReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.SaveDailyForestryPortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.GetDailyForestryCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain.SaveDailyForestryCmd; +import app.module.core.config.constants.DailyRecordConstants; +import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class SaveDailyForestryService implements SaveDailyForestryPortIn { + private final SaveDailyForestryPortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyForestryDto detail(DailyForestryUIReqVO reqVO) { + GetDailyForestryCmd findCmd = new GetDailyForestryCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyForestryReqVO formVO) { + GetDailyForestryCmd findCmd = new GetDailyForestryCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyForestryCmd command = + new SaveDailyForestryCmd( + formVO.getId(), + formVO.getDailyId(), + DailyRecordConstants.FORESTRY_EXPENSE_MARK, + formVO.getProductName(), + formVO.getUsage(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getUnitSelf(), + formVO.getEstimatedValue()); + + 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/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java new file mode 100644 index 00000000..bcf91e85 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/GetDailyForestryCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyForestryCmd { + /** + * 검색 월(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/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java new file mode 100644 index 00000000..298eb548 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyForestry/ports/application/domain/SaveDailyForestryCmd.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyForestry.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 SaveDailyForestryCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private String expenseMark; + private String productName; + private String usage; + private Double quantity; + private String unitCode; + private String unitSelf; + private Long estimatedValue; +} diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml new file mode 100644 index 00000000..45018ccc --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyForestryMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + insert into daily_forestry ( + daily_record_seq, expense_mark + , product_name, usage + , quantity, unit_code, unit_self, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{expenseMark} + , #{productName}, #{usage} + , #{quantity}, #{unitCode}, #{unitSelf}, #{estimatedValue} + , false + , + ) + + + + update daily_forestry set + , expense_mark = #{expenseMark} + , product_name = #{productName} + , usage = #{usage} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + diff --git a/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html new file mode 100644 index 00000000..bef88ecc --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-forestry.html @@ -0,0 +1,207 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ 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 d40a6534..c450a01b 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -676,7 +676,7 @@ - ${ifNullHyphen(item.productName)} + ${ifNullHyphen(item.productName)} ${ifNullHyphen(item.usage)} ${ifNullHyphen(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -816,6 +816,8 @@ showDailyExpenseModal(); } else if (currentStep === 'POWER') { showDailyPowerModal(); + } else if (currentStep === 'FORESTRY') { + showDailyForestryModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index 2b2abc75..68e37a95 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -180,6 +180,7 @@ + diff --git a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java index 4fc81f5a..2cb90d50 100644 --- a/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java +++ b/core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java @@ -28,4 +28,10 @@ public class DailyRecordConstants { * [정책] 외상판매 Y 일 경우 수입부호 52210 적재 */ public static final String EXPENSE_INCOME_MARK = "52210"; + + /** + * 임업생산물의 지출부호 + * [정책] 81011 고정 + */ + public static final String FORESTRY_EXPENSE_MARK = "81011"; } diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java index e3c58989..ec823cc5 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/ports/application/DailyForestryService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.forestry.ports.application; +import app.module.core.config.constants.DailyRecordConstants; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; @@ -99,7 +100,7 @@ public class DailyForestryService implements DailyForestryPortIn { new CreateDailyForestryCmd( formVO.getId(), formVO.getDailyRecordSeq(), - "81011", // [정책] 81011 고정 + DailyRecordConstants.FORESTRY_EXPENSE_MARK, formVO.getProductName(), formVO.getUsage(), formVO.getQuantity(),