From f4b37af7bfe133f5955e8ea6fb32420fc9985033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Tue, 24 Jun 2025 21:46:12 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EC=9E=85?= =?UTF-8?q?=EB=A0=A5=EC=83=81=ED=83=9C=20=EC=9D=BC=EA=B4=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/application/util/DailyUtil.java | 102 ++++++++++++++++++ .../persistence/RecordCalendarDao.java | 80 ++++++++++---- .../web/RecordCalendarController.java | 3 +- .../application/RecordCalendarService.java | 9 +- .../application/domain/CalendarChildren.java | 36 ++++++- .../application/domain/RecordCalendar.java | 9 ++ .../application/domain/RecordCalendarCmd.java | 4 - .../web/DailyExpenseUIController.java | 26 ++++- .../web/DailyFarmingUIController.java | 26 ++++- .../web/DailyForestryUIController.java | 26 ++++- .../adapters/web/DailyIncomeUIController.java | 31 ++++-- .../adapters/web/DailyPowerUIController.java | 26 ++++- .../adapters/persistence/DailyRecordDao.java | 27 ++--- .../persistence/model/DailyRecordDto.java | 54 +++------- .../adapters/web/DailyRecordController.java | 2 +- .../web/model/CreateDailyRecordReqVO.java | 29 +++-- .../record/adapters/web/model/DailyCmd.java | 22 ---- .../adapters/web/model/DailyStatus.java | 2 +- .../adapters/web/model/DailyTargetStatus.java | 10 +- .../adapters/web/DailyWorkUIController.java | 26 ++++- .../resources/static/ui/page/daily-record.js | 6 +- .../resources/templates/record/calendar.html | 44 ++++++-- .../templates/record/daily/done.html | 2 +- .../templates/record/daily/index.html | 11 +- .../templates/record/expense/index.html | 12 ++- .../templates/record/farming/index.html | 22 ++-- .../templates/record/forestry/index.html | 12 ++- .../templates/record/income/index.html | 31 ++++-- .../templates/record/power/index.html | 12 ++- .../templates/record/work/index.html | 12 ++- 30 files changed, 515 insertions(+), 199 deletions(-) create mode 100644 front/src/main/java/app/module/front/config/application/util/DailyUtil.java delete mode 100644 front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyCmd.java diff --git a/front/src/main/java/app/module/front/config/application/util/DailyUtil.java b/front/src/main/java/app/module/front/config/application/util/DailyUtil.java new file mode 100644 index 00000000..763e803d --- /dev/null +++ b/front/src/main/java/app/module/front/config/application/util/DailyUtil.java @@ -0,0 +1,102 @@ +package app.module.front.config.application.util; + +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Date; +import java.util.Locale; + +@Slf4j +@Component +public class DailyUtil { + + /** + * int -> localdate + * @param month 월(yyyyMM) + * @param day 일(d) + * @return LocalDate + */ + public LocalDate getDayToLocalDate(String month, int day) { + SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); + SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); + + try { + Date formatDate = beforeSdf.parse(month + String.format("%02d", day)); + + return LocalDate.parse(afterSdf.format(formatDate)); + } catch (Exception e) { + log.warn("[DailyUtil][getDayToLocalDate] month={}, day={}", month, day, e); + } + + return null; + } + + /** + * 마지막 일 여부 + * + * @param searchDate 종료일(yyyy-MM-dd) + * @return true=마지막 일, false=마지막 일 아님 + */ + public boolean isLastDay(LocalDate searchDate) { + if (searchDate != null) { + LocalDate lastDate = searchDate.withDayOfMonth(searchDate.lengthOfMonth()); + + return searchDate == lastDate; + } + + return false; + } + + /** + * 검색 일의 마지막 일 조회 + * @param searchDate 검색 + * @return 마지막 일 + */ + public int getLastDay(LocalDate searchDate) { + return searchDate.withDayOfMonth(searchDate.lengthOfMonth()).getDayOfMonth(); + } + + /** + * 자가농업 항목 오픈 여부 + * [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 + * + * @param groupNo + * @param searchDate 종료일 + * @return true=대상, false=대상 아님 + */ + public boolean isFarmingOpen(int groupNo, LocalDate searchDate) { + return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(searchDate); + } + + /** + * 데이터 수정 가능 여부 + * [정책] 15일전까지 데이터 수정 가능(등록도 불가) + * @param startDate + * @param endDate + * @return true=수정 가능, false=수정 불가 + */ + public boolean isModifiable(LocalDate startDate, LocalDate endDate) { + // TODO : 15일로 변경, 테스트를 위해 30일로 진행중 + LocalDate limitStart = LocalDate.now().minusDays(30); + log.debug("isModifiable @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate); + + return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); + } + + /** + * 데이터 등록 가능 여부 + * @param startDate + * @param endDate + * @return + */ + public boolean isRegisterPossible(LocalDate startDate, LocalDate endDate) { + // TODO : 15일로 변경, 테스트를 위해 60일로 진행중 + LocalDate limitStart = LocalDate.now().minusDays(60); + log.debug("isRegisterPossible @@limitStart: {}, startDate: {}, endDate: {}", limitStart, startDate, endDate); + + return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate)); + } +} 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 03efb838..5d0d586c 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 @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.calendar.adapters.persistence; import app.module.core.config.application.enums.MonthStatus; +import app.module.front.config.application.util.DailyUtil; import app.module.front.usecase.daily.calendar.adapters.persistence.model.DailyRecordCalendarDto; import app.module.front.usecase.daily.record.adapters.persistence.DailyRecordMapper; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; @@ -9,8 +10,10 @@ import app.module.front.usecase.daily.calendar.ports.RecordCalendarPortOut; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.CalendarChildren; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; +import app.module.front.usecase.daily.record.adapters.web.model.DailySort; import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; import app.module.front.usecase.daily.record.ports.application.domain.GetDailyRecordCmd; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -26,6 +29,7 @@ import java.util.Objects; public class RecordCalendarDao implements RecordCalendarPortOut { private final RecordCalendarMapper recordCalendarMapper; private final DailyRecordMapper dailyRecordMapper; + private final DailyUtil dailyUtil; @Override public List operate(RecordCalendarCmd command) { @@ -39,12 +43,14 @@ public class RecordCalendarDao implements RecordCalendarPortOut { monthlyList.add(new CalendarChildren( "MONTHLY", "임산물 현황 등록", + null, // TODO monthlyStatus.isForestNone() ? 0 : 1, monthlyStatus.isForestNone() ? "/info/monthly" : String.format("/info/monthly/month/%s", command.getSearchMonth()))); monthlyList.add(new CalendarChildren( "BANK", "은행 자동이체 내역 등록", + null, // TODO monthlyStatus.isBankNone() ? 0 : 1, (LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMM")).equals(command.getSearchMonth())) ? "/info/bank" : null)); @@ -54,6 +60,11 @@ public class RecordCalendarDao implements RecordCalendarPortOut { refine.setNo(calendar.getGroupNo()); refine.setStart(calendar.getStartDay()); refine.setEnd(calendar.getEndDay()); + refine.setStartDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay())); + refine.setEndDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay())); + + refine.setRegistrable(dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())); + refine.setModifiable(dailyUtil.isModifiable(refine.getStartDate(), refine.getEndDate())); DailyRecordStatusDto findStatus = statusList.stream() .filter(f -> Objects.equals(calendar.getDailyId(), f.getDailyId())) @@ -61,53 +72,62 @@ public class RecordCalendarDao implements RecordCalendarPortOut { List childList = new ArrayList<>(); if (findStatus == null) { - refine.setChildren(new ArrayList<>()); + if (!dailyUtil.isRegisterPossible(refine.getStartDate(), refine.getEndDate())) { + childList.addAll(this.getNoneChildList(dailyUtil.isFarmingOpen(refine.getNo(), refine.getEndDate()))); + } + } else { if (DailyTargetStatus.TARGET.equals(findStatus.getIncomeStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getIncomeStatus())) { childList.add(new CalendarChildren( - "INCOME", - "수입", + DailySort.INCOME.name(), + DailySort.INCOME.getDesc(), + findStatus.getIncomeStatus(), findStatus.getIncomeCount(), String.format(pathFormat, "income", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getWorkStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getWorkStatus())) { childList.add(new CalendarChildren( - "WORK", - "임업노동 투입 내역", + DailySort.WORK.name(), + DailySort.WORK.getDesc(), + findStatus.getWorkStatus(), findStatus.getWorkCount(), String.format(pathFormat, "work", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getExpenseStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getExpenseStatus())) { childList.add(new CalendarChildren( - "EXPENSE", - "지출", + DailySort.EXPENSE.name(), + DailySort.EXPENSE.getDesc(), + findStatus.getExpenseStatus(), findStatus.getExpenseCount(), String.format(pathFormat, "expense", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getPowerStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getPowerStatus())) { childList.add(new CalendarChildren( - "POWER", - "동력 사용시간", + DailySort.POWER.name(), + DailySort.POWER.getDesc(), + findStatus.getPowerStatus(), findStatus.getPowerCount(), String.format(pathFormat, "power", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getForestryStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getForestryStatus())) { childList.add(new CalendarChildren( - "FORESTRY", - "자가임업 생산물 중 자가소비량", + DailySort.FORESTRY.name(), + DailySort.FORESTRY.getDesc(), + findStatus.getForestryStatus(), findStatus.getForestryCount(), String.format(pathFormat, "forestry", command.getSearchMonth(), findStatus.getDayGroupNo()))); } if (DailyTargetStatus.TARGET.equals(findStatus.getFarmingStatus()) || DailyTargetStatus.TODAY_NONE.equals(findStatus.getFarmingStatus())) { childList.add(new CalendarChildren( - "FARMING", - "자가농업 생산물 중 자가소비량", + DailySort.FARMING.name(), + DailySort.FARMING.getDesc(), + findStatus.getFarmingStatus(), findStatus.getFarmingCount(), String.format(pathFormat, "farming", command.getSearchMonth(), findStatus.getDayGroupNo()))); } @@ -121,6 +141,23 @@ public class RecordCalendarDao implements RecordCalendarPortOut { return refineList; } + /** + * 미작성 목록 조회 + * + * @param farmingOpen + * @return 미작성 목록 + */ + private List getNoneChildList(boolean farmingOpen) { + List childList = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + if (!DailySort.FARMING.equals(type) || (DailySort.FARMING.equals(type) && farmingOpen)) { + childList.add(new CalendarChildren(type.name(),type.getDesc())); + } + } + + return childList; + } + @Override public boolean getDataNoneCountBySomeDayAfter(RecordCalendarCmd command) { int dataNoneCount = recordCalendarMapper.getDataNoneCountBySomeDayAfter(command); @@ -158,14 +195,17 @@ public class RecordCalendarDao implements RecordCalendarPortOut { List calendarList = recordCalendarMapper.getCalendarByDailyRecord(command); List refineList = new ArrayList<>(); - for (DailyRecordCalendarDto record : calendarList) { - record.setStartDate(command.getSearchMonth() + String.format("%02d", record.getStartDay())); + for (DailyRecordCalendarDto calendar : calendarList) { + LocalDate startDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getStartDay()); + LocalDate endDate = dailyUtil.getDayToLocalDate(command.getSearchMonth(), calendar.getEndDay()); + int lastDay = dailyUtil.getLastDay(startDate); + calendar.setStartDate(startDate.toString()); - if ((command.getLastDay() == 28 || command.getLastDay() == 30) && record.getStartDay() == command.getLastDay()) { - record.setEndDay(command.getLastDay()); - refineList.add(record); - } else if (record.getStartDay() <= command.getLastDay() && record.getEndDay() <= command.getLastDay()) { - refineList.add(record); + if ((lastDay == 28 || lastDay == 30) && calendar.getStartDay() == lastDay) { + calendar.setEndDay(lastDay); + refineList.add(calendar); + } else if (calendar.getStartDay() <= lastDay && calendar.getEndDay() <= lastDay) { + refineList.add(calendar); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java index 2473a3cd..d3ce0f14 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/adapters/web/RecordCalendarController.java @@ -29,8 +29,7 @@ public class RecordCalendarController { List calendarList = recordCalendarPortIn.operate(new RecordCalendarCmd( reqVO.getSearchMonth(), - reqVO.getHouseholdSeq(), - reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth() + reqVO.getHouseholdSeq() )); return ResponseEntity.status(HttpStatus.OK).body(calendarList); 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 3518eec3..2cc7c6c2 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 @@ -3,6 +3,7 @@ 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.CalendarChildren; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendar; import app.module.front.usecase.daily.calendar.ports.application.domain.RecordCalendarCmd; import lombok.RequiredArgsConstructor; @@ -17,20 +18,22 @@ public class RecordCalendarService implements RecordCalendarPortIn { @Override public List operate(RecordCalendarCmd command) { - return portOut.operate(command); + List list = portOut.operate(command); + + return list; } @Override public boolean getDataNoneCountBySomeDayAfter() { RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); - return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq(), 0)); + return portOut.getDataNoneCountBySomeDayAfter(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); } @Override public String getLatestDate() { RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); - return portOut.getLatestDate(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq(), 0)); + return portOut.getLatestDate(new RecordCalendarCmd(reqVO.getSearchMonth(), reqVO.getHouseholdSeq())); } } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java index e08f58dd..1e6d2806 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/CalendarChildren.java @@ -1,13 +1,45 @@ package app.module.front.usecase.daily.calendar.ports.application.domain; +import app.module.front.usecase.daily.record.adapters.web.model.DailyTargetStatus; import lombok.AllArgsConstructor; import lombok.Data; @Data -@AllArgsConstructor public class CalendarChildren { + public CalendarChildren() { + } + + public CalendarChildren(String code, String codeLabel) { + this.code = code; + this.codeLabel = codeLabel; + } + + public CalendarChildren(String code, String codeLabel, DailyTargetStatus status, Integer total, String path) { + this.code = code; + this.codeLabel = codeLabel; + this.status = status; + this.total = total; + this.path = path; + } + + /** + * 항목 코드 + */ private String code; + /** + * 항목명 + */ private String codeLabel; - private Integer total; + /** + * 상태 + */ + private DailyTargetStatus status; + /** + * 등록 건수 + */ + private int total; + /** + * 수정 페이지 경로 + */ private String path; } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java index 16202a87..65b75ddb 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendar.java @@ -1,10 +1,12 @@ package app.module.front.usecase.daily.calendar.ports.application.domain; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.ToString; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.time.LocalDate; import java.util.List; @Data @@ -14,6 +16,13 @@ public class RecordCalendar { private Integer no; private Integer start; private Integer end; + //TODO : JsonIgnore +// @JsonIgnore + private LocalDate startDate; + @JsonIgnore + private LocalDate endDate; + private boolean isRegistrable; + private boolean isModifiable; private List children; private List monthly; } diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java index 97e08cd8..28f5090a 100644 --- a/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/ports/application/domain/RecordCalendarCmd.java @@ -14,8 +14,4 @@ public class RecordCalendarCmd { * 임가 일련번호 */ private Long householdSeq; - /** - * 특정월의 마지막 일 - */ - private int lastDay; } 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 3d1fb716..cedce373 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 @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.thymeleaf.util.StringUtils; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -37,12 +38,14 @@ public class DailyExpenseUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 + * @param targetList 다음 단계 */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "type", required = false) String searchType) { + , @RequestParam(name = "type", required = false) String searchType + , @RequestParam(name = "target", required = false) String targetList) { - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList); DailyExpenseUIReqVO reqVO = new DailyExpenseUIReqVO(searchMonth, groupNo); log.debug("reqVO: {}", reqVO); @@ -52,7 +55,8 @@ public class DailyExpenseUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("expenseList", expenseList); - model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("targetList", targetList); + model.addAttribute("moveStep", "step".equals(searchType)); return "record/expense/index"; } @@ -100,7 +104,7 @@ public class DailyExpenseUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); @@ -109,6 +113,20 @@ public class DailyExpenseUIController { throw new NoRecordDataException(); } + if (!org.apache.commons.lang3.StringUtils.isBlank(targetList)) { + List list = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + for (String target : targetList.split(",")) { + if (type.name().equalsIgnoreCase(target)) { + list.add(type); + break; + } + } + } + + dailyRecord.setStepList(list); + } + 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 7e1f32c6..66fa7468 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 @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.thymeleaf.util.StringUtils; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -37,12 +38,14 @@ public class DailyFarmingUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 + * @param targetList 다음 단계 */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "type", required = false) String searchType) { + , @RequestParam(name = "type", required = false) String searchType + , @RequestParam(name = "target", required = false) String targetList) { - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList); DailyFarmingUIReqVO reqVO = new DailyFarmingUIReqVO(searchMonth, groupNo); log.debug("reqVO: {}", reqVO); @@ -52,7 +55,8 @@ public class DailyFarmingUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("farmingList", farmingList); - model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("targetList", targetList); + model.addAttribute("moveStep", "step".equals(searchType)); return "record/farming/index"; } @@ -100,7 +104,7 @@ public class DailyFarmingUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); @@ -109,6 +113,20 @@ public class DailyFarmingUIController { throw new NoRecordDataException(); } + if (!org.apache.commons.lang3.StringUtils.isBlank(targetList)) { + List list = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + for (String target : targetList.split(",")) { + if (type.name().equalsIgnoreCase(target)) { + list.add(type); + break; + } + } + } + + dailyRecord.setStepList(list); + } + 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 fdb53b55..cb7c5090 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 @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.thymeleaf.util.StringUtils; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -37,12 +38,14 @@ public class DailyForestryUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 + * @param targetList 다음 단계 */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "type", required = false) String searchType) { + , @RequestParam(name = "type", required = false) String searchType + , @RequestParam(name = "target", required = false) String targetList) { - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList); DailyForestryUIReqVO reqVO = new DailyForestryUIReqVO(searchMonth, groupNo); log.debug("reqVO: {}", reqVO); @@ -52,7 +55,8 @@ public class DailyForestryUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("forestryList", forestryList); - model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("targetList", targetList); + model.addAttribute("moveStep", "step".equals(searchType)); return "record/forestry/index"; } @@ -100,7 +104,7 @@ public class DailyForestryUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); @@ -109,6 +113,20 @@ public class DailyForestryUIController { throw new NoRecordDataException(); } + if (!org.apache.commons.lang3.StringUtils.isBlank(targetList)) { + List list = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + for (String target : targetList.split(",")) { + if (type.name().equalsIgnoreCase(target)) { + list.add(type); + break; + } + } + } + + dailyRecord.setStepList(list); + } + 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 532cf7d4..1ec144c5 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 @@ -11,14 +11,15 @@ 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.apache.commons.lang3.StringUtils; 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.ArrayList; import java.util.List; @Slf4j @@ -37,12 +38,14 @@ public class DailyIncomeUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 + * @param targetList 다음 단계 */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "type", required = false) String searchType) { + , @RequestParam(name = "type", required = false) String searchType + , @RequestParam(name = "target", required = false) String targetList) { - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList); DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO(searchMonth, groupNo); log.debug("reqVO: {}", reqVO); @@ -52,7 +55,8 @@ public class DailyIncomeUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("incomeList", incomeList); - model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("targetList", targetList); + model.addAttribute("moveStep", "step".equals(searchType)); return "record/income/index"; } @@ -70,7 +74,8 @@ public class DailyIncomeUIController { , @PathVariable("id") String id) { DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO(searchMonth, groupNo); - if (StringUtils.isEmpty(id)) { + + if (StringUtils.isBlank(id)) { reqVO.setId(0L); } else { reqVO.setId(Long.parseLong(id)); @@ -100,7 +105,7 @@ public class DailyIncomeUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); @@ -109,6 +114,20 @@ public class DailyIncomeUIController { throw new NoRecordDataException(); } + if (!StringUtils.isBlank(targetList)) { + List list = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + for (String target : targetList.split(",")) { + if (type.name().equalsIgnoreCase(target)) { + list.add(type); + break; + } + } + } + + dailyRecord.setStepList(list); + } + 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 ebecd841..6a6dd934 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 @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.thymeleaf.util.StringUtils; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -35,12 +36,14 @@ public class DailyPowerUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 + * @param targetList 다음 단계 */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "type", required = false) String searchType) { + , @RequestParam(name = "type", required = false) String searchType + , @RequestParam(name = "target", required = false) String targetList) { - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList); DailyPowerUIReqVO reqVO = new DailyPowerUIReqVO(searchMonth, groupNo); log.debug("reqVO: {}", reqVO); @@ -50,7 +53,8 @@ public class DailyPowerUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("powerList", powerList); - model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("targetList", targetList); + model.addAttribute("moveStep", "step".equals(searchType)); return "record/power/index"; } @@ -95,7 +99,7 @@ public class DailyPowerUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); @@ -104,6 +108,20 @@ public class DailyPowerUIController { throw new NoRecordDataException(); } + if (!org.apache.commons.lang3.StringUtils.isBlank(targetList)) { + List list = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + for (String target : targetList.split(",")) { + if (type.name().equalsIgnoreCase(target)) { + list.add(type); + break; + } + } + } + + dailyRecord.setStepList(list); + } + 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 83d24131..7eaaeb0c 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 @@ -1,6 +1,7 @@ package app.module.front.usecase.daily.record.adapters.persistence; import app.module.front.config.application.util.AuditUtil; +import app.module.front.config.application.util.DailyUtil; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordDto; import app.module.front.usecase.daily.record.adapters.persistence.model.DailyRecordStatusDto; import app.module.front.usecase.daily.record.adapters.web.model.DailyStatus; @@ -24,29 +25,29 @@ import java.util.Locale; @RequiredArgsConstructor public class DailyRecordDao implements DailyRecordPortOut { private final DailyRecordMapper dailyRecordMapper; + private final DailyUtil dailyUtil; @Override public DailyRecordDto detail(GetDailyRecordCmd command) { DailyRecordDto detail = dailyRecordMapper.getDailyRecord(command); - if (detail != null && detail.getStartDate() == null) { - try { - SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); - SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); - - Date formatDate = beforeSdf.parse(command.getSearchMonth() + String.format("%02d", detail.getStartDay())); - detail.setStartDate(LocalDate.parse(afterSdf.format(formatDate))); - - formatDate = beforeSdf.parse(command.getSearchMonth() + String.format("%02d", detail.getEndDay())); - detail.setEndDate(LocalDate.parse(afterSdf.format(formatDate))); - + if (detail != null) { + if (detail.getStartDate() == null) { + detail.setStartDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), detail.getStartDay())); + detail.setEndDate(dailyUtil.getDayToLocalDate(command.getSearchMonth(), detail.getEndDay())); if (detail.getStartDate().getMonth() != detail.getEndDate().getMonth()) { // 종료일의 달이 변경되면 시작일=종료일 처리 detail.setEndDate(detail.getStartDate()); } - } catch (Exception e) { - log.warn("[DateParse] target={}", detail.getStartDay(), e); } + + detail.setLastDay(dailyUtil.isLastDay(detail.getEndDate())); + detail.setFarmingOpen(dailyUtil.isFarmingOpen(detail.getGroupNo(), detail.getEndDate())); + detail.setRegistrable(dailyUtil.isRegisterPossible(detail.getStartDate(), detail.getEndDate())); + detail.setModifiable(dailyUtil.isModifiable(detail.getStartDate(), detail.getEndDate())); } + + log.debug("detail: {}", detail); + return detail; } 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 4ecf4735..eb74b6b6 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 @@ -37,50 +37,26 @@ public class DailyRecordDto { */ private boolean farmingOpen; /** - * 특정일의 데이터 등록 대상 항목 + * 데이터 등록 가능 여부 */ - private List targetList; + private boolean registrable; + /** + * 데이터 수정 가능 여부 + */ + private boolean modifiable; + /** * 현재 단계 */ private DailySort currentStep; - /** - * 마지막 일 여부 - * @return true=마지막 일, false=마지막 일 아님 + * 특정일의 데이터 등록 대상 항목 */ - public boolean isLastDay() { - if (endDate != null) { - LocalDate lastDate = endDate.withDayOfMonth(endDate.lengthOfMonth()); - - return endDate == lastDate; - } - - return false; - } - + private List targetList; /** - * 자가농업 항목 오픈 여부 - * [정책] 자가농업 생산물 중 자가소비량은 7일차 등록일에만 노출 및 선택, 21일 이후는 마지막 날 - * @return true=대상, false=대상 아님 + * 다음 단계로 이동될 단계 대상 항목 */ - public boolean isFarmingOpen() { - return groupNo == 4 || groupNo == 8 || groupNo == 12 || isLastDay(); - } - - /** - * 데이터 수정 가능 여부 - * [정책] 15일전까지 데이터 수정 가능(등록도 불가) - * @return true=수정 가능, false=수정 불가 - */ - public boolean isModifiable() { - // TODO : 15일로 변경, 테스트를 위해 30일로 진행중 - LocalDate limitStart = LocalDate.now().minusDays(30); - log.debug("@@limitStart: {}", limitStart); - - return (limitStart.isBefore(startDate) || limitStart.isEqual(startDate) || limitStart.isEqual(endDate)); - } - + private List stepList; /** * 다음 단계로 이동될 단계 조회 * @@ -88,12 +64,12 @@ public class DailyRecordDto { */ public String getNextStep() { String returnValue = null; - if (targetList != null) { + if (stepList != null) { int index = 0; - int size = targetList.size(); - for (DailySort target : targetList) { + int size = stepList.size(); + for (DailySort target : stepList) { if (target.equals(currentStep) && (index + 1) != size) { - returnValue = targetList.get(index + 1).name(); + returnValue = stepList.get(index + 1).name(); break; } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java index cffcb0af..0f4b9f4b 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/DailyRecordController.java @@ -48,7 +48,7 @@ public class DailyRecordController { formVO.setDayGroupNo(reqVO.getGroupNo()); formVO.setStartDate(detail.getStartDate()); formVO.setEndDate(detail.getEndDate()); - formVO.setFarmingStatus(detail.isFarmingOpen()); + formVO.setFarming(detail.isFarmingOpen()); log.debug("formVO: {}", formVO); dailyRecordPortIn.create(formVO); diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java index 3182f5ab..416e2795 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/CreateDailyRecordReqVO.java @@ -22,8 +22,14 @@ public class CreateDailyRecordReqVO { private DailyTargetStatus forestryStatus; private DailyTargetStatus farmingStatus; + /** + * 금일 데이터 없음으로 각 항목 상태 일괄 변경 + * + * @param todayNone 상태 + */ public void setTodayNone(String todayNone) { this.todayNone = todayNone; + if ("Y".equals(todayNone)) { this.allStatus = DailyStatus.TODAY_NONE; this.incomeStatus = DailyTargetStatus.TODAY_NONE; @@ -35,32 +41,37 @@ public class CreateDailyRecordReqVO { this.allStatus = DailyStatus.WAITING; if (incomeStatus == null) { - this.incomeStatus = DailyTargetStatus.NONE; + this.incomeStatus = DailyTargetStatus.TODAY_NONE; } if (workStatus == null) { - this.workStatus = DailyTargetStatus.NONE; + this.workStatus = DailyTargetStatus.TODAY_NONE; } if (expenseStatus == null) { - this.expenseStatus = DailyTargetStatus.NONE; + this.expenseStatus = DailyTargetStatus.TODAY_NONE; } if (powerStatus == null) { - this.powerStatus = DailyTargetStatus.NONE; + this.powerStatus = DailyTargetStatus.TODAY_NONE; } if (forestryStatus == null) { - this.forestryStatus = DailyTargetStatus.NONE; + this.forestryStatus = DailyTargetStatus.TODAY_NONE; } } } - public void setFarmingStatus(boolean isOpen) { - if ("Y".equals(todayNone)) { + /** + * 농업 생산물 입력 상태 변경 + * + * @param isOpen 자가농업 항목 오픈 여부 + */ + public void setFarming(boolean isOpen) { + if (farmingStatus == null) { if (isOpen) { this.farmingStatus = DailyTargetStatus.TODAY_NONE; } else { this.farmingStatus = DailyTargetStatus.NONE; } - } else if (farmingStatus == null) { - this.farmingStatus = DailyTargetStatus.NONE; + } else { + this.farmingStatus = DailyTargetStatus.TARGET; } } } diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyCmd.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyCmd.java deleted file mode 100644 index fac057b1..00000000 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyCmd.java +++ /dev/null @@ -1,22 +0,0 @@ -package app.module.front.usecase.daily.record.adapters.web.model; - -import app.module.front.config.application.util.AuthUtil; -import lombok.Data; -import lombok.ToString; - -@Data -@ToString -public class DailyCmd { - /** - * 검색 월(yyyyMM) - */ - private String searchMonth; - /** - * 검색 그룸번호 - */ - private Integer groupNo; - /** - * 임가 일련번호 - */ - private Long householdSeq; -} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java index 238f3667..7b69c6d8 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyStatus.java @@ -2,7 +2,7 @@ package app.module.front.usecase.daily.record.adapters.web.model; public enum DailyStatus { /** - * 입력중 + * 미완료 */ WAITING, /** diff --git a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java index 3e80e92f..a2472daf 100644 --- a/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java +++ b/front/src/main/java/app/module/front/usecase/daily/record/adapters/web/model/DailyTargetStatus.java @@ -2,20 +2,16 @@ package app.module.front.usecase.daily.record.adapters.web.model; public enum DailyTargetStatus { /** - * 등록 대상 + * 등록 대상 (테이터 건 수 체크) */ TARGET, /** - * 금일 없음 + * 금일 없음 (데이터 건 수 체크하지 않음) */ TODAY_NONE, /** - * 등록 없음 + * 대상 아님 */ NONE, -// /** -// * 등록 완료 -// */ -// DONE, ; } 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 ba6a4e0d..5356c947 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 @@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.thymeleaf.util.StringUtils; +import java.util.ArrayList; import java.util.List; @Slf4j @@ -37,12 +38,14 @@ public class DailyWorkUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 * @param searchType 수정여부 + * @param targetList 다음 단계 */ @GetMapping(path = "/{searchMonth}/{groupNo}") public String index(Model model, @PathVariable("searchMonth") String searchMonth, @PathVariable("groupNo") String groupNo - , @RequestParam(name = "type", required = false) String searchType) { + , @RequestParam(name = "type", required = false) String searchType + , @RequestParam(name = "target", required = false) String targetList) { - DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo); + DailyRecordDto dailyRecord = this.vaildGetDailyRecord(searchMonth, groupNo, targetList); DailyWorkUIReqVO reqVO = new DailyWorkUIReqVO(searchMonth, groupNo); log.debug("reqVO: {}", reqVO); @@ -52,7 +55,8 @@ public class DailyWorkUIController { model.addAttribute("reqVO", reqVO); model.addAttribute("dailyRecord", dailyRecord); model.addAttribute("workList", workList); - model.addAttribute("moveStep", !"update".equals(searchType)); + model.addAttribute("targetList", targetList); + model.addAttribute("moveStep", "step".equals(searchType)); return "record/work/index"; } @@ -101,7 +105,7 @@ public class DailyWorkUIController { * @param searchMonth 검색 월(yyyyMM) * @param groupNo 검색 그룹 */ - private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo) { + private DailyRecordDto vaildGetDailyRecord(String searchMonth, String groupNo, String targetList) { DailyUIReqVO reqVO = new DailyUIReqVO(searchMonth, groupNo); log.debug("getRecordUIReq: {}", reqVO); @@ -110,6 +114,20 @@ public class DailyWorkUIController { throw new NoRecordDataException(); } + if (!org.apache.commons.lang3.StringUtils.isBlank(targetList)) { + List list = new ArrayList<>(); + for (DailySort type : DailySort.values()) { + for (String target : targetList.split(",")) { + if (type.name().equalsIgnoreCase(target)) { + list.add(type); + break; + } + } + } + + dailyRecord.setStepList(list); + } + dailyRecord.setCurrentStep(DailySort.WORK); return dailyRecord; diff --git a/front/src/main/resources/static/ui/page/daily-record.js b/front/src/main/resources/static/ui/page/daily-record.js index 8bef7178..353d3640 100644 --- a/front/src/main/resources/static/ui/page/daily-record.js +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -27,7 +27,7 @@ krip.daily.goToPrev = function() { * @param searchMonth * @param groupNo */ -krip.daily.goToNext = function(target, searchMonth, groupNo) { +krip.daily.goToNext = function(target, searchMonth, groupNo, targetList) { if (target == null) { if ($('._nextStep').data('last')) { target = 'LAST'; @@ -53,7 +53,7 @@ krip.daily.goToNext = function(target, searchMonth, groupNo) { url = url.replace('{groupNo}', groupNo); url = url.replace('{target}', target.toLowerCase()); - location.href = url; + location.href = url + '?type=step&target=' + (targetList !== undefined ? targetList : ''); }; /** @@ -66,7 +66,7 @@ krip.daily.goToDone = function(searchMonth, groupNo) { url = url.replace('{month}', searchMonth); url = url.replace('{groupNo}', groupNo); - location.replace(url); + location.href = url; }; /** diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html index cb5b65e4..7ee5c70b 100644 --- a/front/src/main/resources/templates/record/calendar.html +++ b/front/src/main/resources/templates/record/calendar.html @@ -769,10 +769,6 @@ if (rowdata == null) { kri.logger.error('달력 선택 데이터 없음.') } - // if (rowdata != null && typeof rowdata === 'object' && rowdata.children !== undefined) { - // rowList = rowdata.children.filter(f => !(f.code === 'MONTHLY' || f.code === 'BANK')); - // monthlyList = rowdata.children.filter(f => f.code === 'MONTHLY' || f.code === 'BANK'); - // } let tmpl = $.templates('#dailyNoneTmpl'); let html = ''; @@ -782,6 +778,8 @@ no: rowdata.no, date: currentDate, monthlyList: monthlyList, + registrable: rowdata.registrable, + modifiable: rowdata.modifiable, }); } else { tmpl = $.templates('#dailyListTmpl'); @@ -791,6 +789,8 @@ date: currentDate, list: childList, monthlyList: monthlyList, + registrable: rowdata.registrable, + modifiable: rowdata.modifiable, }); } @@ -804,11 +804,13 @@ @@ -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}} - +