From 96626c6cb7a97fa619c5f13f44cb1957f22491ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=98=84=EC=A3=BC?= Date: Mon, 9 Jun 2025 18:31:07 +0900 Subject: [PATCH] =?UTF-8?q?[FO]=20=EC=9D=BC=EA=B3=84=EB=B6=80=20=EB=93=B1?= =?UTF-8?q?=EB=A1=9D=20wip?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/sql/schema/02_create-record.sql | 18 +- .../persistence/RecordCalendarMapper.java | 44 ++++ .../model/DailyRecordCalendarDto.java | 14 ++ .../model/DailyRecordStatusDto.java | 29 +++ .../service/RecordCalendarService.java | 16 ++ .../service/RecordCalendarServiceImpl.java | 54 ++++ .../web/RecordCalendarController.java | 66 +++++ .../web/model/RecordCalendarUIReqVO.java | 73 ++++++ .../income/web/DailyIncomeController.java | 41 +++ .../income/web/model/DailyIncomeUIReqVO.java | 12 + .../record/persistence/DailyRecordMapper.java | 37 +++ .../persistence/model/DailyRecordDto.java | 33 +++ .../model/UpdateDailyRecordDto.java | 14 ++ .../record/service/DailyRecordService.java | 11 + .../service/DailyRecordServiceImpl.java | 72 ++++++ .../record/web/DailyRecordController.java | 87 +++++++ .../web/model/CreateDailyRecordReqVO.java | 29 +++ .../record/web/model/DailyRecordUIReqVO.java | 12 + .../daily/record/web/model/DailyStatus.java | 5 + .../record/web/model/DailyTargetStatus.java | 5 + .../web/model/UpdateDailyRecordStatusCmd.java | 20 ++ .../validator/CreateDailyRecordValidator.java | 50 ++++ .../mappers/daily/DailyRecordMapper.xml | 73 ++++++ .../mappers/daily/RecordCalendarMapper.xml | 61 +++++ .../static/library/jquery/jquery-3.7.1.min.js | 2 + .../src/main/resources/static/ui/ajaxUtil.js | 238 ++++++++++++++++++ .../main/resources/static/ui/commonUtil.js | 33 +++ .../resources/static/ui/page/daily-record.js | 30 +++ .../templates/common/components.html | 4 +- .../resources/templates/layout/layout.html | 2 + .../templates/record/calendar-wrap.html | 33 +++ .../resources/templates/record/calendar.html | 74 ++++++ .../resources/templates/record/daily.html | 94 +++++++ .../templates/record/income/index.html | 35 +++ 34 files changed, 1412 insertions(+), 9 deletions(-) create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java create mode 100644 front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java create mode 100644 front/src/main/resources/mappers/daily/DailyRecordMapper.xml create mode 100644 front/src/main/resources/mappers/daily/RecordCalendarMapper.xml create mode 100644 front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js create mode 100644 front/src/main/resources/static/ui/ajaxUtil.js create mode 100644 front/src/main/resources/static/ui/commonUtil.js create mode 100644 front/src/main/resources/static/ui/page/daily-record.js create mode 100644 front/src/main/resources/templates/record/calendar-wrap.html create mode 100644 front/src/main/resources/templates/record/calendar.html create mode 100644 front/src/main/resources/templates/record/daily.html create mode 100644 front/src/main/resources/templates/record/income/index.html diff --git a/core/src/main/resources/sql/schema/02_create-record.sql b/core/src/main/resources/sql/schema/02_create-record.sql index 5107a24a..2500e6f9 100644 --- a/core/src/main/resources/sql/schema/02_create-record.sql +++ b/core/src/main/resources/sql/schema/02_create-record.sql @@ -2,7 +2,7 @@ -- ============================================ -- 임가 일계부 입력 관련 테이블 S -- ============================================ - +/* DROP TABLE IF EXISTS daily_income; DROP TABLE IF EXISTS daily_expense; DROP TABLE IF EXISTS daily_work; @@ -19,6 +19,8 @@ DROP SEQUENCE IF EXISTS daily_power_seq; DROP SEQUENCE IF EXISTS daily_forestry_seq; DROP SEQUENCE IF EXISTS daily_farming_seq; DROP SEQUENCE IF EXISTS daily_record_seq; +DROP SEQUENCE IF EXISTS daily_day_group_pkey; +*/ -- ============================================ @@ -84,7 +86,7 @@ CREATE SEQUENCE daily_record_seq START WITH 1 INCREMENT BY 1 CACHE 1 NO CYCLE; CREATE TABLE daily_record ( id bigint DEFAULT nextval('daily_record_seq') NOT NULL, -- 일계부 작성상태 ID household_seq bigint NOT NULL, -- 임가 일련번호 (FK) - month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) + record_month varchar(7) NOT NULL, -- 조사시행 월 (yyyy-mm) day_group_no smallint, -- 일계부 작성일자 그룹 번호 start_date date, -- 작성시작일(yyyy-mm-dd) end_date date, -- 작성종료일(yyyy-mm-dd) @@ -111,7 +113,7 @@ COMMENT ON TABLE daily_record IS '일계부 일별 작성상태'; COMMENT ON COLUMN daily_record.id IS '일계부 작성상태 ID'; COMMENT ON COLUMN daily_record.household_seq IS '임가 일련번호'; -COMMENT ON COLUMN daily_record.month IS '조사시행 월 (yyyy-mm)'; +COMMENT ON COLUMN daily_record.record_month IS '조사시행 월 (yyyy-mm)'; COMMENT ON COLUMN daily_record.start_date IS '작성시작일(yyyy-mm-dd)'; COMMENT ON COLUMN daily_record.end_date IS '작성종료일(yyyy-mm-dd)'; COMMENT ON COLUMN daily_record.day_group_no IS '일계부 작성일자 그룹 번호'; @@ -142,13 +144,13 @@ CREATE TABLE daily_income ( daily_record_seq bigint NOT NULL, -- 일계부 작성상태 일련번호 (FK) is_credit boolean, -- 외상판매 여부 crop_code varchar(255), -- 재배형태 코드 (매핑코드) - category_code varchar(255) NOT NULL, -- 수입 종류(매핑코드) - category_name varchar(30) NOT NULL, -- 수입 종류(직접입력) + category_code varchar(255) NULL, -- 수입 종류(매핑코드) + category_name varchar(30) NULL, -- 수입 종류(직접입력) source_purpose varchar(10), -- 수입원(용도) quantity decimal(6,2) NOT NULL, -- 수량 - unit_code varchar(10) NOT NULL, -- 단위 (매핑코드) - price integer NOT NULL, -- 현금(원) - estimated_value integer NOT NULL, -- 현물(평가액) + unit_code varchar(255) NOT NULL, -- 단위 (매핑코드) + price integer NULL, -- 현금(원) + estimated_value integer NULL, -- 현물(평가액) created_at timestamp(6), -- 생성일 created_by varchar(255), -- 생성자 updated_at timestamp(6), -- 수정일 diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java new file mode 100644 index 00000000..695728ca --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/RecordCalendarMapper.java @@ -0,0 +1,44 @@ +package app.module.front.usecase.daily.calendar.persistence; + +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; +import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.web.model.UpdateDailyRecordStatusCmd; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface RecordCalendarMapper { + + List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO); + + DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO); + + int getStartDayByDailyGroupNo(@Param("groupNo") Integer groupNo); + + /** + * 일계부 등록 여부 + * @param householdSeq + * @param recordMonth + * @param dayGroupNo + * @return + */ + Long getDailyRecordExistCount(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo); + + /** + * 일계부 등록(생성) + * @param command + * @return + */ + Long createDailyRecord(CreateDailyRecordReqVO command); + + /** + * 일계부 상태 수정 + * @param command + * @return + */ + int updateDailyRecordStatus(UpdateDailyRecordStatusCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java new file mode 100644 index 00000000..bfdd0b1f --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordCalendarDto.java @@ -0,0 +1,14 @@ +package app.module.front.usecase.daily.calendar.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class DailyRecordCalendarDto { + private String groupNo; + private Integer startDay; + private Integer endDay; + private String startDate; + private String dailyId; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java new file mode 100644 index 00000000..fc13c0b2 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/persistence/model/DailyRecordStatusDto.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.daily.calendar.persistence.model; + +import lombok.Data; +import lombok.ToString; + +import java.time.LocalDate; + +@Data +@ToString +public class DailyRecordStatusDto { + /** + * 일계부 일련번호 + */ + private Long dailyId; + private LocalDate startDate; + private LocalDate endDate; + /** + * 특정일 입력 상태 TODO enum + */ + private String allStatus; + /** + * 수입 입력 상태 TODO enum + */ + private String incomeStatus; + /** + * 수입 입력 개수 + */ + private Integer incomeCount; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java new file mode 100644 index 00000000..0d528374 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarService.java @@ -0,0 +1,16 @@ +package app.module.front.usecase.daily.calendar.service; + + +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; + +import java.util.List; + +public interface RecordCalendarService { + List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO); + + DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO); + + int getStartDayByDailyGroupNo(RecordCalendarUIReqVO reqVO); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java new file mode 100644 index 00000000..22cb9bbb --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/service/RecordCalendarServiceImpl.java @@ -0,0 +1,54 @@ +package app.module.front.usecase.daily.calendar.service; + +import app.module.front.usecase.daily.calendar.persistence.RecordCalendarMapper; +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; +import app.module.front.usecase.daily.record.persistence.DailyRecordMapper; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Locale; + +@Service +@RequiredArgsConstructor +public class RecordCalendarServiceImpl implements RecordCalendarService { + private final RecordCalendarMapper recordCalendarMapper; + + @Override + public List getCalendarByDailyRecord(RecordCalendarUIReqVO reqVO) { + int lastDay = reqVO.getSearchDate().withDayOfMonth(reqVO.getSearchDate().lengthOfMonth()).getDayOfMonth(); + + List list = recordCalendarMapper.getCalendarByDailyRecord(reqVO); + + List refineList = new ArrayList(); + for (DailyRecordCalendarDto record : list) { + record.setStartDate(reqVO.getSearchMonth() + String.format("%02d", record.getStartDay())); + + if ((lastDay == 28 || lastDay == 30) && record.getStartDay() == lastDay) { + record.setEndDay(lastDay); + refineList.add(record); + } else if (record.getStartDay() <= lastDay && record.getEndDay() <= lastDay) { + refineList.add(record); + } + } + + return refineList; + } + + @Override + public DailyRecordStatusDto getDailyRecordStatus(RecordCalendarUIReqVO reqVO) { + return recordCalendarMapper.getDailyRecordStatus(reqVO); + } + + @Override + public int getStartDayByDailyGroupNo(RecordCalendarUIReqVO reqVO) { + return recordCalendarMapper.getStartDayByDailyGroupNo(reqVO.getGroupNo()); + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java new file mode 100644 index 00000000..e546c3c4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/web/RecordCalendarController.java @@ -0,0 +1,66 @@ +package app.module.front.usecase.daily.calendar.web; + +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordCalendarDto; +import app.module.front.usecase.daily.calendar.persistence.model.DailyRecordStatusDto; +import app.module.front.usecase.daily.calendar.service.RecordCalendarService; +import app.module.front.usecase.daily.calendar.web.model.RecordCalendarUIReqVO; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDate; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.util.List; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/calendar") +public class RecordCalendarController { + private final RecordCalendarService recordCalendarService; + + @GetMapping(path = "") + public String index(Model model, @RequestParam(value = "searchDay", required = false) String searchDay) { + RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(searchDay, getAccessId()); + log.debug("reqVO: {}", reqVO); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("calendarList", recordCalendarService.getCalendarByDailyRecord(reqVO)); + + return "record/calendar"; + } + + @PostMapping(path = "/{searchMonth}/{groupNo}") + public String detail(Model model + , @PathVariable(required = true) String searchMonth + , @PathVariable(required = true) String groupNo) { + + RecordCalendarUIReqVO reqVO = new RecordCalendarUIReqVO(); + reqVO.setSearchMonth(searchMonth); + reqVO.setGroupNo(Integer.parseInt(groupNo)); + reqVO.setHouseholdSeq(getAccessId()); + log.debug("reqVO: {}", reqVO); + + DailyRecordStatusDto detail = recordCalendarService.getDailyRecordStatus(reqVO); + if (detail == null) { + int startDay = recordCalendarService.getStartDayByDailyGroupNo(reqVO); + reqVO.setSearchDay(reqVO.getSearchMonth() + String.format("%02d", startDay)); + } + + //uiCodeListPortIn.connect("code.pageable.rows"); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("detail", detail); + + return "record/calendar-wrap"; + } + + // TODO : 로그인 SEQ + private Long getAccessId() { + return 2L; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java new file mode 100644 index 00000000..2d1c1b5e --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/calendar/web/model/RecordCalendarUIReqVO.java @@ -0,0 +1,73 @@ +package app.module.front.usecase.daily.calendar.web.model; + +import lombok.Data; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString; +import org.apache.tika.utils.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.YearMonth; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; +import java.util.Date; +import java.util.Locale; + +@Data +@ToString +public class RecordCalendarUIReqVO { + private static final Logger LOGGER = LoggerFactory.getLogger(RecordCalendarUIReqVO.class); + + public RecordCalendarUIReqVO() { + } + + public RecordCalendarUIReqVO(String searchDay, Long accessId) { + if (StringUtils.isBlank(searchDay) || searchDay.length() != 8) { + searchDay = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyyMMdd")); + } + + try { + SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); + SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); + SimpleDateFormat monthSdf = new SimpleDateFormat("yyyyMM", Locale.KOREAN); + + Date formatDate = beforeSdf.parse(searchDay); + + setSearchDate(LocalDate.parse(afterSdf.format(formatDate))); + setSearchMonth(monthSdf.format(formatDate)); + setSearchDay(beforeSdf.format(formatDate)); + + } catch (Exception e) { + LOGGER.warn("[DateParse] target={}", searchDay, e); + } + + setHouseholdSeq(accessId); + } + + /** + * 검색 일(yyyyMMdd) + */ + private String searchDay; + + /** + * 검색 월(yyyyMM) + */ + private String searchMonth; + private Integer groupNo; + + /** + * 검색 일(yyyy-MM-dd) + */ + private LocalDate searchDate; + + /** + * 임가회원 일련번호 + */ + private Long householdSeq; + + +} diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java new file mode 100644 index 00000000..d8a0352a --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/DailyIncomeController.java @@ -0,0 +1,41 @@ +package app.module.front.usecase.daily.income.web; + +import app.module.front.usecase.daily.income.web.model.DailyIncomeUIReqVO; +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; +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; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/income") +public class DailyIncomeController { + + @GetMapping(path = "/{searchMonth}/{groupNo}") + public String index(Model model + , @PathVariable(required = true) String searchMonth + , @PathVariable(required = true) String groupNo) { + + DailyIncomeUIReqVO reqVO = new DailyIncomeUIReqVO(); + reqVO.setSearchMonth(searchMonth); + reqVO.setGroupNo(Integer.parseInt(groupNo)); + reqVO.setHouseholdSeq(getAccessId()); + log.debug("reqVO: {}", reqVO); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("detail", null); + + return "record/income/index"; + } + + // TODO : 로그인 SEQ + private Long getAccessId() { + return 2L; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java new file mode 100644 index 00000000..fd54204e --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/income/web/model/DailyIncomeUIReqVO.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.daily.income.web.model; + +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +public class DailyIncomeUIReqVO { + private String searchMonth; + private Integer groupNo; + private Long householdSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java new file mode 100644 index 00000000..1e1b717e --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/DailyRecordMapper.java @@ -0,0 +1,37 @@ +package app.module.front.usecase.daily.record.persistence; + +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; +import app.module.front.usecase.daily.record.web.model.UpdateDailyRecordStatusCmd; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface DailyRecordMapper { + + DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO); + + /** + * 일계부 등록 여부 + * @param householdSeq + * @param recordMonth + * @param dayGroupNo + * @return + */ + Long getDailyRecordExistCount(@Param("householdSeq") Long householdSeq, @Param("recordMonth") String recordMonth, @Param("dayGroupNo") Integer dayGroupNo); + + /** + * 일계부 등록(생성) + * @param command + * @return + */ + Long createDailyRecord(CreateDailyRecordReqVO command); + + /** + * 일계부 상태 수정 + * @param command + * @return + */ + int updateDailyRecordStatus(UpdateDailyRecordStatusCmd command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java new file mode 100644 index 00000000..af272e83 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/DailyRecordDto.java @@ -0,0 +1,33 @@ +package app.module.front.usecase.daily.record.persistence.model; + +import lombok.Data; +import lombok.Setter; + +import java.time.LocalDate; + +@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 Integer groupNo; + private Integer startDay; + private Integer endDay; + + private Long id; + // TODO enum + private LocalDate startDate; + private LocalDate endDate; + private String allStatus; + private String incomeStatus; + + public boolean isUpdated() { + boolean returnValue = false; + if (id != null) { + returnValue = true; + } + return returnValue; + } + +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java new file mode 100644 index 00000000..a54397e5 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/persistence/model/UpdateDailyRecordDto.java @@ -0,0 +1,14 @@ +package app.module.front.usecase.daily.record.persistence.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class UpdateDailyRecordDto { + private String monthly; + private String updatedBy; + private String statusType; + private String statusCode; + +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java new file mode 100644 index 00000000..a8cbf9d0 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordService.java @@ -0,0 +1,11 @@ +package app.module.front.usecase.daily.record.service; + +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; + +public interface DailyRecordService { + DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO); + + void createDailyRecord(CreateDailyRecordReqVO command); +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java new file mode 100644 index 00000000..875cabe3 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/service/DailyRecordServiceImpl.java @@ -0,0 +1,72 @@ +package app.module.front.usecase.daily.record.service; + +import app.module.front.usecase.daily.record.persistence.DailyRecordMapper; +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; +import app.module.front.usecase.daily.record.web.model.DailyStatus; +import app.module.front.usecase.daily.record.web.model.DailyTargetStatus; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +import java.text.SimpleDateFormat; +import java.time.LocalDate; +import java.util.Date; +import java.util.Locale; + +@Slf4j +@Service +@RequiredArgsConstructor +public class DailyRecordServiceImpl implements DailyRecordService { + private final DailyRecordMapper dailyRecordMapper; + + @Override + public DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO) { + DailyRecordDto detail = dailyRecordMapper.getDailyRecord(reqVO); + if (detail != null && !detail.isUpdated()) { + try { + SimpleDateFormat beforeSdf = new SimpleDateFormat("yyyyMMdd", Locale.KOREAN); + SimpleDateFormat afterSdf = new SimpleDateFormat("yyyy-MM-dd", Locale.KOREAN); + + Date formatDate = beforeSdf.parse(reqVO.getSearchMonth() + String.format("%02d", detail.getStartDay())); + detail.setStartDate(LocalDate.parse(afterSdf.format(formatDate))); + + formatDate = beforeSdf.parse(reqVO.getSearchMonth() + String.format("%02d", detail.getEndDay())); + detail.setEndDate(LocalDate.parse(afterSdf.format(formatDate))); + + } catch (Exception e) { + log.warn("[DateParse] target={}", detail.getStartDay(), e); + } + } + return detail; + } + + @Override + public void createDailyRecord(CreateDailyRecordReqVO command) { + + if ("Y".equals(command.getTodayNone())) { + command.setAllStatus(DailyStatus.TODAY_NONE); + } else { + command.setAllStatus(DailyStatus.WAITING); + + if (command.getIncomeStatus() == null) { + command.setIncomeStatus(DailyTargetStatus.NONE); + } + if (command.getWorkStatus() == null) { + command.setWorkStatus(DailyTargetStatus.NONE); + } + if (command.getExpenseStatus() == null) { + command.setExpenseStatus(DailyTargetStatus.NONE); + } + if (command.getPowerStatus() == null) { + command.setPowerStatus(DailyTargetStatus.NONE); + } + if (command.getForestryStatus() == null) { + command.setForestryStatus(DailyTargetStatus.NONE); + } + } + + dailyRecordMapper.createDailyRecord(command); + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java new file mode 100644 index 00000000..19fda703 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/DailyRecordController.java @@ -0,0 +1,87 @@ +package app.module.front.usecase.daily.record.web; + +import app.module.front.usecase.daily.calendar.service.RecordCalendarService; +import app.module.front.usecase.daily.record.persistence.model.DailyRecordDto; +import app.module.front.usecase.daily.record.service.DailyRecordService; +import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; +import app.module.front.usecase.daily.record.web.model.DailyRecordUIReqVO; +import app.module.front.usecase.daily.record.web.validator.CreateDailyRecordValidator; +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.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.*; + +@Slf4j +@Controller +@RequiredArgsConstructor +@RequestMapping(path = "/record/daily") +public class DailyRecordController { + private final RecordCalendarService recordCalendarService; + private final DailyRecordService dailyRecordService; + private final CreateDailyRecordValidator createDailyRecordValidator;; + + @GetMapping(path = "/{searchMonth}/{groupNo}") + public String createForm(Model model + , @PathVariable(required = true) String searchMonth + , @PathVariable(required = true) String groupNo) { + + DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(); + reqVO.setSearchMonth(searchMonth); + reqVO.setGroupNo(Integer.parseInt(groupNo)); + reqVO.setHouseholdSeq(getAccessId()); + log.debug("reqVO: {}", reqVO); + + //uiCodeListPortIn.connect("code.pageable.rows"); + + DailyRecordDto detail = dailyRecordService.getDailyRecord(reqVO); + + model.addAttribute("reqVO", reqVO); + model.addAttribute("detail", detail); + + return "record/daily"; + } + + @PostMapping(path = "/{searchMonth}/{groupNo}") + ResponseEntity create(@PathVariable(required = true) String searchMonth + , @PathVariable(required = true) String groupNo + , @Valid @RequestBody CreateDailyRecordReqVO formVO, BindingResult bindingResult) { + + createDailyRecordValidator.validate(formVO, bindingResult); + if (bindingResult.hasErrors()) { + return ResponseEntity.status(HttpStatus.UNPROCESSABLE_ENTITY) + .body(bindingResult.getFieldErrors()); + } + + DailyRecordUIReqVO reqVO = new DailyRecordUIReqVO(); + reqVO.setSearchMonth(searchMonth); + reqVO.setGroupNo(Integer.parseInt(groupNo)); + reqVO.setHouseholdSeq(getAccessId()); + log.debug("reqVO: {}", reqVO); + + //uiCodeListPortIn.connect("code.pageable.rows"); + + DailyRecordDto detail = dailyRecordService.getDailyRecord(reqVO); + + formVO.setHouseholdSeq(reqVO.getHouseholdSeq()); + formVO.setRecordMonth(reqVO.getSearchMonth()); + formVO.setDayGroupNo(reqVO.getGroupNo()); + formVO.setStartDate(detail.getStartDate()); + formVO.setEndDate(detail.getEndDate()); + + log.debug("formVO: {}", formVO); + dailyRecordService.createDailyRecord(formVO); + log.debug("createDailyRecord: id-{}", formVO.getId()); + + return ResponseEntity.status(HttpStatus.OK).body(reqVO); + } + + // TODO : 로그인 SEQ + private Long getAccessId() { + return 2L; + } +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java new file mode 100644 index 00000000..1c57e7a9 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/CreateDailyRecordReqVO.java @@ -0,0 +1,29 @@ +package app.module.front.usecase.daily.record.web.model; + +import lombok.Data; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; +import java.util.Date; + +@Data +public class CreateDailyRecordReqVO { + private Long id; + private Long householdSeq; + private String recordMonth; + private int dayGroupNo; + private LocalDate startDate; + private LocalDate endDate; + // TODO : 전체 상태값 정의 ING, DONE + private String todayNone; + private DailyStatus allStatus; + // TODO : 개별 상태값 정의 WAITING, TYPING, TODAY_NONE, NONE, DONE + private DailyTargetStatus incomeStatus; + private DailyTargetStatus workStatus; + private DailyTargetStatus expenseStatus; + private DailyTargetStatus powerStatus; + private DailyTargetStatus forestryStatus; + // TODO : 무슨 데이터 넣을 것인가? + private String createdBy; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java new file mode 100644 index 00000000..3b35aaf4 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyRecordUIReqVO.java @@ -0,0 +1,12 @@ +package app.module.front.usecase.daily.record.web.model; + +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +public class DailyRecordUIReqVO { + private String searchMonth; + private Integer groupNo; + private Long householdSeq; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java new file mode 100644 index 00000000..6592e3ec --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyStatus.java @@ -0,0 +1,5 @@ +package app.module.front.usecase.daily.record.web.model; + +public enum DailyStatus { + WAITING, TODAY_NONE, DONE; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java new file mode 100644 index 00000000..0e186e60 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/DailyTargetStatus.java @@ -0,0 +1,5 @@ +package app.module.front.usecase.daily.record.web.model; + +public enum DailyTargetStatus { + WAITING, TODAY_NONE, NONE, DONE; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java b/front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java new file mode 100644 index 00000000..d50bdd85 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/model/UpdateDailyRecordStatusCmd.java @@ -0,0 +1,20 @@ +package app.module.front.usecase.daily.record.web.model; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class UpdateDailyRecordStatusCmd { + private Long id; + private Long householdSeq; + private String recordMonth; + private int dayGroupNo; + // TODO : 전체 상태값 정의 ING, DONE + private String allStatus; + // TODO : 개별 상태값 정의 WAITING, TYPING, TODAY_NONE, NONE, DONE + private String targetType; + private String targetStatus; + // TODO : 무슨 데이터 넣을 것인가? + private String updatedBy; +} diff --git a/front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java b/front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java new file mode 100644 index 00000000..3e0abe60 --- /dev/null +++ b/front/src/main/java/app/module/front/usecase/daily/record/web/validator/CreateDailyRecordValidator.java @@ -0,0 +1,50 @@ +package app.module.front.usecase.daily.record.web.validator; + +import app.module.core.config.application.util.MessageUtil; +import app.module.front.usecase.daily.record.web.model.CreateDailyRecordReqVO; +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 CreateDailyRecordValidator implements Validator { + private final MessageUtil messageUtil; + + @Override + public boolean supports(Class clazz) { + return CreateDailyRecordReqVO.class.equals(clazz); + } + + @Override + public void validate(Object target, Errors errors) { + CreateDailyRecordReqVO vo = (CreateDailyRecordReqVO) target; + + if (StringUtils.isBlank(vo.getTodayNone())) { + int noneCount = 0; + if (vo.getIncomeStatus() != null) { + noneCount++; + } + if (vo.getWorkStatus() != null) { + noneCount++; + } + if (vo.getExpenseStatus() != null) { + noneCount++; + } + if (vo.getPowerStatus() != null) { + noneCount++; + } + if (vo.getForestryStatus() != null) { + noneCount++; + } + + if (noneCount == 0) { + errors.rejectValue( + "incomeStatus", "valid.common.required", + messageUtil.getMessage("valid.common.required")); + } + } + } +} diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml new file mode 100644 index 00000000..3269dc17 --- /dev/null +++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -0,0 +1,73 @@ + + + + + + + + + + insert into daily_record ( + 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 + ) values ( + #{householdSeq} + , #{recordMonth}, #{dayGroupNo}, #{startDate}, #{endDate} + , #{allStatus}, #{incomeStatus}, #{workStatus}, #{expenseStatus}, #{powerStatus}, #{forestryStatus} + , now(), #{createdBy}, false + ) + + + + update daily_record set + updated_at = now() + , updated_by = #{updatedBy} + + , all_status = #{allStatus} + + + /* TODO 개별 상태값 변경 */ + + + , income_status = #{targetStatus} + + + + where is_deleted = false + and household_seq = #{householdSeq} + and record_month = #{recordMonth} + and day_group_no = #{dayGroupNo} + + + + /* TODO */ + inner join daily_record dr on + dr.id = ds.daily_record_seq + and dr.is_deleted = false + and dr.recordMonth = #{recordMonth} and dr.day_group_no = #{dayGroupNo} + and dr.household_seq = #{householdSeq} + + + diff --git a/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml new file mode 100644 index 00000000..d985da83 --- /dev/null +++ b/front/src/main/resources/mappers/daily/RecordCalendarMapper.xml @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + /* TODO */ + inner join daily_record dr on + dr.id = ds.daily_record_seq + and dr.is_deleted = false + and dr.recordMonth = #{recordMonth} and dr.day_group_no = #{dayGroupNo} + and dr.household_seq = #{householdSeq} + + + diff --git a/front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js b/front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js new file mode 100644 index 00000000..7f37b5d9 --- /dev/null +++ b/front/src/main/resources/static/library/jquery/jquery-3.7.1.min.js @@ -0,0 +1,2 @@ +/*! jQuery v3.7.1 | (c) OpenJS Foundation and other contributors | jquery.org/license */ +!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(ie,e){"use strict";var oe=[],r=Object.getPrototypeOf,ae=oe.slice,g=oe.flat?function(e){return oe.flat.call(e)}:function(e){return oe.concat.apply([],e)},s=oe.push,se=oe.indexOf,n={},i=n.toString,ue=n.hasOwnProperty,o=ue.toString,a=o.call(Object),le={},v=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType&&"function"!=typeof e.item},y=function(e){return null!=e&&e===e.window},C=ie.document,u={type:!0,src:!0,nonce:!0,noModule:!0};function m(e,t,n){var r,i,o=(n=n||C).createElement("script");if(o.text=e,t)for(r in u)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[i.call(e)]||"object":typeof e}var t="3.7.1",l=/HTML$/i,ce=function(e,t){return new ce.fn.init(e,t)};function c(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!v(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&0+~]|"+ge+")"+ge+"*"),x=new RegExp(ge+"|>"),j=new RegExp(g),A=new RegExp("^"+t+"$"),D={ID:new RegExp("^#("+t+")"),CLASS:new RegExp("^\\.("+t+")"),TAG:new RegExp("^("+t+"|[*])"),ATTR:new RegExp("^"+p),PSEUDO:new RegExp("^"+g),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+ge+"*(even|odd|(([+-]|)(\\d*)n|)"+ge+"*(?:([+-]|)"+ge+"*(\\d+)|))"+ge+"*\\)|)","i"),bool:new RegExp("^(?:"+f+")$","i"),needsContext:new RegExp("^"+ge+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+ge+"*((?:-\\d)?\\d*)"+ge+"*\\)|)(?=[^-]|$)","i")},N=/^(?:input|select|textarea|button)$/i,q=/^h\d$/i,L=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,H=/[+~]/,O=new RegExp("\\\\[\\da-fA-F]{1,6}"+ge+"?|\\\\([^\\r\\n\\f])","g"),P=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},M=function(){V()},R=J(function(e){return!0===e.disabled&&fe(e,"fieldset")},{dir:"parentNode",next:"legend"});try{k.apply(oe=ae.call(ye.childNodes),ye.childNodes),oe[ye.childNodes.length].nodeType}catch(e){k={apply:function(e,t){me.apply(e,ae.call(t))},call:function(e){me.apply(e,ae.call(arguments,1))}}}function I(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(V(e),e=e||T,C)){if(11!==p&&(u=L.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return k.call(n,a),n}else if(f&&(a=f.getElementById(i))&&I.contains(e,a)&&a.id===i)return k.call(n,a),n}else{if(u[2])return k.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&e.getElementsByClassName)return k.apply(n,e.getElementsByClassName(i)),n}if(!(h[t+" "]||d&&d.test(t))){if(c=t,f=e,1===p&&(x.test(t)||m.test(t))){(f=H.test(t)&&U(e.parentNode)||e)==e&&le.scope||((s=e.getAttribute("id"))?s=ce.escapeSelector(s):e.setAttribute("id",s=S)),o=(l=Y(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+Q(l[o]);c=l.join(",")}try{return k.apply(n,f.querySelectorAll(c)),n}catch(e){h(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return re(t.replace(ve,"$1"),e,n,r)}function W(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function F(e){return e[S]=!0,e}function $(e){var t=T.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function B(t){return function(e){return fe(e,"input")&&e.type===t}}function _(t){return function(e){return(fe(e,"input")||fe(e,"button"))&&e.type===t}}function z(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&R(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function X(a){return F(function(o){return o=+o,F(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function U(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}function V(e){var t,n=e?e.ownerDocument||e:ye;return n!=T&&9===n.nodeType&&n.documentElement&&(r=(T=n).documentElement,C=!ce.isXMLDoc(T),i=r.matches||r.webkitMatchesSelector||r.msMatchesSelector,r.msMatchesSelector&&ye!=T&&(t=T.defaultView)&&t.top!==t&&t.addEventListener("unload",M),le.getById=$(function(e){return r.appendChild(e).id=ce.expando,!T.getElementsByName||!T.getElementsByName(ce.expando).length}),le.disconnectedMatch=$(function(e){return i.call(e,"*")}),le.scope=$(function(){return T.querySelectorAll(":scope")}),le.cssHas=$(function(){try{return T.querySelector(":has(*,:jqfake)"),!1}catch(e){return!0}}),le.getById?(b.filter.ID=function(e){var t=e.replace(O,P);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(O,P);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&C){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):t.querySelectorAll(e)},b.find.CLASS=function(e,t){if("undefined"!=typeof t.getElementsByClassName&&C)return t.getElementsByClassName(e)},d=[],$(function(e){var t;r.appendChild(e).innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+ge+"*(?:value|"+f+")"),e.querySelectorAll("[id~="+S+"-]").length||d.push("~="),e.querySelectorAll("a#"+S+"+*").length||d.push(".#.+[+~]"),e.querySelectorAll(":checked").length||d.push(":checked"),(t=T.createElement("input")).setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),r.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&d.push(":enabled",":disabled"),(t=T.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||d.push("\\["+ge+"*name"+ge+"*="+ge+"*(?:''|\"\")")}),le.cssHas||d.push(":has"),d=d.length&&new RegExp(d.join("|")),l=function(e,t){if(e===t)return a=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!le.sortDetached&&t.compareDocumentPosition(e)===n?e===T||e.ownerDocument==ye&&I.contains(ye,e)?-1:t===T||t.ownerDocument==ye&&I.contains(ye,t)?1:o?se.call(o,e)-se.call(o,t):0:4&n?-1:1)}),T}for(e in I.matches=function(e,t){return I(e,null,null,t)},I.matchesSelector=function(e,t){if(V(e),C&&!h[t+" "]&&(!d||!d.test(t)))try{var n=i.call(e,t);if(n||le.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){h(t,!0)}return 0":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(O,P),e[3]=(e[3]||e[4]||e[5]||"").replace(O,P),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||I.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&I.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return D.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&j.test(n)&&(t=Y(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(O,P).toLowerCase();return"*"===e?function(){return!0}:function(e){return fe(e,t)}},CLASS:function(e){var t=s[e+" "];return t||(t=new RegExp("(^|"+ge+")"+e+"("+ge+"|$)"))&&s(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=I.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function T(e,n,r){return v(n)?ce.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?ce.grep(e,function(e){return e===n!==r}):"string"!=typeof n?ce.grep(e,function(e){return-1)[^>]*|#([\w-]+))$/;(ce.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||k,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:S.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof ce?t[0]:t,ce.merge(this,ce.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:C,!0)),w.test(r[1])&&ce.isPlainObject(t))for(r in t)v(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=C.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):v(e)?void 0!==n.ready?n.ready(e):e(ce):ce.makeArray(e,this)}).prototype=ce.fn,k=ce(C);var E=/^(?:parents|prev(?:Until|All))/,j={children:!0,contents:!0,next:!0,prev:!0};function A(e,t){while((e=e[t])&&1!==e.nodeType);return e}ce.fn.extend({has:function(e){var t=ce(e,this),n=t.length;return this.filter(function(){for(var e=0;e\x20\t\r\n\f]*)/i,Ce=/^$|^module$|\/(?:java|ecma)script/i;xe=C.createDocumentFragment().appendChild(C.createElement("div")),(be=C.createElement("input")).setAttribute("type","radio"),be.setAttribute("checked","checked"),be.setAttribute("name","t"),xe.appendChild(be),le.checkClone=xe.cloneNode(!0).cloneNode(!0).lastChild.checked,xe.innerHTML="",le.noCloneChecked=!!xe.cloneNode(!0).lastChild.defaultValue,xe.innerHTML="",le.option=!!xe.lastChild;var ke={thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};function Se(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&fe(e,t)?ce.merge([e],n):n}function Ee(e,t){for(var n=0,r=e.length;n",""]);var je=/<|&#?\w+;/;function Ae(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d\s*$/g;function Re(e,t){return fe(e,"table")&&fe(11!==t.nodeType?t:t.firstChild,"tr")&&ce(e).children("tbody")[0]||e}function Ie(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function We(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Fe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(_.hasData(e)&&(s=_.get(e).events))for(i in _.remove(t,"handle events"),s)for(n=0,r=s[i].length;n").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),C.head.appendChild(r[0])},abort:function(){i&&i()}}});var Jt,Kt=[],Zt=/(=)\?(?=&|$)|\?\?/;ce.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Kt.pop()||ce.expando+"_"+jt.guid++;return this[e]=!0,e}}),ce.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Zt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Zt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=v(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Zt,"$1"+r):!1!==e.jsonp&&(e.url+=(At.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||ce.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=ie[r],ie[r]=function(){o=arguments},n.always(function(){void 0===i?ce(ie).removeProp(r):ie[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Kt.push(r)),o&&v(i)&&i(o[0]),o=i=void 0}),"script"}),le.createHTMLDocument=((Jt=C.implementation.createHTMLDocument("").body).innerHTML="
",2===Jt.childNodes.length),ce.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(le.createHTMLDocument?((r=(t=C.implementation.createHTMLDocument("")).createElement("base")).href=C.location.href,t.head.appendChild(r)):t=C),o=!n&&[],(i=w.exec(e))?[t.createElement(i[1])]:(i=Ae([e],t,o),o&&o.length&&ce(o).remove(),ce.merge([],i.childNodes)));var r,i,o},ce.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1").append(ce.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},ce.expr.pseudos.animated=function(t){return ce.grep(ce.timers,function(e){return t===e.elem}).length},ce.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=ce.css(e,"position"),c=ce(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=ce.css(e,"top"),u=ce.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),v(t)&&(t=t.call(e,n,ce.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):c.css(f)}},ce.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){ce.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===ce.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===ce.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=ce(e).offset()).top+=ce.css(e,"borderTopWidth",!0),i.left+=ce.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-ce.css(r,"marginTop",!0),left:t.left-i.left-ce.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===ce.css(e,"position"))e=e.offsetParent;return e||J})}}),ce.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;ce.fn[t]=function(e){return M(this,function(e,t,n){var r;if(y(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),ce.each(["top","left"],function(e,n){ce.cssHooks[n]=Ye(le.pixelPosition,function(e,t){if(t)return t=Ge(e,n),_e.test(t)?ce(e).position()[n]+"px":t})}),ce.each({Height:"height",Width:"width"},function(a,s){ce.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){ce.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return M(this,function(e,t,n){var r;return y(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?ce.css(e,t,i):ce.style(e,t,n,i)},s,n?e:void 0,n)}})}),ce.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){ce.fn[t]=function(e){return this.on(t,e)}}),ce.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.on("mouseenter",e).on("mouseleave",t||e)}}),ce.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){ce.fn[n]=function(e,t){return 0 { + // TODO : form id? or body + let target = $('body').find('[name=' + oj.field + ']'); + target.addClass('is-invalid'); + + target.parent().find('.invalid-feedback').text(oj.defaultMessage); + }); + }, + 500:function(rstData){ + ajaxUtil._hideWaiting(); + if (rstData.responseText != '') { + let resultJSON = ajaxUtil._jsonParse(rstData.responseText); + if (rstData.responseJSON != undefined) { + resultJSON = rstData.responseJSON; + } + + if (resultJSON.code == 1064) { + ajaxUtil._alert(resultJSON.message, '확인'); + } else if (typeof errorCallback !== 'undefined') { + errorCallback(ajaxUtil.$500, rstData); + } + } else if (typeof errorCallback !== 'undefined') { + errorCallback(ajaxUtil.$500, rstData); + } + } + }, + success : function(rstData, status) { + ajaxUtil._hideWaiting(); + if (typeof successCallback !== 'undefined') { + successCallback(rstData, status); + } + }, + error : function(rstData) { + ajaxUtil._hideWaiting(); + if (!(rstData.status == 500 || rstData.status == 422)) { + if (typeof errorCallback !== 'undefined') { + errorCallback(rstData.status, rstData); + } else { + ajaxUtil._alertError(ajaxUtil._msg500); + } + } + }, + complete : function(xhr, status, err) { + ajaxUtil._hideWaiting(); + if (typeof ENV != 'undefined' && typeof ENV.submitted == 'boolean') { + ENV.submitted = false; + } + if (typeof commentENV != 'undefined' && typeof commentENV.submitted == 'boolean') { + commentENV.submitted = false; + } + }, + }); + }, + + + _jsonParse : function parse(jsonStr) { + try { + var jsonObj = JSON.parse(jsonStr); + // chamobile.logger.debug(jsonObj); + return jsonObj; + } catch (error) { + console.error("Invalid JSON string:", error); + } + return null; + }, + _jsonStringify : function stringify(obj) { + try { + var jsonStr = JSON.stringify(obj); + // chamobile.logger.debug(jsonStr); + return jsonStr; + } catch (error) { + console.error("Error stringifying object:", error); + } + return null; + }, + + + _goToMain:function() { + location.href = '/'; + }, + _hideWaiting:function(){ + if (ajaxUtil.loadingStatus) { + ajaxUtil.loadingStatus = false; + // TODO : 로딩바 숨김 + } + }, + _showWaiting:function(){ + ajaxUtil.loadingStatus = true; + // TODO : 로딩바 활성화 + }, +}; \ No newline at end of file diff --git a/front/src/main/resources/static/ui/commonUtil.js b/front/src/main/resources/static/ui/commonUtil.js new file mode 100644 index 00000000..c4cc1ccc --- /dev/null +++ b/front/src/main/resources/static/ui/commonUtil.js @@ -0,0 +1,33 @@ + + +var research = {}; +research.json = new Object(); +research.logger = new Object(); + +/* research.logger */ +/** + * client 오류성 로그 기록용 로거, 로그 레벨에 따라 표시 + * @param message + * @param el + */ +research.logger.debug = function(message, el){ + var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : ''); + console.log("[DEBUG] caller : " + callee + " / message : " + message, el); +}; + +research.logger.error = function(message, el){ + var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : ''); + console.error("[ERROR] caller : " + callee + " / message : " + message, el); +}; + +research.logger.info = function(message){ + var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : ''); + console.info("[INFO] caller : " + callee + " / message : " + message); +}; + +research.logger.warn = function(message){ + var callee = arguments.callee.caller == '' ? arguments.callee.caller.arguments.callee.name : (arguments.callee.caller ? arguments.callee.caller.name : ''); + console.warn("[WARN] caller : " + callee + " / message : " + message); +}; + + diff --git a/front/src/main/resources/static/ui/page/daily-record.js b/front/src/main/resources/static/ui/page/daily-record.js new file mode 100644 index 00000000..6f53e9bc --- /dev/null +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -0,0 +1,30 @@ +var page = {}; +page.daily = new Object(); + +page.daily.httpUrl = { + root: '/record/calendar', + daily: '/record/daily/{searchMonth}/{groupNo}', + income: '/record/income/{searchMonth}/{groupNo}', + work: '/record/work/{searchMonth}/{groupNo}', + expense: '/record/expense/{searchMonth}/{groupNo}', + power: '/record/power/{searchMonth}/{groupNo}', + forestry: '/record/forestry/{searchMonth}/{groupNo}', +} + +page.daily.goToMain = function() { + location.href = page.daily.httpUrl.root; +} + +page.daily.goToNext = function(target, searchMonth, groupNo) { + let url = page.daily.httpUrl.root; + + // TODO URL + if (target == 'income') { + url = page.daily.httpUrl.income; + } else if (target == 'work') { + url = page.daily.httpUrl.work; + } + + console.log(url.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo)); + //location.href = url.replace('{searchMonth}', searchMonth).replace('{groupNo}', groupNo); +} \ No newline at end of file diff --git a/front/src/main/resources/templates/common/components.html b/front/src/main/resources/templates/common/components.html index 8ad940b4..ea541474 100644 --- a/front/src/main/resources/templates/common/components.html +++ b/front/src/main/resources/templates/common/components.html @@ -25,10 +25,12 @@ - + + + diff --git a/front/src/main/resources/templates/layout/layout.html b/front/src/main/resources/templates/layout/layout.html index 2906b1f3..5b87ca3b 100644 --- a/front/src/main/resources/templates/layout/layout.html +++ b/front/src/main/resources/templates/layout/layout.html @@ -16,6 +16,8 @@ +
+
diff --git a/front/src/main/resources/templates/record/calendar-wrap.html b/front/src/main/resources/templates/record/calendar-wrap.html new file mode 100644 index 00000000..c981edb8 --- /dev/null +++ b/front/src/main/resources/templates/record/calendar-wrap.html @@ -0,0 +1,33 @@ + + + +
+
+ reqVO: [[${reqVO}]] +
+
+ + [[${#temporals.format(detail.startDate, 'yyyy년 MM월 dd일')}]] ~ [[${#temporals.format(detail.endDate, 'yyyy년 MM월 dd일')}]]
+ + 수입 : [[${detail.incomeStatus}]], [[${detail.incomeCount}]] + 수정 +
+ +

+ detail: [[${detail}]] +
+ + + + [[${#temporals.format(searchDate, 'yyyy년 MM월 dd일')}]] + +
+ + +
+
+ +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/calendar.html b/front/src/main/resources/templates/record/calendar.html new file mode 100644 index 00000000..b89be442 --- /dev/null +++ b/front/src/main/resources/templates/record/calendar.html @@ -0,0 +1,74 @@ + + + +
+

calendar

+
+ reqVO: [[${reqVO}]] +
+
+ + + + No=[[${calendar.groupNo}]], Start=[[${calendar.startDay}]], End=[[${calendar.endDay}]], StartDate=[[${calendar.startDate}]], Id=[[${calendar.dailyId}]]
+
+
+ + + No=[[${calendar.groupNo}]], Start=[[${calendar.startDay}]], End=[[${calendar.endDay}]], StartDate=[[${calendar.startDate}]]
+
+
+
+
+ +
+ +
+ +
+ +
+ +
+ + +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily.html new file mode 100644 index 00000000..2bf28cc2 --- /dev/null +++ b/front/src/main/resources/templates/record/daily.html @@ -0,0 +1,94 @@ + + + +
+

daily Form

+
+ reqVO: [[${reqVO}]] +
+
+ [[${#temporals.format(detail.startDate, 'yyyy년 MM월 dd일')}]] ~ [[${#temporals.format(detail.endDate, 'yyyy년 MM월 dd일')}]]
+ + + +
+ + +
+
+ 수입 내역 +
+ 에러 메세지 +
+
+ + +
+
+ 노동 내역 +
+ 에러 메세지 +
+
+ +
+ + + + 수정 + + + + + +

+ detail: [[${detail}]] +
+ +
+ +
+ +
+ + +
+ + \ No newline at end of file diff --git a/front/src/main/resources/templates/record/income/index.html b/front/src/main/resources/templates/record/income/index.html new file mode 100644 index 00000000..c8a16ec1 --- /dev/null +++ b/front/src/main/resources/templates/record/income/index.html @@ -0,0 +1,35 @@ + + + +
+

daily Form

+
+ reqVO: [[${reqVO}]] +
+
+

+ detail: [[${detail}]] +
+ +
+ +
+ +
+ + +
+ + \ No newline at end of file