Merge branch 'susu' into dev

This commit is contained in:
주수현
2025-07-23 19:24:33 +09:00
8 changed files with 39 additions and 32 deletions

View File

@@ -50,8 +50,8 @@ public class RecordCalendarDao implements RecordCalendarPortOut {
monthlyStatus.isForestNone() ? "/info/monthly" : String.format("/info/monthly/month/%s", command.getSearchMonth())));
YearMonth yearMonth = YearMonth.parse(command.getSearchMonth(), DateTimeFormatter.ofPattern("yyyyMM"));
//LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE); TODO 이걸로 돌려야됨.
LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth();
LocalDate maxMonth = DailyRecordConstants.MODIFY_LIMIT_DATE == 31 ?
yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth() : yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
boolean editable = !LocalDate.now().isAfter(maxMonth);
monthlyList.add(new CalendarChildren(

View File

@@ -83,14 +83,16 @@ class GetBankInputUIController {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter);
// TODO 이걸로 수정해야됨
// LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
// LocalDate minMonth = yearMonth.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth();
LocalDate minMonth = yearMonth.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth();
LocalDate maxMonth = DailyRecordConstants.MODIFY_LIMIT_DATE == 31 ?
yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth() : yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate minMonth = DailyRecordConstants.MODIFY_LIMIT_DATE == 31 ?
yearMonth.minusMonths(1).plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth() : yearMonth.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate today = LocalDate.now();
boolean editable = !today.isAfter(maxMonth);
boolean preEditable = !today.isBefore(minMonth);
boolean preEditable = !today.isAfter(minMonth);
model.addAttribute("pastMonthlyInfo", pastMonthlyInfo);
model.addAttribute("currentMonthlyInfo", currentMonthlyInfo);

View File

@@ -82,16 +82,15 @@ class GetBankOutputUIController {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter);
// TODO 이걸로 수정해야됨
// LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
// LocalDate minMonth = yearMonth.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth();
LocalDate minMonth = yearMonth.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth();
LocalDate maxMonth = DailyRecordConstants.MODIFY_LIMIT_DATE == 31 ?
yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth() : yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate minMonth = DailyRecordConstants.MODIFY_LIMIT_DATE == 31 ?
yearMonth.minusMonths(1).plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth() : yearMonth.minusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate today = LocalDate.now();
boolean editable = !today.isAfter(maxMonth);
boolean preEditable = !today.isBefore(minMonth);
boolean preEditable = !today.isAfter(minMonth);
model.addAttribute("pastMonthlyInfo", pastMonthlyInfo);
model.addAttribute("currentMonthlyInfo", currentMonthlyInfo);

View File

@@ -118,9 +118,9 @@ class CreateMonthlyUIController {
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMM");
YearMonth yearMonth = YearMonth.parse(currentMonthlyInfo.getMonth(), formatter);
//LocalDate maxMonth = yearMonth.plusMonths(1).atDay(15);
// TODO 이걸로 돌려야됨
//LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate maxMonth = yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth();
LocalDate maxMonth = DailyRecordConstants.MODIFY_LIMIT_DATE == 31 ?
yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atEndOfMonth() : yearMonth.plusMonths(DailyRecordConstants.MODIFY_LIMIT_MONTH).atDay(DailyRecordConstants.MODIFY_LIMIT_DATE);
LocalDate today = LocalDate.now();
boolean editable = !today.isAfter(maxMonth);

View File

@@ -51,6 +51,7 @@
<when test="order.property eq 'updatedAt'">a.updated_at</when>
<when test="order.property eq 'createdBy'">a.created_by</when>
<when test="order.property eq 'createdAt'">a.created_at</when>
<when test="order.property eq 'month'">a.month</when>
<otherwise>a.id</otherwise>
</choose>
<choose>
@@ -58,6 +59,7 @@
<otherwise>ASC</otherwise>
</choose>
</foreach>
OFFSET #{pageable.offset} ROWS FETCH NEXT #{pageable.pageSize} ROWS ONLY
</if>
</select>

View File

@@ -20,7 +20,6 @@
a.updated_by AS updatedBy
FROM monthly_input_status a
WHERE a.is_deleted = false
AND a.forest_product_status != 'NONE'
AND a.household_seq = #{householdSeq}
AND a.month = (
SELECT TO_CHAR(TO_DATE(month, 'YYYYMM') - INTERVAL '1 month', 'YYYYMM')

View File

@@ -123,6 +123,7 @@
currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferInputStatus}]]*/'',
pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferInputStatus}]]*/'',
pastBankId: /*[[${pastMonthlyInfo?.id}]]*/'',
pastMonth: /*[[${pastMonthlyInfo?.month}]]*/'',
editable: /*[[${editable}]]*/,
preEditable: /*[[${preEditable}]]*/,
},
@@ -207,29 +208,31 @@
if( ENV.data.pastBankList.length === 0) {
callPastInfoBtn.disabled = true;
if (ENV.data.preEditable && ENV.data.pastBankList.length === 0 && ENV.data.currentMonth >= "202508") {
//if (ENV.data.preEditable && ENV.data.pastBankList.length === 0 && ENV.data.currentMonth >= "202508") {
if (ENV.data.preEditable && ENV.data.pastBankList.length === 0 ) {
const handlePageShow = function (event) {
if ('sessionStorage' in window && window['sessionStorage'] !== null) {
// history.back으로 돌아온 경우 (navigation.type == 2)
console.log("window.performance.navigation.type ",window.performance.navigation.type );
if (event.persisted || (window.performance && window.performance.navigation.type === 2)) {
sessionStorage.removeItem('pastInputAlertShown'); // 플래그 제거
return; // 알림창 표시하지 않음
}
// 페이지가 처음 로드되었거나 새로고침된 경우 (navigation.type == 0 또는 1)
if (event.persisted || (window.performance && window.performance.navigation.type <= 1)) {
} else if (event.persisted || (window.performance && window.performance.navigation.type <= 1)) {
// 페이지가 처음 로드되었거나 새로고침된 경우 (navigation.type == 0 또는 1)
kri.isReturn = true;
const hasShownAlert = sessionStorage.getItem('pastInputAlertShown');
if (!hasShownAlert && ENV.data.pastBankList.length === 0) {
if (hasShownAlert !== ENV.data.currentMonth && hasShownAlert !== ENV.data.pastMonth && ENV.data.pastBankList.length === 0) {
etUI.dialog.alert({
title: '지난달 정보 등록하기',
message: '지난달 정보를 아직 입력하지 않으셨네요.\n정확한 조사를 위해 지난달 정보를 입력해주세요.\n\n확인 버튼을 누르시면 지난달 은행자동이체 내역등록으로 이동합니다.',
type: 'alert',
callback: function () {
sessionStorage.setItem('pastInputAlertShown', 'true');
sessionStorage.setItem('pastInputAlertShown', ENV.data.pastMonth);
location.href = ENV.httpUrl.preMonth + "/" + ENV.data.pastBankId;
},
});
} else if(hasShownAlert === ENV.data.pastMonth) {
sessionStorage.removeItem('pastInputAlertShown');
}
}
}

View File

@@ -123,6 +123,7 @@
currentStatus: /*[[${currentMonthlyInfo.bankAutoTransferOutputStatus}]]*/'',
pastStatus: /*[[${pastMonthlyInfo?.bankAutoTransferOutputStatus}]]*/'',
pastBankId: /*[[${pastMonthlyInfo?.id}]]*/'',
pastMonth: /*[[${pastMonthlyInfo?.month}]]*/'',
editable: /*[[${editable}]]*/,
preEditable: /*[[${preEditable}]]*/,
},
@@ -205,7 +206,8 @@
if (ENV.data.editable) {
if (ENV.data.preEditable && ENV.data.pastBankList.length === 0 && ENV.data.currentMonth >= "202508") {
//if (ENV.data.preEditable && ENV.data.pastBankList.length === 0 && ENV.data.currentMonth >= "202508") {
if (ENV.data.preEditable && ENV.data.pastBankList.length === 0) {
callPastInfoBtn.disabled = true;
const handlePageShow = function(event) {
@@ -214,23 +216,23 @@
if (event.persisted || (window.performance && window.performance.navigation.type === 2)) {
sessionStorage.removeItem('pastOutputAlertShown'); // 플래그 제거
return; // 알림창 표시하지 않음
}
// 페이지가 처음 로드되었거나 새로고침된 경우 (navigation.type == 0 또는 1)
if (event.persisted || (window.performance && window.performance.navigation.type <= 1)) {
}else if (event.persisted || (window.performance && window.performance.navigation.type <= 1)) {
// 페이지가 처음 로드되었거나 새로고침된 경우 (navigation.type == 0 또는 1)
kri.isReturn = true;
const hasShownAlert = sessionStorage.getItem('pastOutputAlertShown');
if (!hasShownAlert && ENV.data.pastBankList.length === 0) {
if (hasShownAlert !== ENV.data.currentMonth && hasShownAlert !== ENV.data.pastMonth && ENV.data.pastBankList.length === 0) {
callPastInfoBtn.disabled = true;
etUI.dialog.alert({
title: '지난달 정보 등록하기',
message: '지난달 정보를 아직 입력하지 않으셨네요.\n정확한 조사를 위해 지난달 정보를 입력해주세요.\n\n확인 버튼을 누르시면 지난달 은행자동이체 내역등록으로 이동합니다.',
type: 'alert',
callback: function() {
sessionStorage.setItem('pastOutputAlertShown', 'true');
sessionStorage.setItem('pastOutputAlertShown', ENV.data.pastMonth);
location.href = ENV.httpUrl.preMonth + "/" + ENV.data.pastBankId;
},
});
} else if (hasShownAlert === ENV.data.pastMonth) {
sessionStorage.removeItem('pastOutputAlertShown');
}
}
}