diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java new file mode 100644 index 00000000..be157920 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseDao.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; +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 SaveDailyExpenseDao implements SaveDailyExpensePortOut { + private final SaveDailyExpenseMapper dailyExpenseMapper; + + @Override + public GetDailyExpenseDto detail(GetDailyExpenseCmd command) { + + return dailyExpenseMapper.getDailyExpense(command); + } + + @CreateCommand + @Override + public void create(GetDailyExpenseCmd findCmd, SaveDailyExpenseCmd command) { + Integer existCount = dailyExpenseMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyExpenseMapper.createDailyExpense(command); + + log.debug("[CreateDailyExpense] command={}", command); + } else { + dailyExpenseMapper.updateDailyExpense(command); + + log.debug("[UpdateDailyExpense] command={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java new file mode 100644 index 00000000..fee1bee5 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/SaveDailyExpenseMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface SaveDailyExpenseMapper { + /** + * 일계부 지출 데이터 조회 + * + * @param command 검색 조건 + * @return 지출 데이터 + */ + GetDailyExpenseDto getDailyExpense(GetDailyExpenseCmd command); + + /** + * 일계부 지출 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyExpenseCmd command); + + /** + * 일계부 지출 등록 + * + * @param command 등록 데이터 + */ + void createDailyExpense(SaveDailyExpenseCmd command); + + /** + * 일계부 지출 수정 + * + * @param command 수정 데이터 + */ + void updateDailyExpense(SaveDailyExpenseCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java new file mode 100644 index 00000000..f1a54bc2 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/persistence/modal/GetDailyExpenseDto.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal; + +import app.module.core.config.application.enums.DailyInputType; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyExpenseDto { + private Long id; + private Long dailyRecordSeq; + private DailyInputType inputType; + private Boolean credit; + private String expenseKind; + 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/saveDailyExpense/adapters/web/SaveDailyExpenseController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java new file mode 100644 index 00000000..9eae6c30 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/SaveDailyExpenseController.java @@ -0,0 +1,87 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.validator.SaveDailyExpenseValidator; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortIn; +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/expense") +public class SaveDailyExpenseController { + private final DailyRecordPortIn dailyRecordPortIn; + private final SaveDailyExpensePortIn dailyExpensePortIn; + private final SaveDailyExpenseValidator dailyExpenseValidator; + + /** + * 일계부 지출 조회 + * + * @param id 지출 일련번호 + * @param reqVO 검색 조건 + */ + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyExpenseUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + GetDailyExpenseDto detail = dailyExpensePortIn.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 SaveDailyExpenseReqVO formVO, BindingResult bindingResult) { + + dailyExpenseValidator.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); + + dailyExpensePortIn.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/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java new file mode 100644 index 00000000..576871ca --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/DailyExpenseUIReqVO.java @@ -0,0 +1,30 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyExpenseUIReqVO { + /** + * 검색 월(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/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java new file mode 100644 index 00000000..c415cfde --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/model/SaveDailyExpenseReqVO.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.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 SaveDailyExpenseReqVO extends DailyExpenseUIReqVO { + /** + * 등록 유형 + */ + private DailyInputType inputType; + /** + * 외상판매 여부 + */ + private Boolean credit; + /** + * 지출의 종류 직접입력 + */ + @NotBlank(message = "지출 종류를 입력해 주세요.") + private String expenseKind; + /** + * 용도 + */ + @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/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java new file mode 100644 index 00000000..b475d1d3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/adapters/web/validator/SaveDailyExpenseValidator.java @@ -0,0 +1,51 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; +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 SaveDailyExpenseValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return SaveDailyExpenseReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + SaveDailyExpenseReqVO vo = (SaveDailyExpenseReqVO) 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.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/saveDailyExpense/ports/SaveDailyExpensePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortIn.java new file mode 100644 index 00000000..036bd0e6 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortIn.java @@ -0,0 +1,23 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; + +public interface SaveDailyExpensePortIn { + /** + * 일계부 지출 조회 + * + * @param reqVO 검색 조건 + * @return 지출 상세 + */ + GetDailyExpenseDto detail(DailyExpenseUIReqVO reqVO); + + /** + * 일계부 지출 등록 + * + * @param formVO 입력 데이터 + */ + void create(SaveDailyExpenseReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java new file mode 100644 index 00000000..d871c292 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/SaveDailyExpensePortOut.java @@ -0,0 +1,24 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; + +public interface SaveDailyExpensePortOut { + /** + * 일계부 지출 조회 + * + * @param command 검색 조건 + * @return 지출 상세 + */ + GetDailyExpenseDto detail(GetDailyExpenseCmd command); + + /** + * 일계부 지출 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyExpenseCmd findCmd, SaveDailyExpenseCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java new file mode 100644 index 00000000..c8626e1b --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/SaveDailyExpenseService.java @@ -0,0 +1,60 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.persistence.modal.GetDailyExpenseDto; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.DailyExpenseUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.adapters.web.model.SaveDailyExpenseReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortIn; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.SaveDailyExpensePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.GetDailyExpenseCmd; +import app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain.SaveDailyExpenseCmd; +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 SaveDailyExpenseService implements SaveDailyExpensePortIn { + private final SaveDailyExpensePortOut portOut; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyExpenseDto detail(DailyExpenseUIReqVO reqVO) { + GetDailyExpenseCmd findCmd = new GetDailyExpenseCmd( + reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + @Override + public void create(SaveDailyExpenseReqVO formVO) { + GetDailyExpenseCmd findCmd = new GetDailyExpenseCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + SaveDailyExpenseCmd command = + new SaveDailyExpenseCmd( + formVO.getId(), + formVO.getDailyId(), + formVO.getInputType(), + DailyRecordConstants.EXPENSE_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.EXPENSE_INCOME_MARK : null), + formVO.getCredit(), + formVO.getExpenseKind(), + 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/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java new file mode 100644 index 00000000..a376b6cd --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/GetDailyExpenseCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyExpenseCmd { + /** + * 검색 월(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/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java new file mode 100644 index 00000000..03a8edac --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/saveDailyExpense/ports/application/domain/SaveDailyExpenseCmd.java @@ -0,0 +1,34 @@ +package app.module.admin.usecase.household.tab.dailyRecord.saveDailyExpense.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 SaveDailyExpenseCmd extends AuditCommand { + private Long id; + private Long dailyRecordSeq; + private DailyInputType inputType; + /** + * 유형 + */ + private String category; + /** + * 수입 부호 + */ + private String incomeMark; + private Boolean credit; + private String expenseKind; + 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/mappers/household/daily/SaveDailyExpenseMapper.xml b/admin/src/main/resources/mappers/household/daily/SaveDailyExpenseMapper.xml new file mode 100644 index 00000000..af768bb7 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/SaveDailyExpenseMapper.xml @@ -0,0 +1,58 @@ + + + + + + + + + + insert into daily_expense ( + daily_record_seq, input_type, category, income_mark + , is_credit, expense_kind, source_purpose + , quantity, unit_code, unit_self, price, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{inputType}, #{category}, #{incomeMark} + , #{credit}, #{expenseKind}, #{sourcePurpose} + , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} + , false + , + ) + + + + update daily_expense set + , is_credit = #{credit} + , income_mark = #{incomeMark} + , expense_kind = #{expenseKind} + , source_purpose = #{sourcePurpose} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , price = #{price} + , 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-expense.html b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html new file mode 100644 index 00000000..6906e4c0 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-expense.html @@ -0,0 +1,252 @@ + + + +
+
+ + + + + + + +
+ + + + +
+ \ No newline at end of file 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 1961a6ff..071b3dc6 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 @@ -173,6 +173,7 @@ form.estimatedValue.value = ''; document.getElementById('isCredit_N').checked = true; + priceDisabledReset(form.price, form.estimatedValue); } // 일계부 상세 값 set 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 d02d07a9..bed9acb9 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -599,7 +599,7 @@ ${item.isCredit ? "Y" : "N"} - ${ifNullHyphen(item.expenseKind)} + ${ifNullHyphen(item.expenseKind)} ${ifNullHyphen(item.sourcePurpose)} ${ifNullHyphen(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -812,6 +812,8 @@ showDailyIncomeModal(); } else if (currentStep === 'WORK') { showDailyWorkModal(); + } else if (currentStep === 'EXPENSE') { + showDailyExpenseModal(); } else { alert('TODO : 추가'); } diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index bab55e44..b65ca452 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -178,6 +178,7 @@ + @@ -341,6 +342,22 @@ disableArea.classList.add('input-disabled'); } } + + const priceDisabledReset = (el, disableEl) => { + let wrap = null; + + if (el.value === '') { + wrap = el.closest('td'); + wrap.querySelector('input').disabled = false; + wrap.querySelector('.component-input').classList.remove('input-disabled'); + } + + if (disableEl.value === '') { + wrap = disableEl.closest('td'); + wrap.querySelector('input').disabled = false; + wrap.querySelector('.component-input').classList.remove('input-disabled'); + } + } 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 43a7686f..4fc81f5a 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 @@ -16,4 +16,16 @@ public class DailyRecordConstants { * [정책] 외상판매 Y 일 경우 지출부호 91206 적재 */ public static final String INCOME_EXPENSE_MARK = "91206"; + + /** + * 지출의 유형 + * [정책] 2 고정 + */ + public static final String EXPENSE_CATEGORY = "2"; + + /** + * 지출의 수입부호 + * [정책] 외상판매 Y 일 경우 수입부호 52210 적재 + */ + public static final String EXPENSE_INCOME_MARK = "52210"; } diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java index 4e95d946..be06f0c9 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/ports/application/DailyExpenseService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.expense.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; @@ -98,8 +99,8 @@ public class DailyExpenseService implements DailyExpensePortIn { formVO.getId(), formVO.getDailyRecordSeq(), formVO.getInputType(), - "2", // [정책] 2 고정 - (formVO.getCredit() ? "52210" : null), // [정책] 외상판매 Y 일 경우 수입부호 52210 적재 + DailyRecordConstants.EXPENSE_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.EXPENSE_INCOME_MARK : null), formVO.getCredit(), formVO.getExpenseKind(), formVO.getSourcePurpose(),