From 9a32a64bda2db3effd0100241458bc1c489184bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 27 Jun 2025 18:08:17 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=88=98=EC=9E=85=20=EB=93=B1=EB=A1=9D=20WIP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/GetHouseholdStatusUIController.java | 40 +-- .../persistence/CreateDailyIncomeDao.java | 40 +++ .../persistence/CreateDailyIncomeMapper.java | 39 +++ .../persistence/modal/GetDailyIncomeDto.java | 31 ++ .../web/CreateDailyIncomeController.java | 94 +++++++ .../web/model/CreateDailyIncomeReqVO.java | 63 +++++ .../web/model/DailyIncomeUIReqVO.java | 33 +++ .../adapters/web/model/DailyInputType.java | 13 + .../web/model/RemoveDailyIncomeReqVO.java | 22 ++ .../validator/CreateDailyIncomeValidator.java | 50 ++++ .../ports/CreateDailyIncomePortIn.java | 26 ++ .../ports/CreateDailyIncomePortOut.java | 27 ++ .../application/CreateDailyIncomeService.java | 86 ++++++ .../domain/CreateDailyIncomeCmd.java | 35 +++ .../application/domain/GetDailyIncomeCmd.java | 27 ++ .../domain/RemoveDailyIncomeCmd.java | 18 ++ .../daily/CreateDailyIncomeMapper.xml | 59 ++++ .../{ => daily}/RemoveDailyMapper.xml | 0 .../{ => daily}/UpdateDailyNoneMapper.xml | 0 .../households/modal/modal-daily-income.html | 264 ++++++++++++++++++ .../households/tab/daily-record.html | 10 +- .../resources/templates/households/{seq}.html | 19 ++ .../adapters/web/model/DailyUIReqVO.java | 5 + 23 files changed, 980 insertions(+), 21 deletions(-) create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyInputType.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java create mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java create mode 100644 admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml rename admin/src/main/resources/mappers/household/{ => daily}/RemoveDailyMapper.xml (100%) rename admin/src/main/resources/mappers/household/{ => daily}/UpdateDailyNoneMapper.xml (100%) create mode 100644 admin/src/main/resources/templates/households/modal/modal-daily-income.html 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/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java new file mode 100644 index 00000000..55d01c9d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java @@ -0,0 +1,40 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class CreateDailyIncomeDao implements CreateDailyIncomePortOut { + private final CreateDailyIncomeMapper dailyIncomeMapper; + + @Override + public GetDailyIncomeDto detail(GetDailyIncomeCmd command) { + + return dailyIncomeMapper.getDailyIncome(command); + } + + @Override + public void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command) { + Integer existCount = dailyIncomeMapper.getRecordExistCount(findCmd); + if (existCount == 0) { + dailyIncomeMapper.createDailyIncome(command); + + log.debug("[CreateDailyIncome] record={}", command); + } else { + dailyIncomeMapper.updateDailyIncome(command); + + log.debug("[UpdateDailyIncome] record={}", command); + } + } + +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java new file mode 100644 index 00000000..26dfb419 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeMapper.java @@ -0,0 +1,39 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence; + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface CreateDailyIncomeMapper { + /** + * 일계부 수입 데이터 조회 + * + * @param command 검색 조건 + * @return 수입 데이터 + */ + GetDailyIncomeDto getDailyIncome(GetDailyIncomeCmd command); + + /** + * 일계부 수입 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyIncomeCmd command); + + /** + * 일계부 수입 등록 + * + * @param command 등록 데이터 + */ + void createDailyIncome(CreateDailyIncomeCmd command); + + /** + * 일계부 수입 수정 + * + * @param command 수정 데이터 + */ + void updateDailyIncome(CreateDailyIncomeCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java new file mode 100644 index 00000000..5217b279 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java @@ -0,0 +1,31 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetDailyIncomeDto { + private Long id; + private Long dailyRecordSeq; + private String inputType; // TODO DailyInputType + 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; + + /** + * 수정 가능 여부 + * @return true=가능, false=불가능(등록 상태) + */ + public boolean isUpdated() { + return this.id != null && this.id != 0L; + } +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java new file mode 100644 index 00000000..1aae7844 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java @@ -0,0 +1,94 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web; + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator.CreateDailyIncomeValidator; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn; +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.config.application.util.CoreUtil; +import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +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 CreateDailyIncomeController { + private final CoreUtil coreUtil; + private final DailyRecordPortIn dailyRecordPortIn; + private final CreateDailyIncomePortIn dailyIncomePortIn; + private final CreateDailyIncomeValidator createValidator; + + @GetMapping(path = "/{id}") + ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) { + + reqVO.setId(Long.parseLong(id)); + + //DailyRecordDto dailyRecord = this.vaildGetDailyRecord(reqVO.getSearchMonth(), reqVO.getGroupNo()); + + GetDailyIncomeDto detail = dailyIncomePortIn.detail(reqVO); + + return ResponseEntity.status(HttpStatus.OK).body(detail); + } + + /** + * 일계부 수입 등록 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/{id}") + ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id + , @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) { + + createValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, null); + + formVO.setSearchMonth(searchMonth); + formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setId(Long.parseLong(id)); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyIncomePortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, Integer groupNo) { + DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq()); + 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/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java new file mode 100644 index 00000000..37356cb7 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java @@ -0,0 +1,63 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; + +import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class CreateDailyIncomeReqVO extends DailyUIReqVO { + /** + * 수입 일련번호 + */ + private Long id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; + /** + * 등록 유형 + */ + 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/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java new file mode 100644 index 00000000..85865da9 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java @@ -0,0 +1,33 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; + +import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.apache.tika.utils.StringUtils; + +@Getter +@Setter +public class DailyIncomeUIReqVO { + /** + * 검색 월(yyyyMM) + */ + private String recordMonth; + /** + * 검색 그룸번호 + */ + 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/createDailyIncome/adapters/web/model/DailyInputType.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyInputType.java new file mode 100644 index 00000000..963233b3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyInputType.java @@ -0,0 +1,13 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; + +public enum DailyInputType { + /** + * 직접 입력 + */ + SELF, + /** + * 영수증 입력 + */ + OCR, + ; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java new file mode 100644 index 00000000..edc0203d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java @@ -0,0 +1,22 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; + +import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@ToString(callSuper = true) +public class RemoveDailyIncomeReqVO extends DailyUIReqVO { + /** + * 수입 일련번호 + */ + @NotBlank(message = "{valid.common.required}") + private String id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java new file mode 100644 index 00000000..8c367ff3 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/validator/CreateDailyIncomeValidator.java @@ -0,0 +1,50 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator; + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; +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 CreateDailyIncomeValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return CreateDailyIncomeReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + CreateDailyIncomeReqVO vo = (CreateDailyIncomeReqVO) 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/createDailyIncome/ports/CreateDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java new file mode 100644 index 00000000..671b1da0 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java @@ -0,0 +1,26 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; + +import java.util.List; + +public interface CreateDailyIncomePortIn { + /** + * 일계부 수입 조회 + * + * @param reqVO 검색 조건 + * @return 수입 상세 + */ + GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO); + + /** + * 일계부 수입 등록 + * + * @param formVO 입력 데이터 + */ + void create(CreateDailyIncomeReqVO formVO); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java new file mode 100644 index 00000000..edee8e4d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports; + + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; + +import java.util.List; + +public interface CreateDailyIncomePortOut { + /** + * 일계부 수입 조회 + * + * @param command 검색 조건 + * @return 수입 목록 + */ + GetDailyIncomeDto detail(GetDailyIncomeCmd command); + + /** + * 일계부 수입 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyIncomeCmd findCmd, CreateDailyIncomeCmd command); +} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java new file mode 100644 index 00000000..eef1c25d --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java @@ -0,0 +1,86 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application; + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; +import app.module.core.config.application.util.AuditUtil; +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; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class CreateDailyIncomeService implements CreateDailyIncomePortIn { + private final CreateDailyIncomePortOut portOut; + private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordPortIn dailyRecordPortIn; + + @Override + public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) { + GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( + reqVO.getRecordMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId()); + + return portOut.detail(findCmd); + } + + /** + * 코드명 조회 + * + * @param codeId 코드 + * @param codeList 공통 코드 목록 + * @return 코드명 + */ + private String getCodeLabel(String codeId, List codeList) { + String returnValue = null; + for (UICodeElement codeSetup : codeList) { + if (codeSetup.getId().equalsIgnoreCase(codeId)) { + returnValue = codeSetup.getCodeText(); + break; + } + } + return returnValue; + } + + @Override + public void create(CreateDailyIncomeReqVO formVO) { + GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + CreateDailyIncomeCmd command = AuditUtil.create( + new CreateDailyIncomeCmd( + formVO.getId(), + formVO.getDailyRecordSeq(), + formVO.getInputType(), + "1", // [정책] 1 고정 + (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 + 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/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java new file mode 100644 index 00000000..0bcf4094 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java @@ -0,0 +1,35 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain; + +import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyInputType; +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 CreateDailyIncomeCmd 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/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java new file mode 100644 index 00000000..3afe2570 --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/GetDailyIncomeCmd.java @@ -0,0 +1,27 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.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/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java new file mode 100644 index 00000000..c9674ced --- /dev/null +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java @@ -0,0 +1,18 @@ +package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.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 RemoveDailyIncomeCmd extends AuditCommand { + private String searchMonth; + private Integer groupNo; + private Long id; + private Long dailyRecordSeq; +} diff --git a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml b/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml new file mode 100644 index 00000000..b29286b6 --- /dev/null +++ b/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml @@ -0,0 +1,59 @@ + + + + + + + + + + insert into daily_income ( + daily_record_seq, input_type, category, expense_mark + , is_credit, crop_code, income_kind, source_purpose + , quantity, unit_code, unit_self, price, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{inputType}, #{category}, #{expenseMark} + , #{credit}, #{cropCode}, #{incomeKind}, #{sourcePurpose} + , #{quantity}, #{unitCode}, #{unitSelf}, #{price}, #{estimatedValue} + , false + , + ) + + + + update daily_income set + , is_credit = #{credit} + , expense_mark = #{expenseMark} + , crop_code = #{cropCode} + , income_kind = #{incomeKind} + , 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/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/UpdateDailyNoneMapper.xml b/admin/src/main/resources/mappers/household/daily/UpdateDailyNoneMapper.xml similarity index 100% rename from admin/src/main/resources/mappers/household/UpdateDailyNoneMapper.xml rename to admin/src/main/resources/mappers/household/daily/UpdateDailyNoneMapper.xml 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 new file mode 100644 index 00000000..e8b104a2 --- /dev/null +++ b/admin/src/main/resources/templates/households/modal/modal-daily-income.html @@ -0,0 +1,264 @@ + + + +
+
+ + + + +
+ + + + + + +
+ \ 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 1bacad11..6653bb1d 100644 --- a/admin/src/main/resources/templates/households/tab/daily-record.html +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -508,7 +508,7 @@ ${item.isCredit ? "Y" : "N"} ${ifNullHyphen(item.cropText)} - ${ifNullHyphen(item.incomeKind)} + ${ifNullHyphen(item.incomeKind)} ${ifNullHyphen(item.sourcePurpose)} ${formatNumberWithComma(item.quantity)} ${ifNullHyphen(item.unitText)} @@ -806,9 +806,13 @@ const saveDaily = (el) => { const currentStep = $(el).data('step'); const currentModalId = $(el).data('modalId'); - console.log('removeDaily', currentStep, currentModalId); + console.log('saveDaily', currentStep, currentModalId); - alert('TODO : 추가') + if (currentStep === 'INCOME') { + showDailyIncomeModal(); + } else { + alert('TODO : 추가'); + } } // 일계부 삭제 처리 diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index de2ce186..9d4bd5ea 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -175,6 +175,9 @@ + + + @@ -321,6 +324,22 @@ unitArea.classList.add('input-disabled'); } } + + // 금액 1개 입력시 다른 금액 input disable + const priceDisabled = (el, disableEl) => { + const wrap = disableEl.closest('td'); + const disableArea = wrap.querySelector('.component-input'); + const disableInput = wrap.querySelector('input'); + + if (el.value === '') { + disableInput.disabled = false; + disableArea.classList.remove('input-disabled'); + } else { + disableInput.disabled = true; + disableInput.value = ''; + disableArea.classList.add('input-disabled'); + } + } diff --git a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java index 1470359d..6afd046b 100644 --- a/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java +++ b/core/src/main/java/app/module/core/usecase/daily/record/adapters/web/model/DailyUIReqVO.java @@ -24,6 +24,11 @@ public class DailyUIReqVO { this.householdSeq = householdSeq; } + public DailyUIReqVO(String searchMonth, Integer groupNo) { + this.searchMonth = searchMonth; + this.groupNo = groupNo; + } + /** * 검색 월(yyyyMM) */ From 5e6b01f8e44abf56339c5ea3b1da4473da8b6b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 30 Jun 2025 10:41:11 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20ID=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/main/resources/mappers/daily/DailyExpenseMapper.xml | 4 ++-- front/src/main/resources/mappers/daily/DailyFarmingMapper.xml | 4 ++-- .../src/main/resources/mappers/daily/DailyForestryMapper.xml | 4 ++-- front/src/main/resources/mappers/daily/DailyIncomeMapper.xml | 4 ++-- front/src/main/resources/mappers/daily/DailyPowerMapper.xml | 4 ++-- front/src/main/resources/mappers/daily/DailyWorkMapper.xml | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml index 074ecbf3..eaa36da7 100644 --- a/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyExpenseMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml index 1b64984c..aa996353 100644 --- a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyForestryMapper.xml b/front/src/main/resources/mappers/daily/DailyForestryMapper.xml index dc4bbba6..a8a626ca 100644 --- a/front/src/main/resources/mappers/daily/DailyForestryMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyForestryMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml index 3dca633c..a1383321 100644 --- a/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyIncomeMapper.xml @@ -11,7 +11,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -23,7 +23,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyPowerMapper.xml b/front/src/main/resources/mappers/daily/DailyPowerMapper.xml index 482fb168..50c6b323 100644 --- a/front/src/main/resources/mappers/daily/DailyPowerMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyPowerMapper.xml @@ -10,7 +10,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -22,7 +22,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml index 19a46e6b..2dd2b588 100644 --- a/front/src/main/resources/mappers/daily/DailyWorkMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyWorkMapper.xml @@ -14,7 +14,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} order by ds.id desc @@ -26,7 +26,7 @@ where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} From 24283d7ddaa12996c52c65e83489909f31b794b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 30 Jun 2025 13:30:27 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[BO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=88=98=EC=9E=85=20=EB=93=B1=EB=A1=9D&=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/CreateDailyIncomeDao.java | 7 +- .../persistence/modal/GetDailyIncomeDto.java | 11 +- .../web/CreateDailyIncomeController.java | 40 +++---- .../web/model/CreateDailyIncomeReqVO.java | 12 +- .../web/model/DailyIncomeUIReqVO.java | 8 +- .../web/model/RemoveDailyIncomeReqVO.java | 22 ---- .../ports/CreateDailyIncomePortIn.java | 3 - .../ports/CreateDailyIncomePortOut.java | 5 +- .../application/CreateDailyIncomeService.java | 34 +----- .../domain/CreateDailyIncomeCmd.java | 2 +- .../domain/RemoveDailyIncomeCmd.java | 18 --- .../daily/CreateDailyIncomeMapper.xml | 4 +- .../resources/static/scripts/ajaxUtils.js | 58 +++------- .../households/modal/modal-daily-income.html | 109 +++++++++--------- .../application/enums}/DailyInputType.java | 2 +- .../config/constants/CommonConstants.java | 17 +++ .../constants/DailyRecordConstants.java | 19 +++ .../adapters/persistence/DailyRecordDao.java | 9 +- .../daily/record/ports/DailyRecordPortIn.java | 7 ++ .../ports/application/DailyRecordService.java | 33 +++++- .../application/domain/GetDailyRecordCmd.java | 14 +++ .../mappers/daily/DailyRecordMapper.xml | 8 ++ .../ports/application/DailyIncomeService.java | 5 +- 23 files changed, 211 insertions(+), 236 deletions(-) delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java delete mode 100644 admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java rename {admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model => core/src/main/java/app/module/core/config/application/enums}/DailyInputType.java (58%) create mode 100644 core/src/main/java/app/module/core/config/constants/CommonConstants.java create mode 100644 core/src/main/java/app/module/core/config/constants/DailyRecordConstants.java diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java index 55d01c9d..ba32b5ba 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/CreateDailyIncomeDao.java @@ -4,13 +4,10 @@ import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adap import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; -import java.util.List; - @Slf4j @Service @RequiredArgsConstructor @@ -29,11 +26,11 @@ public class CreateDailyIncomeDao implements CreateDailyIncomePortOut { if (existCount == 0) { dailyIncomeMapper.createDailyIncome(command); - log.debug("[CreateDailyIncome] record={}", command); + log.debug("[CreateDailyIncome] command={}", command); } else { dailyIncomeMapper.updateDailyIncome(command); - log.debug("[UpdateDailyIncome] record={}", command); + log.debug("[UpdateDailyIncome] command={}", command); } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java index 5217b279..93436d4d 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/persistence/modal/GetDailyIncomeDto.java @@ -1,5 +1,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal; +import app.module.core.config.application.enums.DailyInputType; import lombok.Getter; import lombok.Setter; @@ -8,7 +9,7 @@ import lombok.Setter; public class GetDailyIncomeDto { private Long id; private Long dailyRecordSeq; - private String inputType; // TODO DailyInputType + private DailyInputType inputType; private Boolean credit; private String cropCode; private String cropLabel; @@ -20,12 +21,4 @@ public class GetDailyIncomeDto { private String unitSelf; private Long price; private Long estimatedValue; - - /** - * 수정 가능 여부 - * @return true=가능, false=불가능(등록 상태) - */ - public boolean isUpdated() { - return this.id != null && this.id != 0L; - } } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java index 1aae7844..cb6dbfd4 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/CreateDailyIncomeController.java @@ -3,13 +3,11 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ada import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.validator.CreateDailyIncomeValidator; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn; import app.module.core.config.application.exception.NoRecordDataException; import app.module.core.config.application.util.CoreUtil; import app.module.core.usecase.daily.record.adapters.persistence.model.DailyRecordDto; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; import app.module.core.usecase.daily.record.ports.DailyRecordPortIn; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; @@ -29,14 +27,21 @@ public class CreateDailyIncomeController { private final CreateDailyIncomePortIn dailyIncomePortIn; private final CreateDailyIncomeValidator createValidator; + /** + * 일계부 수입 조회 + * + * @param id 수입 일련번호 + * @param reqVO 검색 조건 + */ @GetMapping(path = "/{id}") ResponseEntity detail(@PathVariable("id") String id, @ModelAttribute DailyIncomeUIReqVO reqVO) { reqVO.setId(Long.parseLong(id)); - //DailyRecordDto dailyRecord = this.vaildGetDailyRecord(reqVO.getSearchMonth(), reqVO.getGroupNo()); - GetDailyIncomeDto detail = dailyIncomePortIn.detail(reqVO); + if (detail == null) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(null); + } return ResponseEntity.status(HttpStatus.OK).body(detail); } @@ -44,28 +49,26 @@ public class CreateDailyIncomeController { /** * 일계부 수입 등록 처리 * - * @param searchMonth 검색 월(yyyyMM) - * @param groupNo 검색 그룹 * @param id 수입 일련번호 * @param formVO 입력 데이터 * @param bindingResult BindingResult */ @PostMapping(path = "/{id}") - ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @PathVariable("id") String id + ResponseEntity create(@PathVariable("id") String id , @Valid @RequestBody CreateDailyIncomeReqVO formVO, BindingResult bindingResult) { createValidator.validate(formVO, bindingResult); if (bindingResult.hasErrors()) { - return coreUtil.getErrorInfo(bindingResult); + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); } - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, null); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(formVO.getDailyId()); - formVO.setSearchMonth(searchMonth); - formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); formVO.setId(Long.parseLong(id)); - formVO.setDailyRecordSeq(dailyRecord.getId()); + formVO.setDailyId(dailyRecord.getId()); log.debug("formVO: {}", formVO); dailyIncomePortIn.create(formVO); @@ -73,18 +76,13 @@ public class CreateDailyIncomeController { return ResponseEntity.status(HttpStatus.OK).body(formVO); } - /** * 일계부 유효성 체크 및 데이터 조회 * - * @param searchMonth 검색 월(yyyyMM) - * @param groupNo 검색 그룹 + * @param dailyRecordSeq 항목 일련번호 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, Integer groupNo) { - DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); - log.debug("getRecordUIReq: {}", reqVO); - - DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq()); + private DailyRecordDto vaildGetDailyRecord(Long dailyRecordSeq) { + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(dailyRecordSeq); if (dailyRecord == null || dailyRecord.getId() == null) { throw new NoRecordDataException(); } diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java index 37356cb7..23a2648c 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/CreateDailyIncomeReqVO.java @@ -1,6 +1,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.core.config.application.enums.DailyInputType; import jakarta.validation.constraints.NotBlank; import lombok.Getter; import lombok.Setter; @@ -9,15 +9,7 @@ import lombok.ToString; @Getter @Setter @ToString(callSuper = true) -public class CreateDailyIncomeReqVO extends DailyUIReqVO { - /** - * 수입 일련번호 - */ - private Long id; - /** - * 일계부 일련번호 - */ - private Long dailyRecordSeq; +public class CreateDailyIncomeReqVO extends DailyIncomeUIReqVO { /** * 등록 유형 */ diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java index 85865da9..3f3901d0 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/DailyIncomeUIReqVO.java @@ -1,10 +1,8 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; import lombok.Setter; -import lombok.ToString; -import org.apache.tika.utils.StringUtils; @Getter @Setter @@ -12,7 +10,7 @@ public class DailyIncomeUIReqVO { /** * 검색 월(yyyyMM) */ - private String recordMonth; + private String searchMonth; /** * 검색 그룸번호 */ @@ -21,11 +19,11 @@ public class DailyIncomeUIReqVO { * 임가 일련번호 */ private Long householdSeq; + /** * 일계부 항목 일련번호 */ private Long dailyId; - /** * 수입 일련번호 */ diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java deleted file mode 100644 index edc0203d..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/adapters/web/model/RemoveDailyIncomeReqVO.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model; - -import app.module.core.usecase.daily.record.adapters.web.model.DailyUIReqVO; -import jakarta.validation.constraints.NotBlank; -import lombok.Getter; -import lombok.Setter; -import lombok.ToString; - -@Getter -@Setter -@ToString(callSuper = true) -public class RemoveDailyIncomeReqVO extends DailyUIReqVO { - /** - * 수입 일련번호 - */ - @NotBlank(message = "{valid.common.required}") - private String id; - /** - * 일계부 일련번호 - */ - private Long dailyRecordSeq; -} diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java index 671b1da0..559c23cf 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortIn.java @@ -4,9 +4,6 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; - -import java.util.List; public interface CreateDailyIncomePortIn { /** diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java index edee8e4d..1d0af5d9 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/CreateDailyIncomePortOut.java @@ -4,16 +4,13 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; - -import java.util.List; public interface CreateDailyIncomePortOut { /** * 일계부 수입 조회 * * @param command 검색 조건 - * @return 수입 목록 + * @return 수입 상세 */ GetDailyIncomeDto detail(GetDailyIncomeCmd command); diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java index eef1c25d..f9bb7db5 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/CreateDailyIncomeService.java @@ -3,32 +3,26 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.por import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.persistence.modal.GetDailyIncomeDto; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.CreateDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyIncomeUIReqVO; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.RemoveDailyIncomeReqVO; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortIn; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.CreateDailyIncomePortOut; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.CreateDailyIncomeCmd; import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.GetDailyIncomeCmd; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain.RemoveDailyIncomeCmd; 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 app.module.core.usecase.uicode.list.ports.UICodeListPortIn; -import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.List; - @Service @RequiredArgsConstructor public class CreateDailyIncomeService implements CreateDailyIncomePortIn { private final CreateDailyIncomePortOut portOut; - private final UICodeListPortIn uiCodeListPortIn; private final DailyRecordPortIn dailyRecordPortIn; @Override public GetDailyIncomeDto detail(DailyIncomeUIReqVO reqVO) { GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( - reqVO.getRecordMonth(), + reqVO.getSearchMonth(), reqVO.getGroupNo(), reqVO.getHouseholdSeq(), reqVO.getId()); @@ -36,24 +30,6 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn { return portOut.detail(findCmd); } - /** - * 코드명 조회 - * - * @param codeId 코드 - * @param codeList 공통 코드 목록 - * @return 코드명 - */ - private String getCodeLabel(String codeId, List codeList) { - String returnValue = null; - for (UICodeElement codeSetup : codeList) { - if (codeSetup.getId().equalsIgnoreCase(codeId)) { - returnValue = codeSetup.getCodeText(); - break; - } - } - return returnValue; - } - @Override public void create(CreateDailyIncomeReqVO formVO) { GetDailyIncomeCmd findCmd = new GetDailyIncomeCmd( @@ -65,10 +41,10 @@ public class CreateDailyIncomeService implements CreateDailyIncomePortIn { CreateDailyIncomeCmd command = AuditUtil.create( new CreateDailyIncomeCmd( formVO.getId(), - formVO.getDailyRecordSeq(), + formVO.getDailyId(), formVO.getInputType(), - "1", // [정책] 1 고정 - (formVO.getCredit() ? "91206" : null), // [정책] 외상판매 Y 일 경우 지출부호 91206 적재 + DailyRecordConstants.INCOME_CATEGORY, + (formVO.getCredit() ? DailyRecordConstants.INCOME_EXPENSE_MARK : null), formVO.getCredit(), formVO.getCropCode(), formVO.getIncomeKind(), diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java index 0bcf4094..5dcb3f31 100644 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java +++ b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/CreateDailyIncomeCmd.java @@ -1,7 +1,7 @@ package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.ports.application.domain; -import app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.adapters.web.model.DailyInputType; 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; diff --git a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java b/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java deleted file mode 100644 index c9674ced..00000000 --- a/admin/src/main/java/app/module/admin/usecase/household/tab/dailyRecord/createDailyIncome/ports/application/domain/RemoveDailyIncomeCmd.java +++ /dev/null @@ -1,18 +0,0 @@ -package app.module.admin.usecase.household.tab.dailyRecord.createDailyIncome.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 RemoveDailyIncomeCmd extends AuditCommand { - private String searchMonth; - private Integer groupNo; - private Long id; - private Long dailyRecordSeq; -} diff --git a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml b/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml index b29286b6..65b113ce 100644 --- a/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml +++ b/admin/src/main/resources/mappers/household/daily/CreateDailyIncomeMapper.xml @@ -10,7 +10,7 @@ from daily_income ds where ds.is_deleted = false - and ds.id = ${id} + and ds.id = #{id} diff --git a/admin/src/main/resources/static/scripts/ajaxUtils.js b/admin/src/main/resources/static/scripts/ajaxUtils.js index 639fdf8a..d37cfd02 100644 --- a/admin/src/main/resources/static/scripts/ajaxUtils.js +++ b/admin/src/main/resources/static/scripts/ajaxUtils.js @@ -25,47 +25,17 @@ var ajaxUtil = { }, _alertError : function (code) { - var message = ajaxUtil._msg500; - if (code == '400') { + let message = ajaxUtil._msg500; + if (code === '400') { message = ajaxUtil._msg400; } + ajaxUtil._alert(message, '오류 안내'); }, - _alert : function (alertMessage, alertTitle, afterEvent) { - etUI.dialog.alert({ - title: alertTitle, - message: alertMessage, - type: "alert", - callback: function() { - console.log("alert callback"); - }, - }); - }, - _alertId : function (alertId, afterEvent) { - ajaxUtil._alertMethod({ - id: alertId, - title: null, - message: null, - after: afterEvent !== undefined ? (afterEvent ? 'Y' : 'N') : 'N', - }); - }, - _alertMethod : function (jsonObj) { - ajaxUtil._ajaxSyncNoWaiting( - '/m/common/alert', - jsonObj, - function(rstData) { - var $wrap = $('#bindWrap'); - if ($wrap.find('.ui-popup-common-alert').length != 0) { - $wrap.find('.ui-popup-common-alert').remove(); - } + _alert : function (alertMessage, alertTitle) { + console.warn(alertTitle) - $wrap.append(rstData); - uxgFn.popup.bind('.ui-popup-common-alert').open(); - }, - function(code, rstData) { - kri.logger.error('Do nothing. code: '+ code, rstData); - }, - 'html'); + alert(alertMessage); }, @@ -130,22 +100,22 @@ var ajaxUtil = { contentType : 'application/json; charset=UTF-8', async: async, statusCode : { + 400:function(){ + ajaxUtil._alertError(ajaxUtil.$400); + }, 404:function(rstData){ ajaxUtil._hideWaiting(); if (typeof errorCallback !== 'undefined') { errorCallback(ajaxUtil.$404, rstData); } else { - // kri.menu.main(); - kri.logger.error('statusCode: 404'); + console.error('statusCode: 404'); } }, 401:function(){ - // kri.menu.main(); - kri.logger.error('statusCode: 401'); + console.error('statusCode: 401'); }, 403:function(rstData){ - // kri.menu.main(); - kri.logger.error('statusCode: 403'); + console.error('statusCode: 403'); }, 422:function(rstData, status) { console.log(rstData); @@ -195,13 +165,15 @@ var ajaxUtil = { }, success : function(rstData, status) { ajaxUtil._hideWaiting(); + console.log('succ', rstData) if (typeof successCallback !== 'undefined') { successCallback(rstData, status); } }, error : function(rstData) { ajaxUtil._hideWaiting(); - if (!(rstData.status == 500 || rstData.status == 422)) { + console.log('error') + if (!(rstData.status == 500 || rstData.status == 422 || rstData.status == 400)) { if (typeof errorCallback !== 'undefined') { errorCallback(rstData.status, rstData); } else { 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 e8b104a2..041b97c1 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 @@ -3,9 +3,12 @@ layout:decorate="~{layout/layout}">
-
- + + + + +