Merge branch 'dev' into first_open_fetch

# Conflicts:
#	README.md
#	admin/src/main/resources/mappers/researcher/ResearcherMapper.xml
#	core/src/main/java/app/module/core/usecase/file/updateFile/adapters/persistence/UpdateFileDao.java
This commit is contained in:
주수현
2025-07-30 14:43:33 +09:00
165 changed files with 3274 additions and 6153 deletions

View File

@@ -54,11 +54,10 @@ class CreateBankInputController {
if(currentMonthlyInfo!=null) {
//TODO 트렌젝션 고려
// 트렌젝션 고려
removeBanksPortIn.operate(new RemoveBanksCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq(), reqVO.getTransferType()));
// if (!reqVO.getStatus() && reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님.
if (reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) { // 등록없음 처리가 아님.
if (reqVO.getBankList() != null && !reqVO.getBankList().isEmpty()) {
for (CreateBankInputProductReqVO item : reqVO.getBankList()) {
UICodeView code = uiCodeViewPortIn.connect(item.getTransferCategoryCode()).orElse(null);

View File

@@ -47,10 +47,10 @@ class CreateMonthlyController {
if(currentMonthlyInfo!=null) {
//TODO 트렌젝션 고려
// 트렌젝션 고려
removeMonthForestProductsPortIn.operate(new RemoveMonthForestProductsCmd(currentMonthlyInfo.getId(), AuthUtil.getUserSeq()));
if (!reqVO.getStatus() && reqVO.getProductList() != null && !reqVO.getProductList().isEmpty()) { // 등록없음 처리가 아님.
if (!reqVO.getStatus() && reqVO.getProductList() != null && !reqVO.getProductList().isEmpty()) {
for (CreateMonthlyProductReqVO item : reqVO.getProductList()) {
createForestProductPortIn.operate(new CreateForestProductCmd(
AuthUtil.getUserSeq(),

View File

@@ -1,6 +1,7 @@
package app.module.front.usecase.info.notice.getNotice.ports.application.domain;
import app.module.core.config.application.enums.FileUploadType;
import app.module.core.usecase.file.model.UploadFile;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -9,7 +10,7 @@ import java.io.Serializable;
import java.time.LocalDateTime;
/**
* DTO for {@link app.module.core.config.adapters.persistence.entity.UploadFile}
* DTO for {@link UploadFile}
*/
@Data
@AllArgsConstructor

View File

@@ -362,7 +362,7 @@ function checkServerDataChildren(array, targetValue) {
const data = etUI.utils.getServerDataChildren(array, targetValue);
// children이 null이면 false, 아니면 길이가 1 이상인지 확인
return data && data.children !== null && data.children.length >= 1;
return data && Array.isArray(data.children) && data.children.length >= 1;
}
;

View File

@@ -164,11 +164,6 @@ var ajaxUtil = {
},
422:function(rstData, status) {
console.log('422', rstData)
/**
* TODO
* 폼이 너무 여러가지 형식이 있는데 서버에러를 가지고 처리하는게 맞는지 검토 필요
* 코드 정리는 나중에 하려고 그냥 만듬.... 정리 필요.
*/
let isResetDone = false;
@@ -322,13 +317,13 @@ var ajaxUtil = {
_hideWaiting:function(){
if (ajaxUtil.loadingStatus) {
ajaxUtil.loadingStatus = false;
// TODO : 로딩바 숨김
// 로딩바 숨김
document.querySelector('#loadingBar').style.display = 'none';
}
},
_showWaiting:function(){
ajaxUtil.loadingStatus = true;
// TODO : 로딩바 활성화
// 로딩바 활성화
document.querySelector('#loadingBar').style.display = 'block';
},
};

View File

@@ -36,14 +36,6 @@
<span class="btn-txt">이전 정보 불러오기</span>
</button>
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
<!-- <div class="component-input align-center" id="forestProductStatusDiv">-->
<!-- <label class="checkbox-inner">-->
<!-- <input type="checkbox" id="forestProductStatus" name="forestProductStatus"-->
<!-- th:value="${MonthStatus.NOTHING}" onchange="formControl.handleNoDataToggle()">-->
<!-- <span class="checkbox-item"><span class="checkbox-txt">이번달 등록내용 없음</span></span>-->
<!-- </label>-->
<!-- </div>-->
</section>
@@ -195,9 +187,6 @@
//이전 데이터 취득 버튼
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
//데이터 없음 버튼
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const forestProductStatus = document.getElementById("forestProductStatus");
//등록 완료 버튼
const next = document.getElementById('complateBtn');
@@ -247,17 +236,6 @@
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
this.checkUsePastData();
}
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// }
// else if (ENV.data.currentStatus == "NOTHING") {
//
//
// addItemBtn.disabled = true;
// icon.classList.toggle("ico-add", false);
// icon.classList.toggle("ico-add-disabled", true);
// callPastInfoBtn.disabled = true;
// forestProductStatus.checked = true;
// next.disabled = true;
} else if (ENV.data.currentStatus == "REGISTERED") {
if (ENV.data.bankList.length > 0) {
@@ -364,12 +342,6 @@
},
updateLayout() {
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const btn = document.getElementById("addItemBtn");
// const isChecked = ENV.elementRefs.noDataCheckbox.checked;
// const icon = btn.querySelector("i");
// const status = document.getElementById('forestProductStatusDiv');
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
const next = document.getElementById('complateBtn');
@@ -385,10 +357,6 @@
count.textContent = total;
totalItems.textContent = total;
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// btn.disabled = isData;
// icon.classList.toggle("ico-add", !isData);
// icon.classList.toggle("ico-add-disabled", isData);
if (isData) {
next.disabled = !isData;
} else {

View File

@@ -36,15 +36,6 @@
<span class="btn-txt">이전 정보 불러오기</span>
</button>
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
<!-- <div class="component-input align-center" id="forestProductStatusDiv">-->
<!-- <label class="checkbox-inner">-->
<!-- <input type="checkbox" id="forestProductStatus" name="forestProductStatus"-->
<!-- th:value="${MonthStatus.NOTHING}" onchange="formControl.handleNoDataToggle()">-->
<!-- <span class="checkbox-item"><span class="checkbox-txt">이번달 등록내용 없음</span></span>-->
<!-- </label>-->
<!-- </div>-->
</section>
</div>
@@ -194,10 +185,6 @@
//이전 데이터 취득 버튼
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
//데이터 없음 버튼
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const forestProductStatus = document.getElementById("forestProductStatus");
//등록 완료 버튼
const next = document.getElementById('complateBtn');
@@ -246,16 +233,6 @@
if (ENV.data.pastStatus && ENV.data.pastStatus == "REGISTERED" && ENV.data.pastBankList.length > 0) {
this.checkUsePastData();
}
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// } else if (ENV.data.currentStatus == "NOTHING") {
//
//
// addItemBtn.disabled = true;
// icon.classList.toggle("ico-add", false);
// icon.classList.toggle("ico-add-disabled", true);
// callPastInfoBtn.disabled = true;
// forestProductStatus.checked = true;
// next.disabled = true;
} else if (ENV.data.currentStatus == "REGISTERED") {
if (ENV.data.bankList.length > 0) {
@@ -354,12 +331,6 @@
},
updateLayout() {
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// const isChecked = ENV.elementRefs.noDataCheckbox.checked;
// const btn = document.getElementById("addItemBtn");
// const icon = btn.querySelector("i");
// const status = document.getElementById('forestProductStatusDiv');
const callPastInfoBtn = document.getElementById("callPastInfoBtn");
const next = document.getElementById('complateBtn');
@@ -376,10 +347,6 @@
count.textContent = total;
totalItems.textContent = total;
<!-- TODO(ks) : "이번달 등록내용 없음" 삭제 확정 시 주석 지우기 -->
// btn.disabled = isData;
// icon.classList.toggle("ico-add", !isData);
// icon.classList.toggle("ico-add-disabled", isData);
if (isData) {
next.disabled = !isData;
} else {

View File

@@ -36,7 +36,7 @@
<div class="inner">
<dl class="info-card">
<dt class="name" th:text="${userInfo?.ownerName}"></dt>
<dd class="location" th:text="${userInfo?.address}"></dd><!-- TODO 임가 주소 위치 임시로 . 처리함. -->
<dd class="location" th:text="${userInfo?.address}"></dd>
<dd class="date" th:if="${not #strings.isEmpty(dailyLatest)}">
최근등록 : <span th:text="${dailyLatest}"></span></dd>
<dd class="date" th:if="${#strings.isEmpty(dailyLatest)}">등록된 일계부가 없습니다.</dd>

View File

@@ -20,13 +20,6 @@
<span class="tag" th:text="${item.forestProductStatus.desc}"></span>
</a>
</li>
<!--/* TODO : 등록없음 추가 */-->
<!--/* <li class="complete-nodata">
<a href="">
<p class="list-tit">2025년 5월</p>
<span class="tag">등록없음</span>
</a>
</li> */-->
</ul>
</div>
</main>

View File

@@ -533,7 +533,6 @@
document.getElementById('listBody').innerHTML = '';
formControl.updateLayout();
// TODO(ks): 선택 삭제 시 전체 count 미반영 중. 일단 전체 초기화에서만 count 갱신.
document.getElementById('totalItems').textContent = ENV.data.productList.length;
},
});
@@ -569,11 +568,6 @@
function (rstData, status) {
if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('등록이 완료되었습니다.', null, function () {
/**
* TODO
* 내정보에서만 들어온다는 가정하에서 back을 하게함 SB에는 내정보로 이동하게 되어 있음.
*/
// history.back()
location.href = '/info/monthly';
});
} else if (rstData.code === 'ERROR') {

View File

@@ -108,8 +108,7 @@
},
/**
* TODO 검색할때 각 페이지에 함수 구현 필요.
* TODO 일단 뒤로가기에 대한 부분 정의가 없기에 페이지 이동으로 처리해둠...
* 검색할때 각 페이지에 함수 구현 필요.
*/
goSearch() {
const f = document.reqForm;

View File

@@ -57,10 +57,7 @@ root: /*[[|#{uri.front.info.user.path}/password|]]*/'rootUrl',
},
goList() {
/**
* TODO 외부 유입에 따라 history.back과 location.href 가 적절하게 사용되어야함...
* 전체적인 수정 필요.(이전 페이지
*/
const previousUrl = document.referrer;
/* if (previousUrl.includes('/info/notice')) {

View File

@@ -882,198 +882,198 @@
</div>
<section layout:fragment="script">
<script th:src="@{/static/library/jsRender/jsrender.min.js}"></script>
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
let ENV = {
httpUrl: {
root: '',
list: '/record/calendar/{searchMonth}/{groupNo}',
create: '/record/daily/{searchMonth}/{groupNo}',
alert: '/api/record/daily/alert/{searchMonth}',
},
submitted: false,
};
<script th:src="@{/static/library/jsRender/jsrender.min.js}"></script>
<script th:src="@{/static/ui/page/daily-record.js}"></script>
<script th:inline="javascript">
let ENV = {
httpUrl: {
root: '',
list: '/record/calendar/{searchMonth}/{groupNo}',
create: '/record/daily/{searchMonth}/{groupNo}',
alert: '/api/record/daily/alert/{searchMonth}',
},
submitted: false,
};
let formControl = {
setDetail(rowdata, currentDate, viewDate) {
const searchMonth = viewDate.getFullYear().toString() + (viewDate.getMonth() + 1).toString().padStart(2, '0');
let childList = rowdata.children;
let monthlyList = rowdata.monthly;
if (rowdata == null) {
kri.logger.error('달력 선택 데이터 없음.')
}
let formControl = {
setDetail(rowdata, currentDate, viewDate) {
const searchMonth = viewDate.getFullYear().toString() + (viewDate.getMonth() + 1).toString().padStart(2, '0');
let childList = rowdata.children;
let monthlyList = rowdata.monthly;
if (rowdata == null) {
kri.logger.error('달력 선택 데이터 없음.')
}
let tmpl = $.templates('#dailyNoneTmpl');
let html = '';
if (childList === undefined || childList.length === 0) {
html = tmpl.render({
month: searchMonth,
no: rowdata.no,
date: currentDate,
monthlyList: monthlyList,
registrable: rowdata.registrable,
modifiable: rowdata.modifiable,
});
} else {
tmpl = $.templates('#dailyListTmpl');
html = tmpl.render({
month: searchMonth,
no: rowdata.no,
date: currentDate,
list: childList,
monthlyList: monthlyList,
registrable: rowdata.registrable,
modifiable: rowdata.modifiable,
carryOver: rowdata.carryOver != null ? Number(rowdata.carryOver).toLocaleString() : null,
});
}
let tmpl = $.templates('#dailyNoneTmpl');
let html = '';
if (childList === undefined || childList.length === 0) {
html = tmpl.render({
month: searchMonth,
no: rowdata.no,
date: currentDate,
monthlyList: monthlyList,
registrable: rowdata.registrable,
modifiable: rowdata.modifiable,
});
} else {
tmpl = $.templates('#dailyListTmpl');
html = tmpl.render({
month: searchMonth,
no: rowdata.no,
date: currentDate,
list: childList,
monthlyList: monthlyList,
registrable: rowdata.registrable,
modifiable: rowdata.modifiable,
carryOver: rowdata.carryOver != null ? Number(rowdata.carryOver).toLocaleString() : null,
});
}
$('#selectedDay').html(html);
$('#selectedDay').html(html);
// 오늘 날짜가 해당 달의 마지막 날인지 확인
const today = new Date();
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0); // 해당 달의 마지막 날
// 마지막 alert 날짜 확인
const lastAlertDate = sessionStorage.getItem('lastAlertDate');
const todayDateString = today.toDateString();
// 오늘 날짜가 해당 달의 마지막 날인지 확인
const today = new Date();
const lastDayOfMonth = new Date(today.getFullYear(), today.getMonth() + 1, 0); // 해당 달의 마지막 날
// 마지막 alert 날짜 확인
const lastAlertDate = sessionStorage.getItem('lastAlertDate');
const todayDateString = today.toDateString();
if (lastAlertDate !== todayDateString &&
today.getFullYear() === lastDayOfMonth.getFullYear() &&
today.getMonth() === lastDayOfMonth.getMonth() &&
today.getDate() === lastDayOfMonth.getDate()) {
ajaxUtil._ajaxSyncMethod(
ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')),
{},
function (response) {
let dailyNo = []
let msgTxt = '';
let month = viewDate.getMonth() + 1;
let idxPlus = 0;
msgTxt += "등록하지 않은 일계부 항목이 있습니다.\n 정확한 조사를 위해 꾸준히 입력해 주세요.\n";
if(response.dailyRecordAlertDtoList.length > 0){
response.dailyRecordAlertDtoList.forEach((dto) =>{
let dateTxt;
if(dto.startDay === dto.endDay){
dateTxt = month+"월 "+dto.startDay+"일";
}else{
dateTxt = month+"월 "+dto.startDay+"~"+dto.endDay+"일";
}
dailyNo.push(dateTxt);
});
msgTxt += "<p class=\"dialog-info-tit\">1. 일계부 미등록 </p>\n <p class=\"dialog-info\">"+dailyNo.join(',')+"</p>\n";
idxPlus ++;
}
if(response.monthRecordAlertDtoList.length > 0) {
response.monthRecordAlertDtoList.forEach((dto,idx) => {
msgTxt += "<p class=\"dialog-info-tit\">"+ (idx+idxPlus+1) +". "+dto+"</p>\n";
});
}
if (lastAlertDate !== todayDateString &&
today.getFullYear() === lastDayOfMonth.getFullYear() &&
today.getMonth() === lastDayOfMonth.getMonth() &&
today.getDate() === lastDayOfMonth.getDate()) {
ajaxUtil._ajaxSyncMethod(
ENV.httpUrl.alert.replace('{searchMonth}', searchMonth.replace('-', '')),
{},
function (response) {
let dailyNo = []
let msgTxt = '';
let month = viewDate.getMonth() + 1;
let idxPlus = 0;
msgTxt += "등록하지 않은 일계부 항목이 있습니다.\n 정확한 조사를 위해 꾸준히 입력해 주세요.\n";
if(response.dailyRecordAlertDtoList.length > 0){
response.dailyRecordAlertDtoList.forEach((dto) =>{
let dateTxt;
if(dto.startDay === dto.endDay){
dateTxt = month+"월 "+dto.startDay+"일";
}else{
dateTxt = month+"월 "+dto.startDay+"~"+dto.endDay+"일";
}
dailyNo.push(dateTxt);
});
msgTxt += "<p class=\"dialog-info-tit\">1. 일계부 미등록 </p>\n <p class=\"dialog-info\">"+dailyNo.join(',')+"</p>\n";
idxPlus ++;
}
if(response.monthRecordAlertDtoList.length > 0) {
response.monthRecordAlertDtoList.forEach((dto,idx) => {
msgTxt += "<p class=\"dialog-info-tit\">"+ (idx+idxPlus+1) +". "+dto+"</p>\n";
});
}
if(response.dailyRecordAlertDtoList.length > 0 || dto.monthRecordAlertDtoList.length > 0) {
etUI.dialog.alert({
title: '',
message: msgTxt,
type:'alert',
callback: function () {
sessionStorage.setItem('lastAlertDate',lastDayOfMonth.toDateString());
},
});
}
},
function (rstData, status) {
if(response.dailyRecordAlertDtoList.length > 0 || dto.monthRecordAlertDtoList.length > 0) {
etUI.dialog.alert({
title: '',
message: msgTxt,
type:'alert',
callback: function () {
sessionStorage.setItem('lastAlertDate',lastDayOfMonth.toDateString());
},
});
}
},
function (rstData, status) {
},
'get'
,'json'
);
}
},
recordCreate(searchMonth, groupNo) {
location.href = ENV.httpUrl.create.replace('{searchMonth}', searchMonth.replace('-', '')).replace('{groupNo}', groupNo);
},
};
},
'get'
,'json'
);
}
},
recordCreate(searchMonth, groupNo) {
location.href = ENV.httpUrl.create.replace('{searchMonth}', searchMonth.replace('-', '')).replace('{groupNo}', groupNo);
},
};
</script>
<script id="dailyNoneTmpl" type="text/x-jsrender">
{{include tmpl="#titleTmpl" /}}
</script>
<script id="dailyNoneTmpl" type="text/x-jsrender">
{{include tmpl="#titleTmpl" /}}
{{if registrable}}
<div class="component-btns btn-add">
<button type="button" onclick="formControl.recordCreate('{{:month}}', {{:no}});">
<p class="txt">일계부 등록하기</p>
</button>
</div>
{{/if}}
{{include tmpl="#etcRowTmpl" /}}
</script>
<script id="dailyListTmpl" type="text/x-jsrender">
{{include tmpl="#titleTmpl" /}}
<ul class="btn-column-list">
{{if no == 1}}
<li>
<p class="label">월초이월금</p>
{{if carryOver == null}}
<p class="value">정산중입니다.</p>
{{else}}
<p class="value"><em><b>{{:carryOver}}</b> 원</em></p>
{{/if}}
</li>
{{if registrable}}
<div class="component-btns btn-add">
<button type="button" onclick="formControl.recordCreate('{{:month}}', {{:no}});">
<p class="txt">일계부 등록하기</p>
</button>
</div>
{{/if}}
{{for list ~edit=modifiable}}
{{if status == null}}
{{include tmpl="#etcRowTmpl" /}}
</script>
<script id="dailyListTmpl" type="text/x-jsrender">
{{include tmpl="#titleTmpl" /}}
<ul class="btn-column-list">
{{if no == 1}}
<li>
<p class="label">{{:codeLabel}}</p>
<p class="value">미작성</p>
</li>
{{else}}
<li class="{{if ~edit}}edit{{else}}view{{/if}}">
{{if status == 'TARGET' && total != 0}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value"><em>총 <b>{{:total}}</b>건</em></p>
</a>
{{else status == 'TARGET' && total == 0}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value">미완료</p>
</a>
{{else status == 'TODAY_NONE'}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value">없음</p>
</a>
<p class="label">월초이월금</p>
{{if carryOver == null}}
<p class="value">정산중입니다.</p>
{{else}}
<p class="value"><em><b>{{:carryOver}}</b> 원</em></p>
{{/if}}
</li>
{{/if}}
{{/for}}
</ul>
{{include tmpl="#etcRowTmpl" /}}
</script>
<script id="titleTmpl" type="text/x-jsrender">
{{if date.start == date.end}}
<p class="date">{{:date.start}}</p>
{{else}}
<p class="date">{{:date.start}} ~ {{:date.end}}</p>
{{/if}}
</script>
<script id="etcRowTmpl" type="text/x-jsrender">
<div class="regist-btn-area">
{{for monthlyList}}
<a href="{{:path ? path : 'javascript:void(0);'}}" class="btn{{if total != null && total != 0}} complete{{/if}}">
<p>{{:codeLabel}}</p>
{{if total != null && total != 0}}
<span>등록완료</span>
{{for list ~edit=modifiable}}
{{if status == null}}
<li>
<p class="label">{{:codeLabel}}</p>
<p class="value">미작성</p>
</li>
{{else}}
<span>미등록</span>
<li class="{{if ~edit}}edit{{else}}view{{/if}}">
{{if status == 'TARGET' && total != 0}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value"><em>총 <b>{{:total}}</b>건</em></p>
</a>
{{else status == 'TARGET' && total == 0}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value">미완료</p>
</a>
{{else status == 'TODAY_NONE'}}
<a href="{{:path}}?type=update">
<p class="label">{{:codeLabel}}</p>
<p class="value">없음</p>
</a>
{{/if}}
</li>
{{/if}}
</a>
{{/for}}
</div>
</script>
{{/for}}
</ul>
{{include tmpl="#etcRowTmpl" /}}
</script>
<script id="titleTmpl" type="text/x-jsrender">
{{if date.start == date.end}}
<p class="date">{{:date.start}}</p>
{{else}}
<p class="date">{{:date.start}} ~ {{:date.end}}</p>
{{/if}}
</script>
<script id="etcRowTmpl" type="text/x-jsrender">
<div class="regist-btn-area">
{{for monthlyList}}
<a href="{{:path ? path : 'javascript:void(0);'}}" class="btn{{if total != null && total != 0}} complete{{/if}}">
<p>{{:codeLabel}}</p>
{{if total != null && total != 0}}
<span>등록완료</span>
{{else}}
<span>미등록</span>
{{/if}}
</a>
{{/for}}
</div>
</script>
</section>
</html>