diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java
index 2ef63878..342b773d 100644
--- a/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java
+++ b/admin/src/main/java/app/module/admin/config/application/security/AdminSecurityConfig.java
@@ -21,6 +21,7 @@ import org.springframework.security.core.session.SessionRegistryImpl;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.SecurityFilterChain;
import org.springframework.security.web.authentication.rememberme.JdbcTokenRepositoryImpl;
+
import org.springframework.security.web.authentication.rememberme.PersistentTokenRepository;
import org.springframework.security.web.session.HttpSessionEventPublisher;
import org.springframework.security.web.util.matcher.AntPathRequestMatcher;
diff --git a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java
index b003eb9b..45b08fc1 100644
--- a/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java
+++ b/admin/src/main/java/app/module/admin/usecase/household/getHouseholdStatusUI/adapters/web/GetHouseholdStatusUIController.java
@@ -17,27 +17,31 @@ import org.springframework.web.bind.annotation.RequestParam;
@Controller
@RequiredArgsConstructor
class GetHouseholdStatusUIController {
- private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
- private final UICodeListPortIn uiCodeListPortIn;
+ private final GetHouseholdStatusPortIn getHouseholdStatusPortIn;
+ private final UICodeListPortIn uiCodeListPortIn;
- @GetMapping(path = "/households/{seq}")
- String operate(
- @PathVariable Long seq,
- @RequestParam(required = false) String recordMonth,
- Model model,
- @ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
+ @GetMapping(path = "/households/{seq}")
+ String operate(
+ @PathVariable Long seq,
+ @RequestParam(required = false) String recordMonth,
+ Model model,
+ @ModelAttribute("reqVO") GetHouseholdStatusUIReqVO reqVO) {
- model.addAttribute("seq", seq);
- model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
- model.addAttribute("recordMonth", recordMonth);
- model.addAttribute("userRole", AdminUtil.getLoginUserRole());
+ model.addAttribute("seq", seq);
+ model.addAttribute("monthList", DateUiUtil.getRecentMonths(13));
+ model.addAttribute("recordMonth", recordMonth);
+ model.addAttribute("userRole", AdminUtil.getLoginUserRole());
- model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit"));
+ model.addAttribute("unitCodes", uiCodeListPortIn.connect("code.record.unit"));
+ model.addAttribute("recordCrop", uiCodeListPortIn.connect("code.record.crop"));
+ model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit"));
+ model.addAttribute("recordArea", uiCodeListPortIn.connect("code.record.area"));
+ model.addAttribute("recordFarming", uiCodeListPortIn.connect("code.record.farming"));
- // 임가 상세 정보
- model.addAttribute("householdInfo",
- getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
+ // 임가 상세 정보
+ model.addAttribute("householdInfo",
+ getHouseholdStatusPortIn.operate(new GetHouseholdStatusCmd(seq)).orElse(null));
- return "households/{seq}";
- }
+ return "households/{seq}";
+ }
}
\ No newline at end of file
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
new file mode 100644
index 00000000..ad37cec4
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeDao.java
@@ -0,0 +1,37 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence;
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
+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 lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class SaveDailyIncomeDao implements SaveDailyIncomePortOut {
+ private final SaveDailyIncomeMapper dailyIncomeMapper;
+
+ @Override
+ public GetDailyIncomeDto detail(GetDailyIncomeCmd command) {
+
+ return dailyIncomeMapper.getDailyIncome(command);
+ }
+
+ @Override
+ public void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command) {
+ Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd);
+ if (existCount == 0) {
+ dailyIncomeMapper.createDailyIncome(command);
+
+ log.debug("[CreateDailyIncome] command={}", command);
+ } else {
+ dailyIncomeMapper.updateDailyIncome(command);
+
+ log.debug("[UpdateDailyIncome] command={}", command);
+ }
+ }
+
+}
diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java
new file mode 100644
index 00000000..c90cbb6d
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/SaveDailyIncomeMapper.java
@@ -0,0 +1,39 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence;
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
+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 org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface SaveDailyIncomeMapper {
+ /**
+ * 일계부 수입 데이터 조회
+ *
+ * @param command 검색 조건
+ * @return 수입 데이터
+ */
+ GetDailyIncomeDto getDailyIncome(GetDailyIncomeCmd command);
+
+ /**
+ * 일계부 수입 데이터 존재 여부
+ *
+ * @param command 검색 조건
+ * @return 중복 개수
+ */
+ Integer getRecordExistCount(GetDailyIncomeCmd command);
+
+ /**
+ * 일계부 수입 등록
+ *
+ * @param command 등록 데이터
+ */
+ void createDailyIncome(SaveDailyIncomeCmd command);
+
+ /**
+ * 일계부 수입 수정
+ *
+ * @param command 수정 데이터
+ */
+ void updateDailyIncome(SaveDailyIncomeCmd command);
+}
diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java
new file mode 100644
index 00000000..2a8dc88e
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java
@@ -0,0 +1,24 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal;
+
+import app.module.core.config.application.enums.DailyInputType;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class GetDailyIncomeDto {
+ private Long id;
+ private Long dailyRecordSeq;
+ private DailyInputType inputType;
+ private Boolean credit;
+ private String cropCode;
+ private String cropLabel;
+ private String incomeKind;
+ private String sourcePurpose;
+ private String quantity;
+ private String unitCode;
+ private String unitLabel;
+ private String unitSelf;
+ private Long price;
+ private Long estimatedValue;
+}
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
new file mode 100644
index 00000000..ee98794c
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/SaveDailyIncomeController.java
@@ -0,0 +1,87 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web;
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator.SaveDailyIncomeValidator;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn;
+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/income")
+public class SaveDailyIncomeController {
+ private final DailyRecordPortIn dailyRecordPortIn;
+ private final SaveDailyIncomePortIn dailyIncomePortIn;
+ private final SaveDailyIncomeValidator sailyIncomeValidator;
+
+ /**
+ * 일계부 수입 조회
+ *
+ * @param id 수입 일련번호
+ * @param reqVO 검색 조건
+ */
+ @GetMapping(path = "/{id}")
+ ResponseEntity> detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) {
+
+ reqVO.setId(Long.parseLong(id));
+
+ GetDailyIncomeDto detail = dailyIncomePortIn.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 SaveDailyIncomeReqVO formVO, BindingResult bindingResult) {
+
+ sailyIncomeValidator.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);
+
+ dailyIncomePortIn.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/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java
new file mode 100644
index 00000000..71bffa92
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java
@@ -0,0 +1,31 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class DailyIncomeUIReqVO {
+ /**
+ * 검색 월(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/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java
new file mode 100644
index 00000000..cdb49a64
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/model/SaveDailyIncomeReqVO.java
@@ -0,0 +1,55 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model;
+
+import app.module.core.config.application.enums.DailyInputType;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@ToString(callSuper = true)
+public class SaveDailyIncomeReqVO extends DailyIncomeUIReqVO {
+ /**
+ * 등록 유형
+ */
+ private DailyInputType inputType;
+ /**
+ * 외상판매 여부
+ */
+ private Boolean credit;
+ /**
+ * 재배형태 코드
+ */
+ private String cropCode;
+ /**
+ * 수입의 종류 직접입력
+ */
+ @NotBlank(message = "수입 종류를 입력해 주세요.")
+ private String incomeKind;
+ /**
+ * 수입원
+ */
+ @NotBlank(message = "수입원을 입력해 주세요.")
+ private String sourcePurpose;
+ /**
+ * 수량
+ */
+ private Double quantity;
+ /**
+ * 단위 코드
+ */
+ private String unitCode;
+ /**
+ * 단위 직접 입력
+ */
+ private String unitSelf;
+ /**
+ * 현금
+ */
+ private Long price;
+ /**
+ * 현물평가액
+ */
+ private Long estimatedValue;
+}
diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java
new file mode 100644
index 00000000..5783baca
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/adapters/web/validator/SaveDailyIncomeValidator.java
@@ -0,0 +1,50 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.validator;
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
+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 SaveDailyIncomeValidator implements Validator {
+
+ @Override
+ public boolean supports(Class> clazz) {
+ return SaveDailyIncomeReqVO.class.equals(clazz);
+ }
+
+ @Override
+ public void validate(Object target, Errors errors) {
+ SaveDailyIncomeReqVO vo = (SaveDailyIncomeReqVO) 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 ("code.record.unit.self".equals(vo.getUnitCode()) && StringUtils.isBlank(vo.getUnitSelf())) {
+ errors.rejectValue(
+ "unitSelf", "valid.common.required",
+ "단위를 입력해 주세요.");
+ }
+
+ if (vo.getPrice() == null && vo.getEstimatedValue() == null) {
+ errors.rejectValue(
+ "price", "valid.common.required",
+ "현금 또는 현물평가액을 입력해 주세요.");
+ errors.rejectValue(
+ "estimatedValue", "valid.common.required",
+ "현금 또는 현물평가액을 입력해 주세요.");
+ }
+ }
+}
diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java
new file mode 100644
index 00000000..a4136a0f
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortIn.java
@@ -0,0 +1,23 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports;
+
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
+
+public interface SaveDailyIncomePortIn {
+ /**
+ * 일계부 수입 조회
+ *
+ * @param reqVO 검색 조건
+ * @return 수입 상세
+ */
+ GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO);
+
+ /**
+ * 일계부 수입 등록
+ *
+ * @param formVO 입력 데이터
+ */
+ void create(SaveDailyIncomeReqVO formVO);
+}
diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java
new file mode 100644
index 00000000..22d7a0ac
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/SaveDailyIncomePortOut.java
@@ -0,0 +1,24 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports;
+
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
+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;
+
+public interface SaveDailyIncomePortOut {
+ /**
+ * 일계부 수입 조회
+ *
+ * @param command 검색 조건
+ * @return 수입 상세
+ */
+ GetDailyIncomeDto detail(GetDailyIncomeCmd command);
+
+ /**
+ * 일계부 수입 등록
+ *
+ * @param findCmd 검색 조건
+ * @param command 입력 데이터
+ */
+ void create(GetDailyIncomeCmd findCmd, SaveDailyIncomeCmd command);
+}
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
new file mode 100644
index 00000000..28a06502
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/SaveDailyIncomeService.java
@@ -0,0 +1,62 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application;
+
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.persistence.modal.GetDailyIncomeDto;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.SaveDailyIncomeReqVO;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.adapters.web.model.DailyIncomeUIReqVO;
+import app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.SaveDailyIncomePortIn;
+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.util.AuditUtil;
+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 SaveDailyIncomeService implements SaveDailyIncomePortIn {
+ private final SaveDailyIncomePortOut portOut;
+ private final DailyRecordPortIn dailyRecordPortIn;
+
+ @Override
+ public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) {
+ GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
+ reqVO.getSearchMonth(),
+ reqVO.getGroupNo(),
+ reqVO.getHouseholdSeq(),
+ reqVO.getId());
+
+ return portOut.detail(findCmd);
+ }
+
+ @Override
+ public void create(SaveDailyIncomeReqVO formVO) {
+ GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd(
+ formVO.getSearchMonth(),
+ formVO.getGroupNo(),
+ formVO.getHouseholdSeq(),
+ formVO.getId());
+
+ SaveDailyIncomeCmd command = AuditUtil.create(
+ new SaveDailyIncomeCmd(
+ formVO.getId(),
+ formVO.getDailyId(),
+ formVO.getInputType(),
+ DailyRecordConstants.INCOME_CATEGORY,
+ (formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null),
+ formVO.getCredit(),
+ formVO.getCropCode(),
+ formVO.getIncomeKind(),
+ formVO.getSourcePurpose(),
+ formVO.getQuantity(),
+ formVO.getUnitCode(),
+ formVO.getUnitSelf(),
+ formVO.getPrice(),
+ 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/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java
new file mode 100644
index 00000000..f55cc420
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/GetDailyIncomeCmd.java
@@ -0,0 +1,27 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+@AllArgsConstructor
+public class GetDailyIncomeCmd {
+ /**
+ * 검색 월(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/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java
new file mode 100644
index 00000000..3658483c
--- /dev/null
+++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyIncome/ports/application/domain/SaveDailyIncomeCmd.java
@@ -0,0 +1,35 @@
+package app.module.admin.usecase.household.tab.dailyRecord.saveDailyIncome.ports.application.domain;
+
+import app.module.core.config.adapters.persistence.component.AuditCommand;
+import app.module.core.config.application.enums.DailyInputType;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@AllArgsConstructor
+@ToString
+public class SaveDailyIncomeCmd extends AuditCommand {
+ private Long id;
+ private Long dailyRecordSeq;
+ private DailyInputType inputType;
+ /**
+ * 유형
+ */
+ private String category;
+ /**
+ * 지출 부호
+ */
+ private String expenseMark;
+ private Boolean credit;
+ private String cropCode;
+ private String incomeKind;
+ private String sourcePurpose;
+ private Double quantity;
+ private String unitCode;
+ private String unitSelf;
+ private Long price;
+ private Long estimatedValue;
+}
diff --git a/admin/src/main/resources/application-prod.yml b/admin/src/main/resources/application-prod.yml
index eb1542b0..e7b29ec4 100644
--- a/admin/src/main/resources/application-prod.yml
+++ b/admin/src/main/resources/application-prod.yml
@@ -22,4 +22,16 @@ spring:
messages:
# 메시지 소스 캐시 지속 시간 (단위: 초)
# 개발 환경에서는 짧은 간격(10-60초), 운영 환경에서는 긴 간격(3600초 이상) 권장
- cache-duration: 5m
\ No newline at end of file
+ cache-duration: 5m
+
+# ==============================================
+# 서버 압축 설정
+# ==============================================
+server:
+ servlet:
+ session:
+ cookie:
+ domain: fhes.kric.com
+ path: /
+ http-only: true
+ secure: true
\ No newline at end of file
diff --git a/admin/src/main/resources/mappers/household/RemoveDailyMapper.xml b/admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml
similarity index 100%
rename from admin/src/main/resources/mappers/household/RemoveDailyMapper.xml
rename to admin/src/main/resources/mappers/household/daily/RemoveDailyMapper.xml
diff --git a/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml
new file mode 100644
index 00000000..56ad9c7c
--- /dev/null
+++ b/admin/src/main/resources/mappers/household/daily/SaveDailyIncomeMapper.xml
@@ -0,0 +1,59 @@
+
+
+