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/8] =?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/8] =?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 abd4f039a83c044ab082aa8d7c2d8d5c99e96f8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 30 Jun 2025 10:50:50 +0900 Subject: [PATCH 3/8] =?UTF-8?q?=ED=8C=8C=EB=B9=84=EC=BD=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/assets/images/kri_appimg.png | Bin 0 -> 16664 bytes .../static/assets/images/kri_favicon.ico | Bin 0 -> 9662 bytes .../static/assets/json/manifest.json | 15 ++ .../resources/static/assets/styles/style.css | 207 +++++++++++++++++- .../templates/common/components.html | 17 +- pom.xml | 21 +- 6 files changed, 242 insertions(+), 18 deletions(-) create mode 100644 front/src/main/resources/static/assets/images/kri_appimg.png create mode 100644 front/src/main/resources/static/assets/images/kri_favicon.ico create mode 100644 front/src/main/resources/static/assets/json/manifest.json diff --git a/front/src/main/resources/static/assets/images/kri_appimg.png b/front/src/main/resources/static/assets/images/kri_appimg.png new file mode 100644 index 0000000000000000000000000000000000000000..27ce6ecc8bd07227dfaa185adc11e166331e8f90 GIT binary patch literal 16664 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 z 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 NefZ=-sggy={{@qN-Npa_ literal 0 HcmV?d00001 diff --git a/front/src/main/resources/static/assets/images/kri_favicon.ico b/front/src/main/resources/static/assets/images/kri_favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..6faaf3bbea02299ae1842b3c00fad953c0a01885 GIT binary patch literal 9662 zcmeI2YfM~46vwZhjY$(s6Otx1Mv^8ZrhbtGQy$gC0Et!;jD6S#CWXdA8kB+!v`Nub z_yCrONw|F>HBHZ2OmaE2iOb@ zD=8Zb%N4h-1CBSoS-zq^!2u?HeuEvyWgZO3;L8-L^SG>oA@S!P|ClVN8bd00CYU}O zo_m8{JzNt~pJ2!n{f5eK@BM`!sGDrP)IaQ`o32}?f@`&Bz9Voa?>Z{kGY?eAHeWsJ zFLV&Dp*?ZiTXeYUbE?14F8lZG7h|DsW@zudzG8li3A_37;2iDG>^dgx13stF4>B<1 zG~JK;SY~Gbl=|fz|3p3;tnZ8i@5{$l%MUgP#&)`Xmqj)N_-V5BnfSrFlyJWo1A@7^ z-~3B4@O6x>&lh|wREZ`(Vov9WKeKr5c*#Bg8=nTOqsd<^VpHdbPh6WGpcibf(6g;s zsucE=(8YcH_3ZvLxYx8i0U>@(wj{G59b z1G>*6c58>M^rCM}i@AY>n}2e_>&K5df#~+<^$6{!9StTO*r(uEx^B2P-251${q{H& zI9e%ZxS87T*&gjWKhAYI=WH~w>fC&c^&t}cI+uRT{E6F&^k#L8wIEOo@9fNxxppn_ zkIYSzWvq)hzF86EQ^fMci56KSH?c&De{#-EUkaaqZ}a$^|FL#KkY5qwb?yOqzMP+M z^Mkvrzg+n;@(9*g=)mhQzdv3TYlCGR_V+FaUEUK;ez5Q8*r(VLcc*VO$T_&=YL(wt zSi6{i+0fdJ;o^slec2In@MGu!evA!%_8$#v*@xlc_s!w(8?f^_gxrVkCGhL{2YIt{ zuv*3n^3PJTT7Ju^ucRIEt;*kD81ty+^U`lb+%h|IA_Qv|_)%v6xg+(vu2T67bofZTvoSl@k3PR!`5TY3KD$ut)m5whbf(oDr(FAt zQhQHOYTrpp8TcY#|FAn)9xtt+EkB-D%+P_~rI|nVN~PH2{g#sKUkB`OHO#@D%^0## z^Nfoo|C*;7_poVv>A&}UAno#hYaMjZ<0!4W)bw1i@$UCEi|`v3=%Dw%A+Jo%0q>uu zb(N`kfbBVNrT;Xiym8a49G3HOjG zewiaKD_`!L^SP=Azmf41EQZv*QT!Vz<^VZpEwKDw7_vt?g)epb*}U%74H+tRQx3mt zYsofe|8UaCyvL6b`3bVvwY9{baox6PEF;E|quw6t_tR}H@yA$Ve@lN*e1QKSP^^xQ G1^xw(fAOsV literal 0 HcmV?d00001 diff --git a/front/src/main/resources/static/assets/json/manifest.json b/front/src/main/resources/static/assets/json/manifest.json new file mode 100644 index 00000000..bb1d8140 --- /dev/null +++ b/front/src/main/resources/static/assets/json/manifest.json @@ -0,0 +1,15 @@ +{ + "name": "My App", + "short_name": "MyApp", + "start_url": "/", + "display": "standalone", + "background_color": "#ffffff", + //"theme_color": "#4BBC43", + "icons": [ + { + "src": "kri_appimg.png", + "sizes": "512x512", + "type": "image/png" + } + ] +} diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index bd5932c6..3c8482d4 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -6198,7 +6198,7 @@ button.swiper-pagination-bullet { position: absolute; display: none; width: 100%; - background-color: #eeeeee; + background-color: #ffffff; border: 0.1rem solid #cccccc; } .component-select.type-custom .option { @@ -6262,9 +6262,9 @@ button.swiper-pagination-bullet { -webkit-box-direction: normal; -webkit-flex-direction: column; flex-direction: column; + background-color: #ffffff; width: 100%; position: absolute; - background-color: #eeeeee; border: 1px solid #cccccc; } @media screen and (max-width: 1023px) { @@ -6320,6 +6320,7 @@ button.swiper-pagination-bullet { .component-select.bottom-sheet .select-options .option.current { font-weight: 600; color: #4bbc43; + background-color: #F9FDF9; } /* component tab */ @@ -7730,6 +7731,15 @@ button.swiper-pagination-bullet { .footer .footer-menu ul li.menu-info.active { background-image: url("../images/common/ico_menu_info_active.svg"); } +.footer .footer-menu ul li.menu-use { + background-image: url("../images/common/ico_menu_use.svg"); +} +.footer .footer-menu ul li.menu-use.active { + background-image: url("../images/common/ico_menu_use_active.svg"); +} +.footer .footer-menu ul li.menu-use.disabled { + background-image: url("../images/common/ico_menu_use_disabled.svg"); +} .footer .footer-menu ul li.active a { color: #4bbc43; } @@ -8506,6 +8516,9 @@ button.swiper-pagination-bullet { } .regist-item-area .item-list .list-item .detail-list li p { position: relative; + min-width: -webkit-fit-content; + min-width: -moz-fit-content; + min-width: fit-content; margin-right: 0.4rem; padding-right: 0.9rem; font-size: 1.6rem; @@ -9045,4 +9058,194 @@ button.swiper-pagination-bullet { -webkit-box-orient: vertical; -webkit-line-clamp: 2; } + +.regi-wrap .month-detail { + border-image-outset: 0rem 0rem 6.4rem 0rem; +} +.regi-wrap .month-detail .tit { + padding-top: 3.2rem; + margin-bottom: 2rem; + font-size: 2rem; + line-height: 140%; + font-weight: 700; +} +.regi-wrap .month-detail .btn-column-list li { + padding: 2rem 1.6rem; +} +.regi-wrap .month-detail .btn-column-list li.view { + padding: 0; +} +.regi-wrap .month-detail .btn-column-list li.view .label { + position: relative; + padding-right: 2rem; +} +.regi-wrap .month-detail .btn-column-list li.view .label::before { + position: absolute; + display: block; + content: ""; + width: 2rem; + height: 2rem; + background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat; + right: 0; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} +.regi-wrap .month-detail .btn-column-list li.view a { + padding: 2rem 1.6rem; +} +.regi-wrap .month-detail .btn-column-list li.view a:before { + display: none; +} +.regi-wrap .month-detail .btn-column-list .value li { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + padding: 0; + box-shadow: none; + border: 0; +} +.regi-wrap .month-detail .btn-column-list .value li + li { + margin-top: 0.6rem; +} +.regi-wrap .month-detail .btn-column-list .value li.total { + margin-top: 0.4rem; +} +.regi-wrap .month-detail .btn-column-list .value li.total span { + color: #4bbc43 !important; +} +.regi-wrap .month-detail .btn-column-list .value li.total span:last-child { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + margin-left: auto; +} +.regi-wrap .month-detail .btn-column-list .value li.total strong { + margin-right: 0.2rem; + font-size: 2rem; + line-height: 140%; + font-weight: 600; +} +.regi-wrap .month-detail .btn-column-list .value li span { + font-size: 1.6rem; + line-height: 140%; + font-weight: 400; + color: #212529; +} +.regi-wrap .month-detail .btn-column-list .value li span:first-child { + padding-right: 1.2rem; + position: relative; + color: #868e96; + white-space: nowrap; +} +.regi-wrap .month-detail .btn-column-list .value li span:first-child:before { + position: absolute; + display: block; + content: ":"; + font-size: 1.6rem; + line-height: 140%; + right: 0.5rem; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); +} +.regi-wrap .component-select.bottom-sheet { + width: -webkit-fit-content; + width: -moz-fit-content; + width: fit-content; +} +.regi-wrap .component-select.bottom-sheet::after { + display: none; +} +.regi-wrap .component-select.bottom-sheet .select-box { + position: relative; + padding: 0; + border: none; + border-radius: 0; +} +.regi-wrap .component-select.bottom-sheet .select-box::after { + position: absolute; + content: ""; + display: block; + width: 3.2rem; + height: 3.2rem; + right: -4rem; + top: 50%; + -webkit-transform: translateY(-50%); + transform: translateY(-50%); + background: url("../images/common/ico_cal_arrow_next.svg") center/contain no-repeat; + rotate: 90deg; + -webkit-transform-origin: top; + transform-origin: top; +} +.regi-wrap .component-select.bottom-sheet .select-box .select-txt { + font-size: 2.8rem; + line-height: 140%; + font-weight: 700; +} +.regi-wrap .month-filter { + padding: 3.2rem 0rem; +} +.regi-wrap .month-filter .summary { + margin-top: 2rem; + display: -webkit-box; + display: -webkit-flex; + display: flex; + gap: 0.4rem; + -webkit-box-pack: justify; + -webkit-justify-content: space-between; + justify-content: space-between; + border-radius: 0.8rem; + overflow: hidden; +} +.regi-wrap .month-filter .summary li { + -webkit-box-flex: 1; + -webkit-flex: 1; + flex: 1; + padding: 1.6rem; + background-color: #f1faf0; +} +.regi-wrap .month-filter .summary li span { + color: #212529; + font-size: 1.6rem; + line-height: 140%; +} +.regi-wrap .month-filter .summary li p { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: end; + -webkit-justify-content: end; + justify-content: end; + margin-top: 1.2rem; + font-size: 1.6rem; + line-height: 140%; + color: #4bbc43; + text-align: right; +} +.regi-wrap .month-filter .summary li p strong { + margin-right: 0.2rem; + font-size: 2.8rem; + line-height: 140%; + font-weight: 700; +} +.regi-wrap .regist-item-area .month-tit { + margin-bottom: 1.6rem; + font-size: 2rem; + line-height: 140%; + font-weight: 700; + color: #212529; +} +.regi-wrap .regist-item-area .item-list + .month-tit { + margin-top: 2.4rem; +} /*# sourceMappingURL=style.css.map */ diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 3198b6d7..c3da8822 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -25,18 +25,15 @@ + - - - - + - - + - - - + + + @@ -176,7 +173,7 @@ - +