From 94268e137e95b9f5497397b9383b71dbb1211594 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Fri, 20 Jun 2025 16:33:23 +0900 Subject: [PATCH 01/52] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=9E=90=EA=B0=80=EB=86=8D=EC=97=85=20CRUD,=20=EA=B3=B5?= =?UTF-8?q?=ED=86=B5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapters/persistence/DailyFarmingDao.java | 48 ++++ .../persistence/DailyFarmingMapper.java | 49 ++++ .../persistence/model/DailyFarmingDto.java | 28 +++ .../adapters/web/DailyFarmingController.java | 131 +++++++++++ .../web/DailyFarmingUIController.java | 115 +++++++++ .../web/model/CreateDailyFarmingReqVO.java | 50 ++++ .../web/model/DailyFarmingUIReqVO.java | 24 ++ .../web/model/RemoveDailyFarmingReqVO.java | 22 ++ .../CreateDailyFarmingValidator.java | 35 +++ .../farming/ports/DailyFarmingPortIn.java | 41 ++++ .../farming/ports/DailyFarmingPortOut.java | 35 +++ .../application/DailyFarmingService.java | 156 +++++++++++++ .../domain/CreateDailyFarmingCmd.java | 25 ++ .../domain/GetDailyFarmingCmd.java | 27 +++ .../domain/RemoveDailyFarmingCmd.java | 18 ++ .../adapters/web/DailyRecordUIController.java | 5 +- .../mappers/daily/DailyFarmingMapper.xml | 72 ++++++ .../mappers/daily/DailyRecordMapper.xml | 2 +- .../main/resources/messages/uri.properties | 1 + .../templates/record/daily/done.html | 18 +- .../templates/record/daily/index.html | 4 +- .../templates/record/farming/form.html | 145 ++++++++++++ .../templates/record/farming/index.html | 219 ++++++++++++++++++ 23 files changed, 1265 insertions(+), 5 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/DailyFarmingUIReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/RemoveDailyFarmingReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/GetDailyFarmingCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/RemoveDailyFarmingCmd.java create mode 100644 front/src/main/resources/mappers/daily/DailyFarmingMapper.xml create mode 100644 front/src/main/resources/templates/record/farming/form.html create mode 100644 front/src/main/resources/templates/record/farming/index.html diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java new file mode 100644 index 00000000..ec3c1261 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingDao.java @@ -0,0 +1,48 @@ +package app.module.front.usecase.daily.farming.adapters.persistence; + +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.ports.DailyFarmingPortOut; +import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Slf4j +@Repository +@RequiredArgsConstructor +public class DailyFarmingDao implements DailyFarmingPortOut { + private final DailyFarmingMapper mapper; + + @Override + public List list(GetDailyFarmingCmd command) { + return mapper.getDailyFarmingList(command); + } + + @Override + public void create(GetDailyFarmingCmd findCmd, CreateDailyFarmingCmd command) { + Integer existCount = mapper.getRecordExistCount(findCmd); + if (existCount == 0) { + mapper.createDailyFarming(command); + + log.debug("[CreateDailyFarming] record={}", command); + } else { + mapper.updateDailyFarming(command); + + log.debug("[UpdateDailyFarming] record={}", command); + } + } + + @Override + public void remove(GetDailyFarmingCmd findCmd, RemoveDailyFarmingCmd command) { + Integer existCount = mapper.getRecordExistCount(findCmd); + if (existCount != 0) { + mapper.removeDailyFarming(command); + + log.debug("[RemoveDailyFarming] record={}", command); + } + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java new file mode 100644 index 00000000..b7b321b6 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/DailyFarmingMapper.java @@ -0,0 +1,49 @@ +package app.module.front.usecase.daily.farming.adapters.persistence; + +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface DailyFarmingMapper { + /** + * 일계부 자가농업 목록 조회 + * + * @param command 검색 조건 + * @return 수입 목록 + */ + List getDailyFarmingList(GetDailyFarmingCmd command); + + /** + * 일계부 자가농업 데이터 존재 여부 + * + * @param command 검색 조건 + * @return 중복 개수 + */ + Integer getRecordExistCount(GetDailyFarmingCmd command); + + /** + * 일계부 자가농업 등록 + * + * @param command 등록 데이터 + */ + void createDailyFarming(CreateDailyFarmingCmd command); + + /** + * 일계부 자가농업 수정 + * + * @param command 수정 데이터 + */ + void updateDailyFarming(CreateDailyFarmingCmd command); + + /** + * 일계부 자가농업 삭제 + * + * @param command 삭제 데이터 + */ + void removeDailyFarming(RemoveDailyFarmingCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java new file mode 100644 index 00000000..965946d2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/persistence/model/DailyFarmingDto.java @@ -0,0 +1,28 @@ +package app.module.front.usecase.daily.farming.adapters.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyFarmingDto { + private Long id; + private Long dailyRecordSeq; + private String productCode; + private String productLabel; + private String productSelf; + private String usage; + private String quantity; + private String unitCode; + private String unitLabel; + private String unitSelf; + private Integer estimatedValue; + + /** + * 수정 가능 여부 + * @return true=가능, false=불가능(등록 상태) + */ + public boolean isUpdated() { + return this.id != null && this.id != 0L; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java new file mode 100644 index 00000000..e989dbd2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingController.java @@ -0,0 +1,131 @@ +package app.module.front.usecase.daily.farming.adapters.web; + +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.config.application.util.CoreUtil; +import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; +import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; +import app.module.front.usecase.daily.farming.adapters.web.validator.CreateDailyFarmingValidator; +import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.front.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/record/farming") +public class DailyFarmingController { + private final CoreUtil coreUtil; + private final DailyRecordPortIn dailyRecordService; + private final DailyFarmingService dailyFarmingPortIn; + private final CreateDailyFarmingValidator createValidator; + + /** + * 일계부 자가농업 등록 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/form/{id}") + ResponseEntity create(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id + , @Valid @RequestBody CreateDailyFarmingReqVO formVO, BindingResult bindingResult) { + + createValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return coreUtil.getErrorInfo(bindingResult); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + formVO.setSearchMonth(searchMonth); + formVO.setGroupNo(Integer.parseInt(groupNo)); + formVO.setId(Long.parseLong(id)); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyFarmingPortIn.create(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 자가농업 삭제 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param formVO 입력 데이터 + * @param bindingResult BindingResult + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/remove") + ResponseEntity remove(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @Valid @RequestBody RemoveDailyFarmingReqVO formVO, BindingResult bindingResult) { + + log.debug("before formVO: {}", formVO); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyFarmingPortIn.remove(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 자가농업 전체 삭제 처리 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + @PostMapping(path = "/{searchMonth}/{groupNo}/reset") + ResponseEntity removeAll(@PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo) { + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + RemoveDailyFarmingReqVO formVO = new RemoveDailyFarmingReqVO(); + formVO.setSearchMonth(dailyRecord.getRecordMonth()); + formVO.setGroupNo(dailyRecord.getGroupNo()); + formVO.setDailyRecordSeq(dailyRecord.getId()); + log.debug("formVO: {}", formVO); + + dailyFarmingPortIn.remove(formVO); + + return ResponseEntity.status(HttpStatus.OK).body(formVO); + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordService.detail(reqVO); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java new file mode 100644 index 00000000..82d0fa99 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java @@ -0,0 +1,115 @@ +package app.module.front.usecase.daily.farming.adapters.web; + +import app.module.core.config.application.exception.NoRecordDataException; +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.front.usecase.daily.farming.ports.application.DailyFarmingService; +import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.adapters.web.model.DailySort; +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import app.module.front.usecase.daily.record.ports.DailyRecordPortIn; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.thymeleaf.util.StringUtils; + +import java.util.List; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/farming") +public class DailyFarmingUIController { + private final UICodeListPortIn uiCodeListPortIn; + private final DailyRecordPortIn dailyRecordPortIn; + private final DailyFarmingService dailyFarmingPortIn; + + /** + * 일계부 자가농업 목록 화면 + * + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param searchType 수정여부 + */ + @GetMapping(path = "/{searchMonth}/{groupNo}") + public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @RequestParam(name = "type", required = false) String searchType) { + + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + + DailyFarmingUIReqVO reqVO = new DailyFarmingUIReqVO(searchMonth, groupNo); + log.debug("reqVO: {}", reqVO); + + List farmingList = dailyFarmingPortIn.list(reqVO); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("dailyRecord", dailyRecord); + model.addAttribute("farmingList", farmingList); + model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.FARMING)); + + return "record/farming/index"; + } + + /** + * 일계부 자가농업 등록 화면 + * + * @param model Model + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + * @param id 수입 일련번호 + */ + @GetMapping(path = "/{searchMonth}/{groupNo}/form/{id}") + public String formBySelf(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo + , @PathVariable("id") String id) { + + DailyFarmingUIReqVO reqVO = new DailyFarmingUIReqVO(searchMonth, groupNo); + if (StringUtils.isEmpty(id)) { + reqVO.setId(0L); + } else { + reqVO.setId(Long.parseLong(id)); + } + log.debug("reqVO: {}", reqVO); + + DailyFarmingDto detail = new DailyFarmingDto(); + if (reqVO.getId() != 0L) { + detail = dailyFarmingPortIn.detail(reqVO); + if (detail == null || !detail.isUpdated()) { + throw new NoRecordDataException(); + } + } + + model.addAttribute("recordFarming", uiCodeListPortIn.connect("code.record.farming")); + model.addAttribute("recordUnit", uiCodeListPortIn.connect("code.record.unit")); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("detail", detail); + + return "record/farming/form"; + } + + /** + * 일계부 유효성 체크 및 데이터 조회 + * + * @param searchMonth 검색 월(yyyyMM) + * @param groupNo 검색 그룹 + */ + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); + log.debug("getRecordUIReq: {}", reqVO); + + DailyRecordDto dailyRecord = dailyRecordPortIn.detail(reqVO); + if (dailyRecord == null || dailyRecord.getId() == null) { + throw new NoRecordDataException(); + } + + return dailyRecord; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java new file mode 100644 index 00000000..937318be --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/CreateDailyFarmingReqVO.java @@ -0,0 +1,50 @@ +package app.module.front.usecase.daily.farming.adapters.web.model; + +import app.module.front.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 CreateDailyFarmingReqVO extends DailyUIReqVO { + /** + * 자가농업 일련번호 + */ + private Long id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; + /** + * 생산물 + */ + @NotBlank(message = "생산물을 입력해 주세요.") + private String productCode; + /** + * 생산물 직접 입력 + */ + private String productSelf; + /** + * 용도 + */ + private String usage; + /** + * 수량 + */ + private Double quantity; + /** + * 단위 코드 + */ + private String unitCode; + /** + * 단위 직접 입력 + */ + private String unitSelf; + /** + * 현물평가액 + */ + private Integer estimatedValue; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/DailyFarmingUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/DailyFarmingUIReqVO.java new file mode 100644 index 00000000..18903298 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/DailyFarmingUIReqVO.java @@ -0,0 +1,24 @@ +package app.module.front.usecase.daily.farming.adapters.web.model; + +import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.apache.tika.utils.StringUtils; + +@Getter +@Setter +@ToString(callSuper = true) +public class DailyFarmingUIReqVO extends DailyUIReqVO { + public DailyFarmingUIReqVO(String month, String no) { + setSearchMonth(month); + if (!StringUtils.isBlank(no)) { + setGroupNo(Integer.parseInt(no)); + } + } + + /** + * 자가농업 일련번호 + */ + private Long id; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/RemoveDailyFarmingReqVO.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/RemoveDailyFarmingReqVO.java new file mode 100644 index 00000000..7b723834 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/model/RemoveDailyFarmingReqVO.java @@ -0,0 +1,22 @@ +package app.module.front.usecase.daily.farming.adapters.web.model; + +import app.module.front.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 RemoveDailyFarmingReqVO extends DailyUIReqVO { + /** + * 자가농업 일련번호 + */ + @NotBlank(message = "{valid.common.required}") + private String id; + /** + * 일계부 일련번호 + */ + private Long dailyRecordSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java new file mode 100644 index 00000000..4b6c7271 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/validator/CreateDailyFarmingValidator.java @@ -0,0 +1,35 @@ +package app.module.front.usecase.daily.farming.adapters.web.validator; + +import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; +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 CreateDailyFarmingValidator implements Validator { + + @Override + public boolean supports(Class clazz) { + return CreateDailyFarmingReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + CreateDailyFarmingReqVO vo = (CreateDailyFarmingReqVO) target; + + if ("SELF".equals(vo.getProductCode()) && StringUtils.isBlank(vo.getProductSelf())) { + errors.rejectValue( + "categorySelf", "valid.common.required", + "생산물을 입력해 주세요."); + } + + if (vo.getEstimatedValue() == null) { + errors.rejectValue( + "estimatedValue", "valid.common.required", + "현물평가액을 입력해 주세요."); + } + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java new file mode 100644 index 00000000..6ec84319 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortIn.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.daily.farming.ports; + + +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; +import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; + +import java.util.List; + +public interface DailyFarmingPortIn { + /** + * 일계부 자가농업 조회 + * + * @param reqVO 검색 조건 + * @return 자가농업 목록 + */ + List list(DailyFarmingUIReqVO reqVO); + + /** + * 일계부 자가농업 조회 + * + * @param reqVO 검색 조건 + * @return 자가농업 상세 + */ + DailyFarmingDto detail(DailyFarmingUIReqVO reqVO); + + /** + * 일계부 자가농업 등록 + * + * @param formVO 입력 데이터 + */ + void create(CreateDailyFarmingReqVO formVO); + + /** + * 일계부 자가농업 삭제 + * + * @param formVO 삭제 검색 조건 + */ + void remove(RemoveDailyFarmingReqVO formVO); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java new file mode 100644 index 00000000..1e0d007a --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/DailyFarmingPortOut.java @@ -0,0 +1,35 @@ +package app.module.front.usecase.daily.farming.ports; + + +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; + +import java.util.List; + +public interface DailyFarmingPortOut { + /** + * 일계부 자가농업 조회 + * + * @param command 검색 조건 + * @return 자가농업 목록 + */ + List list(GetDailyFarmingCmd command); + + /** + * 일계부 자가농업 등록 + * + * @param findCmd 검색 조건 + * @param command 입력 데이터 + */ + void create(GetDailyFarmingCmd findCmd, CreateDailyFarmingCmd command); + + /** + * 일계부 자가농업 삭제 + * + * @param findCmd 검색 조건 + * @param command 삭제 검색 조건 + */ + void remove(GetDailyFarmingCmd findCmd, RemoveDailyFarmingCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java new file mode 100644 index 00000000..a2e69d81 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/DailyFarmingService.java @@ -0,0 +1,156 @@ +package app.module.front.usecase.daily.farming.ports.application; + +import app.module.core.usecase.uicode.list.ports.UICodeListPortIn; +import app.module.core.usecase.uicode.list.ports.application.domain.UICodeElement; +import app.module.front.config.application.util.AuditUtil; +import app.module.front.config.constants.CommonConstants; +import app.module.front.usecase.daily.farming.adapters.persistence.model.DailyFarmingDto; +import app.module.front.usecase.daily.farming.adapters.web.model.CreateDailyFarmingReqVO; +import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.front.usecase.daily.farming.adapters.web.model.RemoveDailyFarmingReqVO; +import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn; +import app.module.front.usecase.daily.farming.ports.DailyFarmingPortOut; +import app.module.front.usecase.daily.farming.ports.application.domain.CreateDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.GetDailyFarmingCmd; +import app.module.front.usecase.daily.farming.ports.application.domain.RemoveDailyFarmingCmd; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@RequiredArgsConstructor +public class DailyFarmingService implements DailyFarmingPortIn { + private final DailyFarmingPortOut portOut; + private final UICodeListPortIn uiCodeListPortIn; + + @Override + public List list(DailyFarmingUIReqVO reqVO) { + return this.getRefineList(reqVO); + } + + @Override + public DailyFarmingDto detail(DailyFarmingUIReqVO reqVO) { + List list = this.getRefineList(reqVO); + if (list.isEmpty()) { + return null; + } + + return list.get(0); + } + + /** + * 목록 데이터 조회 + * + * @param reqVO 검색 조건 + * @return 공통 처리된 목록 + */ + private List getRefineList(DailyFarmingUIReqVO reqVO) { + List list = portOut.list(new GetDailyFarmingCmd(reqVO.getSearchMonth(), + reqVO.getGroupNo(), + reqVO.getHouseholdSeq(), + reqVO.getId())); + + List recordFarming = uiCodeListPortIn.connect("code.record.farming"); + List recordUnit = uiCodeListPortIn.connect("code.record.unit"); + + for (DailyFarmingDto dto : list) { + if ("code.record.farming.self".equals(dto.getProductCode())) { + dto.setProductLabel(dto.getProductSelf()); + } else { + dto.setProductLabel(this.getCodeLabel(dto.getProductCode(), recordFarming)); + } + + if (CommonConstants.UNIT_CODE_SELF.equals(dto.getUnitCode())) { + dto.setUnitLabel(dto.getUnitSelf()); + } else { + dto.setUnitLabel(this.getCodeLabel(dto.getUnitCode(), recordUnit)); + } + } + + return list; + } + + /** + * 코드명 조회 + * + * @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(CreateDailyFarmingReqVO formVO) { + GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + formVO.getId()); + + String incomeMark = null; + String expenseMark = null; + if (!"code.record.farming.self".equals(formVO.getProductCode())) { + List recordFarming = uiCodeListPortIn.connect("code.record.farming"); + String returnValue = null; + for (UICodeElement codeSetup : recordFarming) { + if (codeSetup.getId().equalsIgnoreCase(formVO.getProductCode())) { + returnValue = codeSetup.getCodeValue(); + break; + } + } + + if (returnValue != null) { + incomeMark = returnValue.split(",")[0]; + expenseMark = returnValue.split(",")[1]; + } + } + + CreateDailyFarmingCmd command = AuditUtil.create( + new CreateDailyFarmingCmd( + formVO.getId(), + formVO.getDailyRecordSeq(), + incomeMark, + expenseMark, + formVO.getProductCode(), + formVO.getProductSelf(), + formVO.getUsage(), + formVO.getQuantity(), + formVO.getUnitCode(), + formVO.getUnitSelf(), + formVO.getEstimatedValue())); + + portOut.create(findCmd, command); + } + + @Override + public void remove(RemoveDailyFarmingReqVO formVO) { + Long id = formVO.getId() != null ? Long.parseLong(formVO.getId()) : null; + + GetDailyFarmingCmd findCmd = new GetDailyFarmingCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + formVO.getHouseholdSeq(), + id); + + RemoveDailyFarmingCmd command = AuditUtil.delete( + new RemoveDailyFarmingCmd( + formVO.getSearchMonth(), + formVO.getGroupNo(), + id, + formVO.getDailyRecordSeq())); + + portOut.remove(findCmd, command); + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java new file mode 100644 index 00000000..1f5c6f46 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/CreateDailyFarmingCmd.java @@ -0,0 +1,25 @@ +package app.module.front.usecase.daily.farming.ports.application.domain; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class CreateDailyFarmingCmd extends FrontAuditCommand { + private Long id; + private Long dailyRecordSeq; + private String incomeMark; + private String expenseMark; + private String productCode; + private String productSelf; + private String usage; + private Double quantity; + private String unitCode; + private String unitSelf; + private Integer estimatedValue; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/GetDailyFarmingCmd.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/GetDailyFarmingCmd.java new file mode 100644 index 00000000..71c9d109 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/GetDailyFarmingCmd.java @@ -0,0 +1,27 @@ +package app.module.front.usecase.daily.farming.ports.application.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class GetDailyFarmingCmd { + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + /** + * 검색 그룸번호 + */ + private Integer groupNo; + /** + * 임가 일련번호 + */ + private Long householdSeq; + /** + * 자가농업 일련번호 + */ + private Long id; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/RemoveDailyFarmingCmd.java b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/RemoveDailyFarmingCmd.java new file mode 100644 index 00000000..0f0f2848 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/farming/ports/application/domain/RemoveDailyFarmingCmd.java @@ -0,0 +1,18 @@ +package app.module.front.usecase.daily.farming.ports.application.domain; + +import app.module.front.config.adapters.persistence.component.FrontAuditCommand; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; + +@Getter +@Setter +@AllArgsConstructor +@ToString +public class RemoveDailyFarmingCmd extends FrontAuditCommand { + private String searchMonth; + private Integer groupNo; + private Long id; + private Long dailyRecordSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java index 43c742ac..bf4b69d4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordUIController.java @@ -3,6 +3,8 @@ package app.module.front.usecase.daily.record.adapters.web; import app.module.core.config.application.exception.NoMatchingURIException; import app.module.front.usecase.daily.expense.adapters.web.model.DailyExpenseUIReqVO; import app.module.front.usecase.daily.expense.ports.DailyExpensePortIn; +import app.module.front.usecase.daily.farming.adapters.web.model.DailyFarmingUIReqVO; +import app.module.front.usecase.daily.farming.ports.DailyFarmingPortIn; import app.module.front.usecase.daily.forestry.adapters.web.model.DailyForestryUIReqVO; import app.module.front.usecase.daily.forestry.ports.DailyForestryPortIn; import app.module.front.usecase.daily.income.adapters.persistence.model.DailyIncomeDto; @@ -38,6 +40,7 @@ public class DailyRecordUIController { private final DailyWorkPortIn dailyWorkPortIn; private final DailyPowerPortIn dailyPowerPortIn; private final DailyForestryPortIn dailyForestryPortIn; + private final DailyFarmingPortIn dailyFarmingPortIn; /** * 일계부 항목 등록 화면 @@ -92,7 +95,7 @@ public class DailyRecordUIController { model.addAttribute("workList", dailyWorkPortIn.list(new DailyWorkUIReqVO(searchMonth, groupNo))); model.addAttribute("powerList", dailyPowerPortIn.list(new DailyPowerUIReqVO(searchMonth, groupNo))); model.addAttribute("forestryList", dailyForestryPortIn.list(new DailyForestryUIReqVO(searchMonth, groupNo))); - model.addAttribute("farmingList", null); // TODO + model.addAttribute("farmingList", dailyFarmingPortIn.list(new DailyFarmingUIReqVO(searchMonth, groupNo))); } model.addAttribute("reqVO", reqVO); diff --git a/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml new file mode 100644 index 00000000..e3dc95b0 --- /dev/null +++ b/front/src/main/resources/mappers/daily/DailyFarmingMapper.xml @@ -0,0 +1,72 @@ + + + + + + + + + + insert into daily_farming ( + daily_record_seq, income_mark, expense_mark + , product_code, product_self, usage + , quantity, unit_code, unit_self, estimated_value + , is_deleted + , + ) values ( + #{dailyRecordSeq}, #{incomeMark}, #{expenseMark} + , #{productCode}, #{productSelf}, #{usage} + , #{quantity}, #{unitCode}, #{unitSelf}, #{estimatedValue} + , false + , + ) + + + + update daily_farming set + , income_mark = #{incomeMark} + , expense_mark = #{expenseMark} + , product_code = #{productCode} + , product_self = #{productSelf} + , usage = #{usage} + , quantity = #{quantity} + , unit_code = #{unitCode} + , unit_self = #{unitSelf} + , estimated_value = #{estimatedValue} + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + and id = #{id} + + + + update daily_farming set + + where is_deleted = false + and daily_record_seq = #{dailyRecordSeq} + + and id = #{id} + + + + diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml index 7f8b291f..52a44817 100644 --- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -6,7 +6,7 @@ resultType="app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto"> select ddg.group_no, ddg.start_day, ddg.end_day , dr.id, dr.record_month, dr.day_group_no, dr.start_date, dr.end_date - , dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status + , dr.all_status, dr.income_status, dr.work_status, dr.expense_status, dr.power_status, dr.forestry_status, dr.farming_status from daily_day_group ddg left join daily_record dr on dr.day_group_no = ddg.group_no and dr.is_deleted = false diff --git a/front/src/main/resources/messages/uri.properties b/front/src/main/resources/messages/uri.properties index e70e1fdd..ca7cf4cb 100644 --- a/front/src/main/resources/messages/uri.properties +++ b/front/src/main/resources/messages/uri.properties @@ -42,6 +42,7 @@ uri.front.record.expense.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D uri.front.record.work.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D uri.front.record.power.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D uri.front.record.forestry.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D +uri.front.record.farming.{{pathVar}}=\uC77C\uACC4\uBD80 \uB4F1\uB85D uri.front.record.daily.done=\uC77C\uACC4\uBD80 \uB4F1\uB85D # \uAE30\uD0C0 diff --git a/front/src/main/resources/templates/record/daily/done.html b/front/src/main/resources/templates/record/daily/done.html index 66f16d8f..47c5cc1b 100644 --- a/front/src/main/resources/templates/record/daily/done.html +++ b/front/src/main/resources/templates/record/daily/done.html @@ -132,7 +132,23 @@ - + +
    + +
  • +

    없음

    +
  • +
    + +
  • +

    [[${child.productLabel}]]

    + 302,000원 +
  • +
    +
diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index 0bb89680..a7fb25ac 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -81,7 +81,7 @@ - + diff --git a/front/src/main/resources/templates/record/farming/form.html b/front/src/main/resources/templates/record/farming/form.html new file mode 100644 index 00000000..ca08d2a0 --- /dev/null +++ b/front/src/main/resources/templates/record/farming/form.html @@ -0,0 +1,145 @@ + + + + + + + + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html new file mode 100644 index 00000000..c57c313d --- /dev/null +++ b/front/src/main/resources/templates/record/farming/index.html @@ -0,0 +1,219 @@ + + + +
+
+
+
+

+ + [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]],
+
+ + [[${#temporals.format(dailyRecord.startDate, 'M월 d일')}]]~[[${#temporals.format(dailyRecord.endDate, 'd일')}]],
+
+ 농업생산물 중 자가소비량 내역 [[${#lists.isEmpty(farmingList) ? 0 : #lists.size(farmingList)}]]건 등록 + 되었습니다. +

+

자가농업생산물 중 자가소비량 내역을 등록해 주세요.

+

등록 내용을 확인하거나 다음 단계로 이동하세요.

+
+ + + + +
+ +
+ +
    +
  • + 다른 임가가 생산한 것을 취득하거나 외부로부터의 구입 • 증여한 것은 제외해 주세요. +
  • +
+
+ + +
+

+ 총 [[${#lists.size(farmingList)}]]건 + +

+
+
+
+

[[${item.productLabel}]]

+
+ + +
+
+
    +
  • +

    용도

    + 0시간 +
  • +
  • +

    수량

    + 500g +
  • +
  • +

    현물평가액

    + 302,000원 +
  • +
+
+
+ +
    +
  • + 다른 임가가 생산한 것을 취득하거나 외부로부터의 구입 • 증여한 것은 제외해 주세요. +
  • +
+
+
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + + + +
+ +
+ + +
+ + \ No newline at end of file From 307303c368096e58384f0f27cdc2ae924ac90fc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 23 Jun 2025 14:09:47 +0900 Subject: [PATCH 02/52] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20?= =?UTF-8?q?=EC=9C=A0=ED=9A=A8=EC=84=B1=20=EC=9D=BC=EA=B4=84=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../persistence/RecordCalendarDao.java | 7 ++ .../persistence/RecordCalendarMapper.java | 8 +++ .../web/RecordCalendarUIController.java | 4 +- .../web/model/RecordCalendarUIReqVO.java | 5 +- .../calendar/ports/RecordCalendarPortIn.java | 3 + .../calendar/ports/RecordCalendarPortOut.java | 2 + .../application/RecordCalendarService.java | 6 ++ .../web/DailyExpenseUIController.java | 3 +- .../web/DailyFarmingUIController.java | 3 +- .../web/DailyForestryUIController.java | 3 +- .../adapters/web/DailyIncomeUIController.java | 3 +- .../adapters/web/DailyPowerUIController.java | 3 +- .../adapters/persistence/DailyRecordDao.java | 6 +- .../persistence/model/DailyRecordDto.java | 61 ++++++++++++++++-- .../ports/application/DailyRecordService.java | 17 ++--- .../adapters/web/DailyWorkUIController.java | 4 +- .../mappers/daily/RecordCalendarMapper.xml | 64 +++++++++++++++++++ .../resources/templates/record/calendar.html | 13 ++-- .../templates/record/comment-modal.html | 2 +- .../templates/record/daily/index.html | 3 +- .../templates/record/expense/index.html | 22 ++++--- .../templates/record/farming/index.html | 19 +++--- .../templates/record/forestry/index.html | 19 +++--- .../templates/record/income/index.html | 23 ++++--- .../templates/record/power/index.html | 22 ++++--- .../templates/record/work/index.html | 22 ++++--- 26 files changed, 260 insertions(+), 87 deletions(-) diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java index 2a02a008..b0c09f1e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarDao.java @@ -118,6 +118,13 @@ public class RecordCalendarDao implements RecordCalendarPortOut { return refineList; } + @Override + public boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command) { + int dataNoneCount = recordCalendarMapper.getDataNoneCountBySomeDayAfter(command); + + return dataNoneCount != 0; + } + /** * 특정월의 일 그룹 조회 * diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java index 03047ea2..43e7e87e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/persistence/RecordCalendarMapper.java @@ -33,4 +33,12 @@ public interface RecordCalendarMapper { * @return 월별 작성 상태 */ MonthlyStatusDto getMonthlyStatus(RecordCalendarCmd command); + + /** + * 3일전 ~ 15일전 미등록된 데이터 개수 조회 + * + * @param command 검색 조건 + * @return 미등록 건 수 + */ + Integer getDataNoneCountBySomeDayAfter(RecordCalendarCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java index 23476ab4..80846e68 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarUIController.java @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.calendar.adapters.web; import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; +import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Controller; @@ -13,6 +14,7 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequiredArgsConstructor @RequestMapping(path = "/record/calendar") public class RecordCalendarUIController { + private final RecordCalendarPortIn recordCalendarPortIn; @GetMapping(path = "") public String index(Model model) { @@ -21,7 +23,7 @@ public class RecordCalendarUIController { model.addAttribute("reqVO", reqVO); - // TODO : 현재 날짜로부터 3일 이전 날짜에 등록하지 않은 날이 있을 경우 + model.addAttribute("dataNone", recordCalendarPortIn.getDataNoneCountBySomeDayAfter(reqVO)); return "record/calendar"; } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java index baa18424..cd2df350 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/model/RecordCalendarUIReqVO.java @@ -2,6 +2,8 @@ package app.module.front.usecase.daily.calendar.adapters.web.model; import app.module.front.usecase.daily.record.adapters.web.model.DailyUIReqVO; import lombok.Data; +import lombok.Getter; +import lombok.Setter; import lombok.ToString; import org.apache.tika.utils.StringUtils; import org.slf4j.Logger; @@ -10,7 +12,8 @@ import org.slf4j.LoggerFactory; import java.time.LocalDate; import java.time.format.DateTimeFormatter; -@Data +@Getter +@Setter @ToString public class RecordCalendarUIReqVO extends DailyUIReqVO { private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class); diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java index c915e1db..ef9d6a92 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortIn.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.calendar.ports; +import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; @@ -7,4 +8,6 @@ import java.util.List; public interface RecordCalendarPortIn { List operate(RecordCalendarCmd command); + + boolean getDataNoneCountBySomeDayAfter(RecordCalendarUIReqVO reqVO); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java index d5b9064f..43aeef61 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/RecordCalendarPortOut.java @@ -9,4 +9,6 @@ import java.util.List; public interface RecordCalendarPortOut { List operate(RecordCalendarCmd command); + + boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command); } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java index 65993aff..4af6b94c 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/RecordCalendarService.java @@ -1,5 +1,6 @@ package app.module.front.usecase.daily.calendar.ports.application; +import app.module.front.usecase.daily.calendar.adapters.web.model.RecordCalendarUIReqVO; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortIn; import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; @@ -18,4 +19,9 @@ public class RecordCalendarService implements RecordCalendarPortIn { public List operate(RecordCalendarCmd command) { return portOut.operate(command); } + + @Override + public boolean getDataNoneCountBySomeDayAfter(RecordCalendarUIReqVO reqVO) { + return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq(), 0)); + } } diff --git a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java index ad9e34c3..3d1fb716 100644 --- a/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/expense/adapters/web/DailyExpenseUIController.java @@ -53,7 +53,6 @@ public class DailyExpenseUIController { model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("expenseList", expenseList); model.addAttribute("moveStep", !"update".equals(searchType)); - model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.EXPENSE)); return "record/expense/index"; } @@ -110,6 +109,8 @@ public class DailyExpenseUIController { throw new NoRecordDataException(); } + dailyRecord.setCurrentStep(DailySort.EXPENSE); + return dailyRecord; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java index 82d0fa99..7e1f32c6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/farming/adapters/web/DailyFarmingUIController.java @@ -53,7 +53,6 @@ public class DailyFarmingUIController { model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("farmingList", farmingList); model.addAttribute("moveStep", !"update".equals(searchType)); - model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.FARMING)); return "record/farming/index"; } @@ -110,6 +109,8 @@ public class DailyFarmingUIController { throw new NoRecordDataException(); } + dailyRecord.setCurrentStep(DailySort.FARMING); + return dailyRecord; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java index 8fb8efb8..fdb53b55 100644 --- a/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/forestry/adapters/web/DailyForestryUIController.java @@ -53,7 +53,6 @@ public class DailyForestryUIController { model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("forestryList", forestryList); model.addAttribute("moveStep", !"update".equals(searchType)); - model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.FORESTRY)); return "record/forestry/index"; } @@ -110,6 +109,8 @@ public class DailyForestryUIController { throw new NoRecordDataException(); } + dailyRecord.setCurrentStep(DailySort.FORESTRY); + return dailyRecord; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java index f61b80fc..532cf7d4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/income/adapters/web/DailyIncomeUIController.java @@ -53,7 +53,6 @@ public class DailyIncomeUIController { model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("incomeList", incomeList); model.addAttribute("moveStep", !"update".equals(searchType)); - model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.INCOME)); return "record/income/index"; } @@ -110,6 +109,8 @@ public class DailyIncomeUIController { throw new NoRecordDataException(); } + dailyRecord.setCurrentStep(DailySort.INCOME); + return dailyRecord; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java index 0f45bf89..ebecd841 100644 --- a/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/power/adapters/web/DailyPowerUIController.java @@ -51,7 +51,6 @@ public class DailyPowerUIController { model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("powerList", powerList); model.addAttribute("moveStep", !"update".equals(searchType)); - model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.POWER)); return "record/power/index"; } @@ -105,6 +104,8 @@ public class DailyPowerUIController { throw new NoRecordDataException(); } + dailyRecord.setCurrentStep(DailySort.POWER); + return dailyRecord; } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java index 6064b1c7..ee269da6 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/DailyRecordDao.java @@ -25,7 +25,7 @@ public class DailyRecordDao implements DailyRecordPortOut { @Override public DailyRecordDto detail(GetDailyRecordCmd command) { DailyRecordDto detail = dailyRecordMapper.getDailyRecord(command); - if (detail != null && !detail.isUpdated()) { + if (detail != null && detail.getStartDate() == null) { try { SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); @@ -36,6 +36,10 @@ public class DailyRecordDao implements DailyRecordPortOut { formatDate = beforeSdf.parse(command.getSearchMonth() + String.format("%02d", detail.getEndDay())); detail.setEndDate(LocalDate.parse(afterSdf.format(formatDate))); + if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { + // 종료일의 달이 변경되면 시작일=종료일 처리 + detail.setEndDate(detail.getStartDate()); + } } catch (Exception e) { log.warn("[DateParse] target={}", detail.getStartDay(), e); } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java index 3897917d..b185993e 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/persistence/model/DailyRecordDto.java @@ -4,16 +4,14 @@ import app.module.front.usecase.daily.record.adapters.web.model.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; import lombok.Data; +import lombok.extern.slf4j.Slf4j; import java.time.LocalDate; import java.util.List; +@Slf4j @Data public class DailyRecordDto { -// household_seq, record_month, day_group_no, start_date, end_date -// , all_status, income_status, work_status, expense_status, power_status, forestry_status -// , created_at, created_by, is_deleted - private String recordMonth; private Integer groupNo; private Integer startDay; @@ -30,14 +28,63 @@ public class DailyRecordDto { private DailyTargetStatus forestryStatus; private DailyTargetStatus farmingStatus; + /** + * 마지막 일 여부 + */ private boolean lastDay; + /** + * 자가농업 항목 오픈 여부 + */ + private boolean farmingOpen; + /** + * 특정일의 데이터 등록 대상 항목 + */ private List targetList; + /** + * 현재 단계 + */ + private DailySort currentStep; - public boolean isUpdated() { - return this.id != null; + /** + * 마지막 일 여부 + * @return true=마지막 일, false=마지막 일 아님 + */ + public boolean isLastDay() { + if (endDate != null) { + LocalDate lastDate = endDate.withDayOfMonth(endDate.lengthOfMonth()); + + return endDate == lastDate; + } + + return false; } - public String getNextStep(DailySort currentStep) { + /** + * 자가농업 항목 오픈 여부 + * [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 + * @return true=대상, false=대상 아님 + */ + public boolean isFarmingOpen() { + return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(); + } + + /** + * 데이터 수정 가능 여부 + * [정책] 15일전까지 데이터 수정 가능(등록도 불가) + * @return true=수정 가능, false=수정 불가 + */ + public boolean isModifiable() { + LocalDate limitStart = LocalDate.now().minusDays(15); + + return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); + } + + /** + * 다음 단계로 이동될 단계 조회 + * + * @return 다음 단계명 + */ + public String getNextStep() { String returnValue = null; if (targetList != null) { int index = 0; diff --git a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java index 29d796ca..655d9216 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/ports/application/DailyRecordService.java @@ -32,7 +32,6 @@ public class DailyRecordService implements DailyRecordPortIn { reqVO.getHouseholdSeq())); if (dailyRecord != null) { - // TODO : 이전 다음을 체크하기 위함 List targetList = new ArrayList<>(); if (this.isTarget(dailyRecord.getIncomeStatus())) { targetList.add(DailySort.INCOME); @@ -55,19 +54,15 @@ public class DailyRecordService implements DailyRecordPortIn { dailyRecord.setTargetList(targetList); } - // TODO : 마지막날 건의사항 모달 팝업 뜨는 것 - LocalDate lastDate = dailyRecord.getEndDate().withDayOfMonth(dailyRecord.getEndDate().lengthOfMonth()); - log.debug("lastDate: {}", lastDate); - - if (dailyRecord.getEndDate() == lastDate) { - dailyRecord.setLastDay(true); - } else { - dailyRecord.setLastDay(false); - } - return dailyRecord; } + /** + * 데이터 등록 대상 여부 + * + * @param status 상태 + * @return true=대상, false=대상 아님 + */ private boolean isTarget(DailyTargetStatus status) { return DailyTargetStatus.TARGET.equals(status) || DailyTargetStatus.TODAY_NONE.equals(status); } diff --git a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java index 905dc71b..1bc158c4 100644 --- a/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java +++ b/front/src/main/java/app/module/front/usecase/daily/work/adapters/web/DailyWorkUIController.java @@ -52,7 +52,7 @@ public class DailyWorkUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("workList", workList); - model.addAttribute("nextStep", dailyRecord.getNextStep(DailySort.WORK)); + model.addAttribute("moveStep", !"update".equals(searchType)); return "record/work/index"; } @@ -108,6 +108,8 @@ public class DailyWorkUIController { throw new NoRecordDataException(); } + dailyRecord.setCurrentStep(DailySort.WORK); + return dailyRecord; } } diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml index 771495e2..c4369397 100644 --- a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -50,4 +50,68 @@ limit 1 + + diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index 910481fb..d76746fe 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -4,20 +4,21 @@
- - - +
+

홍길동님,

일계부를 등록하지 않은 날짜가 있습니다.
정확한 조사를 위해 꾸준히 입력해 주세요.
-
--> +
diff --git a/front/src/main/resources/templates/record/comment-modal.html b/front/src/main/resources/templates/record/comment-modal.html index 5554292c..4f7ebfca 100644 --- a/front/src/main/resources/templates/record/comment-modal.html +++ b/front/src/main/resources/templates/record/comment-modal.html @@ -1,4 +1,4 @@ - +
diff --git a/front/src/main/resources/templates/record/daily/index.html b/front/src/main/resources/templates/record/daily/index.html index a7fb25ac..625942ce 100644 --- a/front/src/main/resources/templates/record/daily/index.html +++ b/front/src/main/resources/templates/record/daily/index.html @@ -98,7 +98,8 @@
-
+
- +
+ th:if="${dailyRecord.modifiable && moveStep}">
diff --git a/front/src/main/resources/templates/record/farming/index.html b/front/src/main/resources/templates/record/farming/index.html index c57c313d..f66da96f 100644 --- a/front/src/main/resources/templates/record/farming/index.html +++ b/front/src/main/resources/templates/record/farming/index.html @@ -20,19 +20,22 @@

등록 내용을 확인하거나 다음 단계로 이동하세요.

- +
- +
+ th:if="${dailyRecord.modifiable && moveStep}">
diff --git a/front/src/main/resources/templates/record/forestry/index.html b/front/src/main/resources/templates/record/forestry/index.html index f99ba4de..f8e49378 100644 --- a/front/src/main/resources/templates/record/forestry/index.html +++ b/front/src/main/resources/templates/record/forestry/index.html @@ -20,19 +20,22 @@

등록 내용을 확인하거나 다음 단계로 이동하세요.

- +
- +
+ th:if="${dailyRecord.modifiable && moveStep}">
diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html index ae07406b..0aad8b7c 100644 --- a/front/src/main/resources/templates/record/income/index.html +++ b/front/src/main/resources/templates/record/income/index.html @@ -16,22 +16,27 @@ 수입 내역 [[${#lists.isEmpty(incomeList) ? 0 : #lists.size(incomeList)}]]건 등록
되었습니다. -

수입 내역을 등록해 주세요.

+

+

수입 내역을 등록해 주세요.

+

등록 내용을 확인하거나 다음 단계로 이동하세요.

- +
- +
+ th:if="${dailyRecord.modifiable && moveStep}">
diff --git a/front/src/main/resources/templates/record/power/index.html b/front/src/main/resources/templates/record/power/index.html index c254ede7..3b8bf9b1 100644 --- a/front/src/main/resources/templates/record/power/index.html +++ b/front/src/main/resources/templates/record/power/index.html @@ -16,22 +16,26 @@ 동력 사용내역 [[${#lists.isEmpty(powerList) ? 0 : #lists.size(powerList)}]]건 등록
되었습니다. -

동력 사용내역을 등록해 주세요.

+

동력 사용내역을 등록해 주세요.

+

등록 내용을 확인하거나 다음 단계로 이동하세요.

- +
- +
+ th:if="${dailyRecord.modifiable && moveStep}">
diff --git a/front/src/main/resources/templates/record/work/index.html b/front/src/main/resources/templates/record/work/index.html index fc15303c..c4f6fa56 100644 --- a/front/src/main/resources/templates/record/work/index.html +++ b/front/src/main/resources/templates/record/work/index.html @@ -16,22 +16,26 @@ 임업노동 투입 내역 [[${#lists.isEmpty(workList) ? 0 : #lists.size(workList)}]]건 등록
되었습니다. -

임업노동 투입 내역을 등록해 주세요.

+

임업노동 투입 내역을 등록해 주세요.

+

등록 내용을 확인하거나 다음 단계로 이동하세요.

- +
- +
+ th:if="${dailyRecord.modifiable && moveStep}">
From 510ea5ec65fd502b8f6207c7a8a2a953e838bac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 23 Jun 2025 14:44:05 +0900 Subject: [PATCH 03/52] =?UTF-8?q?[FO]=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4,=20=EC=95=BD=EA=B4=80=20=ED=8C=9D=EC=97=85=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20[HTML]=20=EB=82=A0=EC=A7=9C:=202025?= =?UTF-8?q?=EB=85=84=206=EC=9B=94=2023=EC=9D=BC=20=EC=9B=94=EC=9A=94?= =?UTF-8?q?=EC=9D=BC=20=EC=98=A4=EC=A0=84=2010:52:39?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/FrontSecurityConfig.java | 2 +- .../adapters/web/PolicyUIController.java | 10 +- .../resources/static/assets/styles/style.css | 229 +++++++++++++ .../main/resources/static/ui/commonUtil.js | 63 +++- .../templates/common/components.html | 9 +- .../templates/layout/layout-login.html | 34 +- .../templates/layout/layout-none.html | 26 +- .../templates/layout/layout-subar.html | 26 +- .../resources/templates/layout/layout.html | 26 +- .../templates/policy/privacy-wrap.html | 310 ++++++++++++++++++ .../resources/templates/policy/privacy.html | 14 - .../templates/policy/terms-wrap.html | 169 ++++++++++ .../resources/templates/policy/terms.html | 14 - 13 files changed, 873 insertions(+), 59 deletions(-) create mode 100644 front/src/main/resources/templates/policy/privacy-wrap.html delete mode 100644 front/src/main/resources/templates/policy/privacy.html create mode 100644 front/src/main/resources/templates/policy/terms-wrap.html delete mode 100644 front/src/main/resources/templates/policy/terms.html diff --git a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java index 9069f98e..5e6565b7 100644 --- a/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java +++ b/front/src/main/java/app/module/front/config/application/security/FrontSecurityConfig.java @@ -72,7 +72,7 @@ public class FrontSecurityConfig { .collect(Collectors.toList()); // front - 익명 사용자 접근 허용 URI 등록 (admin 과 달리 공개/비공개 URL 이 존재한다) - FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register")); + FrontPublicAccess.getInstance().setURIs(List.of("/", "/user/register", "/policy/**")); http.authorizeHttpRequests( (auth) -> diff --git a/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java b/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java index c01b6046..647090d4 100644 --- a/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java +++ b/front/src/main/java/app/module/front/usecase/policy/adapters/web/PolicyUIController.java @@ -12,13 +12,19 @@ import org.springframework.web.bind.annotation.RequestMapping; @RequestMapping(path = "/policy") public class PolicyUIController { + /** + * 이용약관 팝업 화면 + */ @GetMapping(path = "/terms") public String terms() { - return "policy/terms"; + return "policy/terms-wrap"; } + /** + * 개인정보처리방침 팝업 화면 + */ @GetMapping(path = "/privacy") public String privacy() { - return "policy/privacy"; + return "policy/privacy-wrap"; } } diff --git a/front/src/main/resources/static/assets/styles/style.css b/front/src/main/resources/static/assets/styles/style.css index 904e1503..54e8dba5 100644 --- a/front/src/main/resources/static/assets/styles/style.css +++ b/front/src/main/resources/static/assets/styles/style.css @@ -1589,6 +1589,234 @@ hr::before { border-radius: 3.2rem 0rem 0rem 0rem; } +/*약관 폰트 가이드 규칙*/ +.term-wrap .modal-content-inner { + margin-top: 3.2rem; +} +.term-wrap .terms-group { + margin-bottom: 3.2rem; +} +.term-wrap .terms-group a { + text-decoration: underline; +} +.term-wrap .terms-heading-h1 { + font-size: 2.8rem; + line-height: 140%; + font-weight: 700; + margin-bottom: 3.2rem; +} +.term-wrap .terms-heading-h2 { + font-size: 2rem; + line-height: 140%; + font-weight: 700; + margin-bottom: 2.4rem; +} +.term-wrap .terms-heading-h3 { + margin-bottom: 1.6rem; + font-size: 1.8rem; + line-height: 140%; + font-weight: 700; +} +.term-wrap .terms-paragraph { + font-size: 1.6rem; + line-height: 140%; + line-height: 1.6; + margin: 0.8rem 0rem; +} +.term-wrap .terms-paragraph + .terms-paragraph { + margin-bottom: 0.4rem; +} +.term-wrap .terms-list, +.term-wrap .terms-step-list { + margin: 1.6rem 0rem; +} +.term-wrap .terms-list.circle-number-type, +.term-wrap .terms-step-list.circle-number-type { + counter-reset: list-counter; /* 카운터 초기화 */ +} +.term-wrap .terms-list.circle-number-type > li, +.term-wrap .terms-step-list.circle-number-type > li { + position: relative; + margin-top: 0.8rem; + padding-left: 2rem; +} +.term-wrap .terms-list.circle-number-type > li::before, +.term-wrap .terms-step-list.circle-number-type > li::before { + content: counter(list-counter); + counter-increment: list-counter; /* 카운터 증가 */ + position: absolute; + left: 0; + top: 0.6rem; + width: 1.2rem; + height: 1.2rem; + background-color: transparent; + border: 0.1rem solid #262626; + color: #262626; + font-weight: 400; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + -webkit-box-pack: center; + -webkit-justify-content: center; + justify-content: center; + border-radius: 50%; + font-size: 1.2rem; +} +.term-wrap .terms-list.bullet-type > li, +.term-wrap .terms-step-list.bullet-type > li { + position: relative; + padding-left: 1.3rem; + margin-top: 0.8rem; +} +.term-wrap .terms-list.bullet-type > li::before, +.term-wrap .terms-step-list.bullet-type > li::before { + content: ""; + display: block; + left: 0; + position: absolute; + top: 1.15rem; + width: 0.3rem; + height: 0.3rem; + background-color: #262626; + border-radius: 50%; +} +.term-wrap .terms-list-item { + margin-bottom: 0.8rem; + font-size: 1.6rem; + line-height: 140%; + line-height: 1.6; +} +.term-wrap .terms-list-item > sup { + color: #7b7b7b; +} +.term-wrap .terms-sublist { + margin-top: 0.4rem; + color: #555555; +} +.term-wrap .terms-sublist-item { + position: relative; +} +.term-wrap .terms-sublist-item.sup { + padding-left: 2.8rem; +} +.term-wrap .terms-sublist-item.sup > sup { + position: absolute; + left: 0; + top: 0.3rem; + font-size: 1.4rem; + line-height: 140%; +} +.term-wrap .terms-sublist-item.star { + padding-left: 2.4rem; + text-indent: -1.2rem; +} +.term-wrap .terms-step { + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-align: start; + -webkit-align-items: flex-start; + align-items: flex-start; + margin-top: 2rem; +} +.term-wrap .terms-step-number { + font-size: 1.6rem; + line-height: 1.6; + font-weight: 500; + font-weight: bold; + color: #3a66c9; + background-color: #f0f3ff; + width: 4rem; + height: 4rem; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-pack: center; + -webkit-justify-content: center; + justify-content: center; + -webkit-box-align: center; + -webkit-align-items: center; + align-items: center; + border-radius: 50%; + margin-right: 1.6rem; +} +.term-wrap .terms-step-content { + -webkit-box-flex: 1; + -webkit-flex: 1; + flex: 1; + display: -webkit-box; + display: -webkit-flex; + display: flex; + -webkit-box-orient: vertical; + -webkit-box-direction: normal; + -webkit-flex-direction: column; + flex-direction: column; +} +.term-wrap .terms-step-content .tit { + font-size: 1.8rem; + line-height: 1.6; + font-weight: 700; + color: #434343; +} +.term-wrap .terms-step-content .desc { + font-size: 1.4rem; + line-height: 140%; + color: #9d9d9d; +} +.term-wrap .terms-step-content .desc + .desc { + margin-top: 0.4rem; +} +.term-wrap .terms-step-content .desc.black { + color: #555555; +} +.term-wrap .terms-step-content .desc.sup { + padding-left: 2.8rem; + position: relative; +} +.term-wrap .terms-step-content .desc.sup > sup { + position: absolute; + left: 0; + top: 0rem; + font-size: 1.4rem; + line-height: 140%; +} +.term-wrap .terms-table { + width: 100%; + border-collapse: collapse; + border-top: 1px solid #afb8d2; + margin-top: 1.6rem; +} +.term-wrap .terms-table tr { + border-bottom: 1px solid #afb8d2; +} +.term-wrap .terms-table th { + background-color: #f5f7ff; +} +.term-wrap .terms-table td { + color: #555555; +} +.term-wrap .terms-table th, +.term-wrap .terms-table td { + padding: 1.2rem; + text-align: left; + font-size: 1.4rem; + line-height: 140%; + border-right: 0.1rem solid #afb8d2; +} +.term-wrap .terms-table th:last-child, +.term-wrap .terms-table td:last-child { + border: 0; +} +.term-wrap .terms-note { + font-size: 1.4rem; + line-height: 140%; + color: #7b7b7b; + margin-top: 0.8rem; +} + @media (min-width: 768px) { .pc-show { display: block; @@ -6422,6 +6650,7 @@ button.swiper-pagination-bullet { .component-modal { display: none; position: absolute; + z-index: 99; } .component-modal .modal-dimm { position: fixed; diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js index 9a361aa7..12224b15 100644 --- a/front/src/main/resources/static/ui/commonUtil.js +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -5,13 +5,17 @@ kri.menu = new Object; kri.logger = new Object(); kri.form = new Object(); -/* kri.menu */ +/* kri.menu : 스크립트로 페이지 이동 */ /** - * 스크립트로 페이지 이동 + * 메인 페이지 이동 */ kri.menu.main = function() { location.href = '/'; } + +/** + * 로그아웃 팝업 오픈 + */ kri.menu.logout = function() { etUI.dialog.alert({ title: '로그아웃 확인', @@ -25,7 +29,7 @@ kri.menu.logout = function() { } /** - * 전체 메뉴 + * 전체 메뉴 팝업 오픈 */ kri.menu.open = function() { ajaxUtil._ajaxAsyncMethod( @@ -56,6 +60,59 @@ kri.menu.open = function() { ); }; +/** + * 이용약관 팝업 오픈 + */ +kri.menu.terms = function() { + const $modal = $('.commModal'); + $modal.addClass('term-wrap'); + $modal.find('.modal-tit').text('이용약관'); + $modal.find('.modal-content').empty(); + + ajaxUtil._ajaxAsyncMethod( + '/policy/terms', + {}, + function(rstData, status) { + $modal.find('.modal-content').html(rstData); + + const commModal = document.querySelector('.commModal').ui; + commModal.open(); + }, + function(code, rstData) { + kri.logger.error('Do nothing. code: '+ code, rstData); + }, + 'get', + 'html' + ); +} + +/** + * 개인정보처리방침 팝업 오픈 + */ +kri.menu.privacy = function() { + const $modal = $('.commModal'); + $modal.addClass('term-wrap'); + $modal.find('.modal-tit').text('개인정보처리방침'); + $modal.find('.modal-content').empty(); + + ajaxUtil._ajaxAsyncMethod( + '/policy/privacy', + {}, + function(rstData, status) { + $modal.find('.modal-content').html(rstData); + + const commModal = document.querySelector('.commModal').ui; + commModal.open(); + }, + function(code, rstData) { + kri.logger.error('Do nothing. code: '+ code, rstData); + }, + 'get', + 'html' + ); + +} + /** * 뒤로가기 */ diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 363ca747..96e9baa6 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -145,11 +145,10 @@ 02-3415-5187 - - + diff --git a/front/src/main/resources/templates/layout/layout-login.html b/front/src/main/resources/templates/layout/layout-login.html index f64ff356..4c4afc6f 100644 --- a/front/src/main/resources/templates/layout/layout-login.html +++ b/front/src/main/resources/templates/layout/layout-login.html @@ -1,14 +1,38 @@ - + +
- -
+ +
+ + +
+
+ + +
+
+
+
+ diff --git a/front/src/main/resources/templates/layout/layout-none.html b/front/src/main/resources/templates/layout/layout-none.html index bb296782..5380ba43 100644 --- a/front/src/main/resources/templates/layout/layout-none.html +++ b/front/src/main/resources/templates/layout/layout-none.html @@ -12,15 +12,31 @@
+
+ +
+
+ + +
+
+ - - -
diff --git a/front/src/main/resources/templates/layout/layout-subar.html b/front/src/main/resources/templates/layout/layout-subar.html index e3ec0f09..09bdee4e 100644 --- a/front/src/main/resources/templates/layout/layout-subar.html +++ b/front/src/main/resources/templates/layout/layout-subar.html @@ -13,15 +13,31 @@
+
+ +
+
+ + +
+
+ - - -
diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 9c63e234..7a6a7a66 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -13,15 +13,31 @@
+
+ +
+
+ + +
+
+ - - -
diff --git a/front/src/main/resources/templates/policy/privacy-wrap.html b/front/src/main/resources/templates/policy/privacy-wrap.html new file mode 100644 index 00000000..65e60ea2 --- /dev/null +++ b/front/src/main/resources/templates/policy/privacy-wrap.html @@ -0,0 +1,310 @@ + + \ No newline at end of file diff --git a/front/src/main/resources/templates/policy/privacy.html b/front/src/main/resources/templates/policy/privacy.html deleted file mode 100644 index e342c7ad..00000000 --- a/front/src/main/resources/templates/policy/privacy.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -
-
- -
-
- -
-
- - \ No newline at end of file diff --git a/front/src/main/resources/templates/policy/terms-wrap.html b/front/src/main/resources/templates/policy/terms-wrap.html new file mode 100644 index 00000000..254eb78c --- /dev/null +++ b/front/src/main/resources/templates/policy/terms-wrap.html @@ -0,0 +1,169 @@ + + \ No newline at end of file diff --git a/front/src/main/resources/templates/policy/terms.html b/front/src/main/resources/templates/policy/terms.html deleted file mode 100644 index 4163df61..00000000 --- a/front/src/main/resources/templates/policy/terms.html +++ /dev/null @@ -1,14 +0,0 @@ - - - -
-
- -
-
- -
-
- - \ No newline at end of file From 3809bdca1fefdd4d6a21721468fd17b95d9fd5b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 14:46:04 +0900 Subject: [PATCH 04/52] =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=20=EB=B2=84=ED=8A=BC=20=EC=88=A8=EA=B9=80=20=EC=B2=98=EB=A6=AC?= =?UTF-8?q?=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/src/main/resources/templates/researcher/detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin/src/main/resources/templates/researcher/detail.html b/admin/src/main/resources/templates/researcher/detail.html index a0cd3256..55aad8a3 100644 --- a/admin/src/main/resources/templates/researcher/detail.html +++ b/admin/src/main/resources/templates/researcher/detail.html @@ -32,7 +32,7 @@ -
+
From 40c59711b5668c9f0780c369df9bc25cad6f6cd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 16:14:06 +0900 Subject: [PATCH 07/52] =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EA=B6=8C=ED=95=9C?= =?UTF-8?q?=20uri=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/interceptor/AdminURIInterceptor.java | 7 +- .../templates/common/components.html | 2 +- .../adapters/persistence/URIMapper.java | 2 + .../adapters/persistence/URITopTierDao.java | 23 +++++- .../uri/toptier/ports/URITopTierPortIn.java | 1 + .../uri/toptier/ports/URITopTierPortOut.java | 1 + .../ports/application/URITopTierService.java | 6 ++ .../main/resources/mappers/uri/URIMapper.xml | 77 +++++++++++++------ 8 files changed, 92 insertions(+), 27 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java index a9ae6cdc..81288652 100644 --- a/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java +++ b/admin/src/main/java/app/module/admin/config/adapters/web/interceptor/AdminURIInterceptor.java @@ -1,5 +1,6 @@ package app.module.admin.config.adapters.web.interceptor; +import app.module.admin.config.application.util.AdminUtil; import app.module.core.config.adapters.web.interceptor.model.URITopTierVO; import app.module.core.config.application.enums.AppType; import app.module.core.config.application.exception.NoMatchingURIException; @@ -76,16 +77,16 @@ public class AdminURIInterceptor implements HandlerInterceptor { // 활성 프로파일 가져오기 TODO 2차 오픈시 삭제 예정 modelAndView.addObject("activeProfile", activeProfiles); + String roleId = AdminUtil.getLoginUserRole(); if (!CommonUtil.isAjaxRequest(request)) { - URITopTier topTierOutput = topTierPortIn.connect(AppType.ADMIN); + URITopTier topTierOutput = topTierPortIn.connectRoleId(AppType.ADMIN,roleId); modelAndView.addObject("topNode", recursiveMapping(topTierOutput)); if (modelAndView.getModelMap().getAttribute("currentURI") == null) { modelAndView.addObject("currentURI", request.getAttribute("currentURI")); } - modelAndView.addObject( - "menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); + modelAndView.addObject("menuHierarchy", uriAncestryPortIn.connect(AppType.ADMIN, request.getRequestURI())); if (cloudFrontDomain != null && bucketFolder != null) { modelAndView.addObject("S3URL", "https://" + cloudFrontDomain + bucketFolder); diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 9555d4d9..36bb2b1e 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -105,7 +105,7 @@ - 메뉴명 + 메뉴명 diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java index bd285743..49c0baf9 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URIMapper.java @@ -9,5 +9,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface URIMapper { URITopTier findTopTierByAppType(@Param("appType") AppType appType); + URITopTier findTopTierByAppTypeByRoleId(@Param("appType") AppType appType,@Param("roleId") String roleId); List findChildrenByParentId(@Param("parentId") String parentId); + List findChildrenByParentIdByRoleId(@Param("parentId") String parentId,@Param("roleId") String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java index 1bc70c25..d72fe639 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/adapters/persistence/URITopTierDao.java @@ -25,12 +25,33 @@ public class URITopTierDao implements URITopTierPortOut { return recursiveMapping(top); } + @Override + @Transactional + public URITopTier connectRoleId(AppType appType, String roleId) { + URITopTier top = uriMapper.findTopTierByAppTypeByRoleId(appType,roleId); + if (top == null) { + throw new RuntimeException("There is no top tier item of " + appType); + } + + return recursiveMapping(top,roleId); + } private URITopTier recursiveMapping(URITopTier current) { List children = uriMapper.findChildrenByParentId(current.getId()); current.setChildren(children.stream() - .map(this::recursiveMapping) + .map(this::recursiveMapping) + .collect(Collectors.toList())); + return current; + } + + private URITopTier recursiveMapping(URITopTier current,String roleId) { + List children = uriMapper.findChildrenByParentIdByRoleId(current.getId(),roleId); + current.setChildren(children.stream() + .map(uri -> recursiveMapping(uri,roleId)) .collect(Collectors.toList())); return current; } + + + } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java index 000380a8..6abead7c 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortIn.java @@ -5,4 +5,5 @@ import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; public interface URITopTierPortIn { URITopTier connect(AppType appType); + URITopTier connectRoleId(AppType appType, String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java index 8499caf9..3684811c 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/URITopTierPortOut.java @@ -6,4 +6,5 @@ import app.module.core.usecase.uri.toptier.ports.application.domain.URITopTier; public interface URITopTierPortOut { URITopTier connect(AppType appType); + URITopTier connectRoleId(AppType appType,String roleId); } diff --git a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java index 2c133556..230be1f7 100644 --- a/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java +++ b/core/src/main/java/app/module/core/usecase/uri/toptier/ports/application/URITopTierService.java @@ -19,4 +19,10 @@ public class URITopTierService implements URITopTierPortIn { public URITopTier connect(AppType appType) { return topTierPortOut.connect(appType); } + + + @Override + public URITopTier connectRoleId(AppType appType, String roleId) { + return topTierPortOut.connectRoleId(appType,roleId); + } } diff --git a/core/src/main/resources/mappers/uri/URIMapper.xml b/core/src/main/resources/mappers/uri/URIMapper.xml index 719e7e6b..feeee92e 100644 --- a/core/src/main/resources/mappers/uri/URIMapper.xml +++ b/core/src/main/resources/mappers/uri/URIMapper.xml @@ -2,32 +2,65 @@ + - + SELECT + u.id, + u.app_type, + u.text, + u.uri, + u.show_on_navi, + u.order_no + FROM uri u + WHERE u.parent_id = #{parentId} + AND u.is_deleted = false + ORDER BY u.order_no ASC + + + - SELECT - id, - app_type, - text, - uri, - show_on_navi, - order_no - FROM uri - WHERE parent_id = #{parentId} - AND is_deleted = false - ORDER BY order_no ASC + u.id, + u.app_type, + u.text, + u.uri, + u.show_on_navi, + u.order_no + FROM uri u + JOIN uri_has_role uhr ON u.id = uhr.uri_id and uhr.is_deleted = false + WHERE u.parent_id = #{parentId} + AND u.is_deleted = false + AND uhr.role_id = #{roleId} + AND u.show_on_navi = true + ORDER BY u.order_no ASC \ No newline at end of file From 6ed0592108eb5700e3cc61197df8b4e8e5d5ac5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 16:17:09 +0900 Subject: [PATCH 08/52] =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=ED=94=BC?= =?UTF-8?q?=EC=BB=A4=20=EC=9E=98=20=EC=95=88=EB=90=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../researcher/modal/modal-household-visit.html | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html index 63bb2094..e25a6557 100644 --- a/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html +++ b/admin/src/main/resources/templates/researcher/modal/modal-household-visit.html @@ -20,7 +20,18 @@ 방문일 - +
+
+
+ + + 달력 + + +
+
+
관리분야 @@ -87,7 +98,7 @@ const showHouseholdModal2 = (seq) => { document.querySelector(".modal02").ui.open(); - initFlatpickr(); + //initFlatpickr(); ajaxUtil._ajaxMethod( '/api/researcher/visitHousehold/'+seq, From 73f34485154d757f324f6e640b5b98b698328def Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A3=BC=EC=88=98=ED=98=84?= Date: Mon, 23 Jun 2025 17:22:01 +0900 Subject: [PATCH 09/52] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EC=9D=B4=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/AdminAuthSuccessEvent.java | 23 ++++++++++--------- .../security/AdminDetailsService.java | 1 + .../application/security/AdminUser.java | 3 +++ .../config/application/util/AdminUtil.java | 10 ++++++++ .../loggedinuser/LoggedInUserSaveMapper.xml | 6 +++-- .../templates/common/components.html | 2 +- .../ports/application/domain/AdminView.java | 1 + .../mappers/admin/AdminViewMapper.xml | 7 +++++- .../resources/sql/schema/02_create-all.sql | 13 +++++++---- 9 files changed, 46 insertions(+), 20 deletions(-) diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java index 03310069..c308fcdb 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminAuthSuccessEvent.java @@ -65,17 +65,18 @@ public class AdminAuthSuccessEvent { "security.password.change.notify", adminUser.getRemainPasswordDays())); } - // 로그인 활성화 기록 생성 -// loggedInUserSavePortIn.connect( -// LoggedInUserSaveCmd.builder() -// .loggedInUserId( -// LoggedInUserIdSaveCmd.builder() -// .appType(AppType.ADMIN) -// .id(authentication.getName()) -// .build()) -// .clientIP(CommonUtil.getClientIP(request)) -// .lastLoggedInAt(LocalDateTime.now()) -// .build()); + // 로그인 이력 쌓기 + loggedInUserSavePortIn.connect( + LoggedInUserSaveCmd.builder() + .loggedInUserId( + LoggedInUserIdSaveCmd.builder() + .appType(AppType.ADMIN) + .id(authentication.getName()) + .build()) + .clientIP(CommonUtil.getClientIP(request)) + .lastLoggedInAt(LocalDateTime.now()) + .build()); + } @EventListener diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java index a883cca1..6b756315 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminDetailsService.java @@ -46,6 +46,7 @@ public class AdminDetailsService implements UserDetailsService { adminUser.getPassword(), adminUser.getRoles().stream().map(CoreRole::getId).findFirst().orElse(null), adminUser.getRegionMainCode(), + adminUser.getLastLoginIp(), !accountDisabled, true, isCredentialsNonExpired(adminUser.getPasswordUpdatedAt()), diff --git a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java index 4fabf639..789a447a 100644 --- a/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java +++ b/admin/src/main/java/app/module/admin/config/application/security/AdminUser.java @@ -10,6 +10,7 @@ public class AdminUser extends User { private Long seq; private String roleId; private String regionMainCode; + private String lastLoginIp; private long remainPasswordDays; public AdminUser( @@ -18,6 +19,7 @@ public class AdminUser extends User { String password, String roleId, String regionMainCode, + String lastLoginIp, boolean enabled, boolean accountNonExpired, boolean credentialsNonExpired, @@ -35,6 +37,7 @@ public class AdminUser extends User { this.seq = seq; this.roleId = roleId; this.regionMainCode = regionMainCode; + this.lastLoginIp = lastLoginIp; this.remainPasswordDays = remainPasswordDays; } } diff --git a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java index 0bb07840..27207001 100644 --- a/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java +++ b/admin/src/main/java/app/module/admin/config/application/util/AdminUtil.java @@ -53,4 +53,14 @@ public class AdminUtil { AdminUser user = (AdminUser) authentication.getPrincipal(); return user.getRegionMainCode().isEmpty() ? null : user.getRegionMainCode(); } + + public static String getLoginUserLastIp() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication == null || !(authentication.getPrincipal() instanceof AdminUser)) { + return null; + } + + AdminUser user = (AdminUser) authentication.getPrincipal(); + return user.getLastLoginIp(); + } } diff --git a/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml b/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml index 30814853..a21fd09b 100644 --- a/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml +++ b/admin/src/main/resources/mappers/loggedinuser/LoggedInUserSaveMapper.xml @@ -7,13 +7,15 @@ INSERT INTO logged_in_user ( - app_type, id, + app_type, + login_id, clientip, last_logged_in_at ) VALUES ( + nextval('logged_in_user_seq'), #{appType}, #{id}, #{clientIP}, @@ -27,7 +29,7 @@ clientip = #{clientIP}, last_logged_in_at = #{lastLoggedInAt} WHERE app_type = #{appType} - AND id = #{id} + AND login_id = #{id} \ No newline at end of file diff --git a/admin/src/main/resources/templates/common/components.html b/admin/src/main/resources/templates/common/components.html index 36bb2b1e..842c3d97 100644 --- a/admin/src/main/resources/templates/common/components.html +++ b/admin/src/main/resources/templates/common/components.html @@ -133,7 +133,7 @@

로그인 사용자명님 안녕하세요

- 111.11.111.111 + 111.11.111.111
diff --git a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java index ddc9e4c0..1108a23c 100644 --- a/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java +++ b/core/src/main/java/app/module/core/usecase/admin/view/ports/application/domain/AdminView.java @@ -24,6 +24,7 @@ public class AdminView implements Serializable { private Boolean accountDisabled; private Integer loginFailCnt; private Boolean accountLocked; + private String lastLoginIp; private LocalDateTime createdAt; private String createdBy; private LocalDateTime updatedAt; diff --git a/core/src/main/resources/mappers/admin/AdminViewMapper.xml b/core/src/main/resources/mappers/admin/AdminViewMapper.xml index 5f7d370a..1aa9d4ab 100644 --- a/core/src/main/resources/mappers/admin/AdminViewMapper.xml +++ b/core/src/main/resources/mappers/admin/AdminViewMapper.xml @@ -18,12 +18,17 @@ a.account_disabled, a.login_fail_cnt, a.account_locked, + liu.clientip as last_login_ip, a.created_at, a.created_by, a.updated_at, a.updated_by FROM admin a - WHERE id = #{id} + LEFT JOIN ( SELECT clientip,login_id + FROM logged_in_user liu + ORDER BY last_logged_in_at desc + LIMIT 1 ) liu on liu.login_id = a.id + WHERE a.id = #{id} AND a.is_deleted = false diff --git a/core/src/main/resources/sql/schema/02_create-all.sql b/core/src/main/resources/sql/schema/02_create-all.sql index 52f6ddbf..cb7296fa 100644 --- a/core/src/main/resources/sql/schema/02_create-all.sql +++ b/core/src/main/resources/sql/schema/02_create-all.sql @@ -831,23 +831,26 @@ COMMENT ON COLUMN operation_log.is_deleted IS '삭제여부'; -- ============================================ -- TABLE : logged_in_user --- DESC : 로그인 사용자 정보 테이블 +-- DESC : 로그인 사용자 이력 테이블 -- ============================================ +CREATE SEQUENCE logged_in_user_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE logged_in_user ( + id bigint DEFAULT nextval('logged_in_user_seq') NOT NULL, -- 로그 ID (PK) app_type varchar(255) NOT NULL, -- 앱 타입 (FRONT / ADMIN) - id varchar(255) NOT NULL, -- 로그인 아이디 + login_id varchar(255) NOT NULL, -- 로그인 아이디 last_logged_in_at timestamp(6), -- 마지막 로그인 날짜 clientip varchar(255), -- 접속 아이피 - CONSTRAINT logged_in_user_pkey PRIMARY KEY (app_type, id), + CONSTRAINT logged_in_user_pkey PRIMARY KEY (id), CONSTRAINT logged_in_user_app_type_check CHECK (app_type::text = ANY (ARRAY['FRONT', 'ADMIN'])) ); -COMMENT ON TABLE logged_in_user IS '로그인사용자정보테이블'; +COMMENT ON TABLE logged_in_user IS '로그인사용자이력테이블'; +COMMENT ON COLUMN logged_in_user.id IS '로그 ID'; COMMENT ON COLUMN logged_in_user.app_type IS '앱 타입'; -COMMENT ON COLUMN logged_in_user.id IS '로그인 아이디'; +COMMENT ON COLUMN logged_in_user.login_id IS '로그인 아이디'; COMMENT ON COLUMN logged_in_user.last_logged_in_at IS '마지막 로그인 날짜'; COMMENT ON COLUMN logged_in_user.clientip IS '접속 아이피'; From 0eff4f2fe1aa5090ad47aaf4583ed6c57e147399 Mon Sep 17 00:00:00 2001 From: kangsunlee Date: Mon, 23 Jun 2025 17:29:57 +0900 Subject: [PATCH 10/52] =?UTF-8?q?[FO]=20=EA=B0=9C=EC=9D=B8=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95=20=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/templates/info/user/user.html | 41 +++++++++++++------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 762c90b3..f7b0c2c6 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -85,13 +85,13 @@
-
-
@@ -123,8 +123,7 @@
    -
  • 010
  • -
  • 011
  • +
  • 010
@@ -132,13 +131,13 @@
-
-
@@ -155,24 +154,26 @@
-
- +
-

시/도 선택

+

지역 선택

+
  • option1 + th:text="${item.codeText}" + th:selected="${item.id eq userInfo.regionMainCode ? 'current' : ''}">option1
@@ -185,14 +186,14 @@
+ data-props-default="세부지역 선택" data-props-type="bottomSheet">
-

시/군/구 선택

+

세부지역 선택

@@ -277,6 +278,10 @@
+ + + +
\ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index cde589a2..90a994ff 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -618,7 +618,6 @@
-
diff --git a/front/src/main/resources/templates/info/bank/input.html b/front/src/main/resources/templates/info/bank/input.html index 5ba8971e..f03c2a4f 100644 --- a/front/src/main/resources/templates/info/bank/input.html +++ b/front/src/main/resources/templates/info/bank/input.html @@ -7,7 +7,7 @@

- 은행 자동이체(수입) 내역 [[${bankList.totalElements}]]건 등록 되었습니다. + 은행 자동이체(수입) 내역 [[${bankList.totalElements}]]건 등록 되었습니다.

수입 내역을 등록해 주세요.

@@ -246,7 +246,7 @@ clearAllItems.style.display = "none"; } }, - openAddForm() { + openAddForm(callback) { ajaxUtil._ajaxAsyncMethod( "/api/front/info/bank/create/input/from", {}, @@ -298,6 +298,9 @@ ENV.module.modalPopup.open(); document.querySelector('.modal-content').scrollTop = 0; + + // 모두 로드된 후 콜백 실행 + if (typeof callback === 'function') callback(); }, function(code, rstData) { kri.logger.error('Do nothing. code: '+ code, rstData); @@ -423,11 +426,9 @@ const product = ENV.data.bankList.find(p => p.id == id); if (!product) return; - this.openAddForm(); - - setTimeout(function(){ - + this.openAddForm(() => { const form = document.getElementById('popupForm'); + if (!form) return; Object.entries(product).forEach(([key, val]) => { const field = form.elements.namedItem(key); @@ -446,20 +447,39 @@ ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode); ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode); document.getElementById("unit").value = product.unit; - - },100) - + }); }, // 선택 아이템 삭제 deleteItemById(id) { - ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id); - const target = document.querySelector(`#listBody div[data-id='${id}']`); - if (target) target.remove(); - this.updateLayout(); + etUI.dialog.alert({ + title: '삭제 안내', + message: '등록하신 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id); + const target = document.querySelector(`#listBody div[data-id='${id}']`); + if (target) target.remove(); + formControl.updateLayout(); + }, + }); }, // 전체 초기화 clearAllItems() { - location.reload(); + etUI.dialog.alert({ + title: '초기화 안내', + message: '등록하신 모든 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + ENV.data.bankList = []; + document.getElementById('listBody').innerHTML = ''; + formControl.updateLayout(); + + // TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신. + document.getElementById('totalItems').textContent = ENV.data.bankList.length; + }, + }); }, goSave() { diff --git a/front/src/main/resources/templates/info/bank/output.html b/front/src/main/resources/templates/info/bank/output.html index 8c81dc06..f3b878a6 100644 --- a/front/src/main/resources/templates/info/bank/output.html +++ b/front/src/main/resources/templates/info/bank/output.html @@ -7,7 +7,7 @@

- 은행 자동이체(지출) 내역 [[${bankList.totalElements}]]건 등록 되었습니다. + 은행 자동이체(지출) 내역 [[${bankList.totalElements}]]건 등록 되었습니다.

지출 내역을 등록해 주세요.

@@ -245,7 +245,7 @@ clearAllItems.style.display = "none"; } }, - openAddForm() { + openAddForm(callback) { ajaxUtil._ajaxAsyncMethod( "/api/front/info/bank/create/output/from", {}, @@ -289,6 +289,9 @@ ENV.module.modalPopup.open(); document.querySelector('.modal-content').scrollTop = 0; + + // 모두 로드된 후 콜백 실행 + if (typeof callback === 'function') callback(); }, function(code, rstData) { kri.logger.error('Do nothing. code: '+ code, rstData); @@ -417,20 +420,18 @@ const product = ENV.data.bankList.find(p => p.id == id); if (!product) return; - this.openAddForm(); - - setTimeout(function(){ - + this.openAddForm(() => { const form = document.getElementById('popupForm'); + if (!form) return; Object.entries(product).forEach(([key, val]) => { const field = form.elements.namedItem(key); if (field) { field.value = val; - if(key == 'transferCategoryCode' && val == "code.bank.input.self"){ - document.getElementById(val+"_value").value = product["transferCategory"]; + if (key === 'transferCategoryCode' && val === "code.bank.input.self") { + document.getElementById(val + "_value").value = product["transferCategory"]; } - if(key == 'unitCode' && val == "code.record.unit.self"){ + if (key === 'unitCode' && val === "code.record.unit.self") { document.getElementById("unitDiv").style.display = ""; } } @@ -439,20 +440,40 @@ ENV.elementRefs.select.transferCategoryCodeSelect.setValue(product.transferCategoryCode); ENV.elementRefs.select.unitCodeSelect.setValue(product.unitCode); document.getElementById("unit").value = product.unit; - - },100) + }); }, // 선택 아이템 삭제 deleteItemById(id) { - ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id); - const target = document.querySelector(`#listBody div[data-id='${id}']`); - if (target) target.remove(); - this.updateLayout(); + etUI.dialog.alert({ + title: '삭제 안내', + message: '등록하신 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + ENV.data.bankList = ENV.data.bankList.filter(p => p.id != id); + const target = document.querySelector(`#listBody div[data-id='${id}']`); + if (target) target.remove(); + formControl.updateLayout(); + }, + }); }, // 전체 초기화 clearAllItems() { - location.reload(); + etUI.dialog.alert({ + title: '초기화 안내', + message: '등록하신 모든 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + ENV.data.bankList = []; + document.getElementById('listBody').innerHTML = ''; + formControl.updateLayout(); + + // TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신. + document.getElementById('totalItems').textContent = ENV.data.bankList.length; + }, + }); }, goSave() { diff --git a/front/src/main/resources/templates/info/monthly/{id}.html b/front/src/main/resources/templates/info/monthly/{id}.html index 29c9eac8..2870f248 100644 --- a/front/src/main/resources/templates/info/monthly/{id}.html +++ b/front/src/main/resources/templates/info/monthly/{id}.html @@ -8,7 +8,7 @@

[[${currentMonthlyInfo.koreanMonth}]]의
- 임산물 현황 [[${currentList.totalElements}]]건 등록 되었습니다. + 임산물 현황 [[${currentList.totalElements}]]건 등록 되었습니다.

임산물 현황을 등록해 주세요.

@@ -298,7 +298,7 @@ }, // 등록폼 추가 - openAddForm() { + openAddForm(callback) { ajaxUtil._ajaxAsyncMethod( "/api/front/info/monthly/create/from", @@ -341,6 +341,9 @@ ENV.module.modalPopup.open(); document.querySelector('.modal-content').scrollTop = 0; + + // 모두 로드된 후 콜백 실행 + if (typeof callback === 'function') callback(); }, function(code, rstData) { kri.logger.error('Do nothing. code: '+ code, rstData); @@ -461,11 +464,10 @@ const product = ENV.data.productList.find(p => p.id == id); if (!product) return; - this.openAddForm(); - - setTimeout(function() { - + this.openAddForm(() => { const form = document.getElementById('forestForm'); + if (!form) return; + Object.entries(product).forEach(([key, val]) => { const field = form.elements.namedItem(key); if (field) { @@ -485,7 +487,6 @@ } }); - ENV.elementRefs.select.mainYieldUnitCodeSelect.setValue(product.mainYieldUnitCode); ENV.elementRefs.select.mainSaleUnitCodeSelect.setValue(product.mainSaleUnitCode); ENV.elementRefs.select.subYieldUnitCodeSelect.setValue(product.subYieldUnitCode); @@ -494,23 +495,39 @@ document.getElementById("mainSaleUnit").value = product.mainSaleUnit; document.getElementById("subYieldUnit").value = product.subYieldUnit; document.getElementById("subSaleUnit").value = product.subSaleUnit; - - },100); - + }); }, // 선택 아이템 삭제 deleteItemById(id) { - ENV.data.productList = ENV.data.productList.filter(p => p.id != id); - const target = document.querySelector(`#listBody div[data-id='${id}']`); - if (target) target.remove(); - this.updateLayout(); + etUI.dialog.alert({ + title: '삭제 안내', + message: '등록하신 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + ENV.data.productList = ENV.data.productList.filter(p => p.id != id); + const target = document.querySelector(`#listBody div[data-id='${id}']`); + if (target) target.remove(); + formControl.updateLayout(); + }, + }); }, // 전체 초기화 clearAllItems() { - location.reload(); - // ENV.data.productList = []; - // document.getElementById('listBody').innerHTML = ''; - // this.updateListHeader(); + etUI.dialog.alert({ + title: '초기화 안내', + message: '등록하신 모든 내용을 삭제하시겠어요?
삭제된 내용은 복구할 수 없습니다.', + type: 'confirm', + dialogType: 'confirm', + callback: function () { + ENV.data.productList = []; + document.getElementById('listBody').innerHTML = ''; + formControl.updateLayout(); + + // TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신. + document.getElementById('totalItems').textContent = ENV.data.productList.length; + }, + }); }, // 아이템 겟수 처리 아이템에 따른 레이아웃 정리 diff --git a/front/src/main/resources/templates/info/user/user.html b/front/src/main/resources/templates/info/user/user.html index 3034ed8b..875d14dc 100644 --- a/front/src/main/resources/templates/info/user/user.html +++ b/front/src/main/resources/templates/info/user/user.html @@ -20,7 +20,7 @@
-
@@ -281,10 +281,6 @@
+
+ \ 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 new file mode 100644 index 00000000..0c23edf6 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/daily-record.html @@ -0,0 +1,642 @@ + + + +
+
+ +
+
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
+
+
+ + + +
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/forest-product.html b/admin/src/main/resources/templates/households/tab/forest-product.html new file mode 100644 index 00000000..1ce4ce76 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/forest-product.html @@ -0,0 +1,121 @@ + + + +
+
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html new file mode 100644 index 00000000..9c8e3d32 --- /dev/null +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -0,0 +1,98 @@ + + + +
+
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
+
+
+ + +
+ \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}-2.html b/admin/src/main/resources/templates/households/{seq}-2.html new file mode 100644 index 00000000..ce1b0380 --- /dev/null +++ b/admin/src/main/resources/templates/households/{seq}-2.html @@ -0,0 +1,1303 @@ + + + +
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
임가번호 + 16750 + 경영주 + 홍길동 + 연령 + 75 +
가구 연락처 + 031-0000-0000 + 휴대폰 번호 + 010-0000-0000 +
실사 + 서울 + 지역 + 31.경기도 + 세부 지역 + 9.경기 +
전체 주소 + 경기도 성남시 분당구 산성대로 OOOO +
업종 대분류 + 40. 수실류재배업 + 업종 중분류1 + 42. 대추재배업 + 업종 중분류2 + 52_1. 조경수 +
규모/세부품목 + 52_1_1. 조경수 +
담당 조사원 + 김조사 + 담당조사원 연락처 + 010-0000-0000 + 유지여부 + 1.유지 +
비고 + - +
+ +
+
+ + +
+
+
+ +
+
+
+ + + + + +
+ +
+
+ +
+
+ +
+
+
+
    +
  • +

    작성완료

    + 6건 +
  • +
  • +

    미작성

    + 6건 +
  • +
  • +

    미완료

    + 6건 +
  • +
  • +

    대기

    + 6건 +
  • +
  • +

    완료율

    + 56.12% +
  • +
+
+ + + + + + + + + + + + + + + + +
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
+
+
+ + + +
+ +
+
+
+
+

+
+
+ + + +
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
+
+
+
+ +
+
+
+ +
+
+

수입 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + + + +
선택재배형태수입의 종류대상수입원수량단위현금(원)
+
+ + +
+
+

지출 (0건)

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택지출의 종류용도수량단위현금(원)
+
+
+
+
+ +
+
+
+
+

+
+
+ + +
+
+
+ + + + + + + + + + + + + + +
선택방문일관리분야내용최종 수정자답례품 전달
+
+
+
+
+
+ +
+
+
+ +
+
+ + +
+
+
+
+
+
+ + + + + + +
+ +
+ + + + + + + + + + + + + + + + + + + +
+ + \ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index ce1b0380..aa2f76a1 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -135,460 +135,17 @@
-
- -
-
-
-
    -
  • -

    작성완료

    - 6건 -
  • -
  • -

    미작성

    - 6건 -
  • -
  • -

    미완료

    - 6건 -
  • -
  • -

    대기

    - 6건 -
  • -
  • -

    완료율

    - 56.12% -
  • -
-
- - - - - - - - - - - - - - + + - -
입력날짜완료상태수입노동투입지출동력사용시간임업 자가소비량농업 자가소비량
-
-
+ + - - -
- -
-
-
-
-

-
-
- - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
주생산물부생산물
선택지번지목읍면동가능면적(평)재배작물명면적(평)수확량단위판매량단위수확량단위판매량단위
-
-
-
- -
-
-
- -
-
-

수입 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - - - -
선택재배형태수입의 종류대상수입원수량단위현금(원)
-
- - -
-
-

지출 (0건)

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택지출의 종류용도수량단위현금(원)
-
-
-
-
- -
-
-
-
-

-
-
- - -
-
-
- - - - - - - - - - - - - - -
선택방문일관리분야내용최종 수정자답례품 전달
-
-
-
+ +
@@ -686,563 +243,6 @@ } - - - - - - - - @@ -215,11 +217,6 @@ datepickerInstance.setDate(new Date(), { render: true }); } }); - - $(document).ready(() => { - const reqForm = document.reqForm; - document.reqVisitForm.householdSeq.value = reqForm.householdSeq.value; - });
\ No newline at end of file diff --git a/admin/src/main/resources/templates/households/tab/household-visit.html b/admin/src/main/resources/templates/households/tab/household-visit.html index 9c8e3d32..2afcc4e4 100644 --- a/admin/src/main/resources/templates/households/tab/household-visit.html +++ b/admin/src/main/resources/templates/households/tab/household-visit.html @@ -10,7 +10,7 @@

-
\ No newline at end of file diff --git a/admin/src/main/resources/templates/households/{seq}-2.html b/admin/src/main/resources/templates/households/{seq}-backup.html similarity index 100% rename from admin/src/main/resources/templates/households/{seq}-2.html rename to admin/src/main/resources/templates/households/{seq}-backup.html diff --git a/admin/src/main/resources/templates/households/{seq}.html b/admin/src/main/resources/templates/households/{seq}.html index aa2f76a1..52a1f1a2 100644 --- a/admin/src/main/resources/templates/households/{seq}.html +++ b/admin/src/main/resources/templates/households/{seq}.html @@ -178,6 +178,10 @@
+ + @@ -816,7 +818,11 @@ {{include tmpl="#titleTmpl" /}}
    - {{for list tmpl="#basicRowTmpl" /}} + {{if modifiable}} + {{for list tmpl="#basicRowTmpl1" /}} + {{else}} + {{for list tmpl="#basicRowTmpl2" /}} + {{/if}}
{{include tmpl="#etcRowTmpl" /}} @@ -828,24 +834,42 @@

{{:date.start}} ~ {{:date.end}}

{{/if}} - +