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 index ad14e383..dc05c233 100644 --- 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 @@ -12,7 +12,7 @@ public interface DailyRecordMapper { DailyRecordDto getDailyRecord(DailyRecordUIReqVO reqVO); /** - * 일계부 등록 여부 + * 일계부 항목 등록 여부 * * @param reqVO * @return @@ -20,14 +20,21 @@ public interface DailyRecordMapper { Integer getDailyRecordExistCount(DailyRecordUIReqVO reqVO); /** - * 일계부 등록(생성) + * 일계부 항목 등록(생성) * * @param command */ void createDailyRecord(CreateDailyRecordCmd command); /** - * 일계부 상태 수정 + * 일계부 항목 수정 + * + * @param command + */ + void updateDailyRecord(CreateDailyRecordCmd command); + + /** + * 일계부 항목의 상태 수정 * * @param command * @return 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 index d9cf1622..c47dd355 100644 --- 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 @@ -66,6 +66,9 @@ public class DailyRecordServiceImpl implements DailyRecordService { log.debug("[CreateDailyRecord] record={}", command); } else { + // TODO : NONE 으로 변경시 연관 테이블 데이터 삭제할 것인가? + dailyRecordMapper.updateDailyRecord(command); + log.warn("[DailyRecordCreate] existCount={}, recordMonth={}, dayGroupNo={}", existCount, reqVO.getRecordMonth(), reqVO.getDayGroupNo()); } } diff --git a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml index 2ddc15f7..cd724557 100644 --- a/front/src/main/resources/mappers/daily/DailyRecordMapper.xml +++ b/front/src/main/resources/mappers/daily/DailyRecordMapper.xml @@ -40,6 +40,21 @@ ) + + update daily_record set + , all_status = #{allStatus} + , income_status = #{incomeStatus} + , work_status = #{workStatus} + , expense_status = #{expenseStatus} + , power_status = #{powerStatus} + , forestry_status = #{forestryStatus} + , farming_status = #{farmingStatus} + where is_deleted = false + and record_month = #{recordMonth} + and day_group_no = #{dayGroupNo} + and household_seq = #{householdSeq} + + update daily_record set 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 454999f6..b44283ae 100644 --- a/front/src/main/resources/static/ui/page/daily-record.js +++ b/front/src/main/resources/static/ui/page/daily-record.js @@ -25,14 +25,18 @@ krip.daily.goToPrev = function(target, searchMonth, groupNo) { console.log(url); } +krip.daily.goToPrev = function() { + // TODO : history.back 으로 해결 되는가? + history.back(); +} + krip.daily.goToNext = function(target, searchMonth, groupNo) { let url = krip.daily.httpUrl.target; url = url.replace('{month}', searchMonth); url = url.replace('{groupNo}', groupNo); url = url.replace('{target}', target); - console.log(url); - //location.href = url; + location.href = url; }; /** diff --git a/front/src/main/resources/templates/record/daily.html b/front/src/main/resources/templates/record/daily.html index fd93ecfb..cbca705f 100644 --- a/front/src/main/resources/templates/record/daily.html +++ b/front/src/main/resources/templates/record/daily.html @@ -32,7 +32,8 @@