Merge branch 'dev' into deploy-dev-admin

This commit is contained in:
kangsunlee
2025-06-30 11:08:45 +09:00
14 changed files with 167 additions and 49 deletions

View File

@@ -22,7 +22,7 @@
bat.source_purpose AS sourcePurpose, /* 수입원 */
bat.count, /* 수량 */
CASE
WHEN ui_unit.id = 'code.record.unit.self'
WHEN ui_unit.id = 'code.count.unit.self'
THEN bat.unit
ELSE ui_unit.code_text
END AS unitText, /* 단위 */
@@ -33,7 +33,7 @@
AND ui_crop.id = bat.crop_code
AND ui_crop.is_deleted = false
LEFT JOIN uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit'
ON ui_unit.parent_id = 'code.count.unit'
AND ui_unit.id = bat.unit_code
AND ui_unit.is_deleted = false
LEFT JOIN uicode ui_category
@@ -59,7 +59,7 @@
bat.source_purpose AS sourcePurpose, /* 용도 */
bat.count, /* 수량 */
CASE
WHEN ui_unit.id = 'code.record.unit.self'
WHEN ui_unit.id = 'code.count.unit.self'
THEN bat.unit
ELSE ui_unit.code_text
END AS unitText, /* 단위 */
@@ -67,7 +67,7 @@
FROM bank_auto_transfer bat
LEFT JOIN
uicode ui_unit
ON ui_unit.parent_id = 'code.record.unit'
ON ui_unit.parent_id = 'code.count.unit'
AND ui_unit.id = bat.unit_code
AND ui_unit.is_deleted = false
LEFT JOIN

View File

@@ -96,7 +96,7 @@ class GetBankInputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));
model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
model.addAttribute("MonthStatus", MonthStatus.class);
model.addAttribute("editable", editable);
@@ -112,7 +112,7 @@ class GetBankInputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.input"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));
model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
return "info/bank/inputForm";
}

View File

@@ -101,7 +101,7 @@ class GetBankOutputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));
model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
model.addAttribute("MonthStatus", MonthStatus.class);
model.addAttribute("editable", editable);
@@ -116,7 +116,7 @@ class GetBankOutputUIController {
model.addAttribute("transferCategoryList", uiCodeListPortIn.connect("code.bank.output"));
model.addAttribute("codeRecordCropList", uiCodeListPortIn.connect("code.record.crop"));
model.addAttribute("unitList", uiCodeListPortIn.connect("code.record.unit"));
model.addAttribute("countList", uiCodeListPortIn.connect("code.count.unit"));
return "info/bank/outputForm";
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.4 KiB

View File

@@ -0,0 +1,15 @@
{
"name": "My App",
"short_name": "MyApp",
"start_url": "/",
"display": "standalone",
"background_color": "#ffffff",
//"theme_color": "#4BBC43",
"icons": [
{
"src": "kri_appimg.png",
"sizes": "512x512",
"type": "image/png"
}
]
}

View File

@@ -8516,13 +8516,15 @@ button.swiper-pagination-bullet {
}
.regist-item-area .item-list .list-item .detail-list li p {
position: relative;
min-width: -webkit-fit-content;
min-width: -moz-fit-content;
min-width: fit-content;
margin-right: 0.4rem;
padding-right: 0.9rem;
font-size: 1.6rem;
line-height: 140%;
color: #868e96;
word-break: break-all;
white-space: nowrap;
}
.regist-item-area .item-list .list-item .detail-list li p::before {
position: absolute;
@@ -9067,14 +9069,92 @@ button.swiper-pagination-bullet {
line-height: 140%;
font-weight: 700;
}
.regi-wrap .month-detail .btn-column-list a {
.regi-wrap .month-detail .btn-column-list li {
padding: 2rem 1.6rem;
}
.regi-wrap .month-detail .btn-column-list li.view {
padding: 0;
}
.regi-wrap .month-detail .btn-column-list li.view .label {
position: relative;
padding-right: 2rem;
}
.regi-wrap .month-detail .btn-column-list li.view .label::before {
position: absolute;
display: block;
content: "";
width: 2rem;
height: 2rem;
background: url("../images/common/ico_arr_right_gray.svg") center/contain no-repeat;
right: 0;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.regi-wrap .month-detail .btn-column-list li.view a {
padding: 2rem 1.6rem;
}
.regi-wrap .month-detail .btn-column-list li.view a:before {
display: none;
}
.regi-wrap .month-detail .btn-column-list .value li {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
padding: 0;
box-shadow: none;
border: 0;
}
.regi-wrap .month-detail .btn-column-list .value li + li {
margin-top: 0.6rem;
}
.regi-wrap .month-detail .btn-column-list .value li.total {
margin-top: 0.4rem;
}
.regi-wrap .month-detail .btn-column-list .value li.total span {
color: #4bbc43 !important;
}
.regi-wrap .month-detail .btn-column-list .value li.total span:last-child {
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
margin-left: auto;
}
.regi-wrap .month-detail .btn-column-list .value li.total strong {
margin-right: 0.2rem;
font-size: 2rem;
line-height: 140%;
font-weight: 600;
}
.regi-wrap .month-detail .btn-column-list .value li span {
font-size: 1.6rem;
line-height: 140%;
font-weight: 400;
color: #212529;
}
.regi-wrap .month-detail .btn-column-list .value li span:first-child {
padding-right: 1.2rem;
position: relative;
color: #868e96;
white-space: nowrap;
}
.regi-wrap .month-detail .btn-column-list .value li span:first-child:before {
position: absolute;
display: block;
content: ":";
font-size: 1.6rem;
line-height: 140%;
right: 0.5rem;
top: 50%;
-webkit-transform: translateY(-50%);
transform: translateY(-50%);
}
.regi-wrap .component-select.bottom-sheet {
width: -webkit-fit-content;
width: -moz-fit-content;
@@ -9113,6 +9193,7 @@ button.swiper-pagination-bullet {
padding: 3.2rem 0rem;
}
.regi-wrap .month-filter .summary {
margin-top: 2rem;
display: -webkit-box;
display: -webkit-flex;
display: flex;
@@ -9157,4 +9238,14 @@ button.swiper-pagination-bullet {
line-height: 140%;
font-weight: 700;
}
.regi-wrap .regist-item-area .month-tit {
margin-bottom: 1.6rem;
font-size: 2rem;
line-height: 140%;
font-weight: 700;
color: #212529;
}
.regi-wrap .regist-item-area .item-list + .month-tit {
margin-top: 2.4rem;
}
/*# sourceMappingURL=style.css.map */

View File

@@ -25,9 +25,15 @@
<meta property="og:image" th:content="${currentURI.ogImage}"/>
<meta name="_csrf" th:content="${_csrf.token}"/>
<meta name="_csrf_header" th:content="${_csrf.headerName}"/>
<meta name="robots" content="noindex, nofollow">
<!--/* TODO : theme-color */-->
<link rel="icon" th:href="@{/kri_appimg.png}" sizes="512x512">
<!-- iOS 홈화면 -->
<link rel="apple-touch-icon" th:href="@{/static/assets/images/kri_appimg.png}">
<!-- PWA -->
<link rel="manifest" th:href="@{/static/assets/json/manifest.json}">
<link rel="icon" type="image/x-icon" th:href="@{/static/assets/images/kri_favicon.ico}" />
<link rel="shortcut icon" type="image/x-icon" th:href="@{/static/assets/images/kri_favicon.ico}" />
<link th:href="@{/static/assets/styles/style.css}" type="text/css" rel="stylesheet" />
<script th:src="@{/static/assets/scripts/common.ui.plugin.js}"></script>
<script th:src="@{/static/assets/scripts/common.ui.js}" data-init></script>

View File

@@ -113,7 +113,7 @@
data: {
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
unitList: /*[[${unitList}]]*/ [],
countList: /*[[${countList}]]*/ [],
bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'',
@@ -288,7 +288,7 @@
ENV.elementRefs.select.unitCodeSelect.core.init($select3,{
selectItemCallback({selectValue, dataValue}){
document.querySelector('#unitCode').value=dataValue;
if(dataValue === "code.record.unit.self") {
if(dataValue === "code.count.unit.self") {
document.querySelector('#unit').value="";
document.querySelector('#unitDiv').style.display ='block';
} else {
@@ -381,7 +381,7 @@
field: 'unitCode',
message: '단위를 선택해주세요.'
});
} else if (form.unitCode.value && form.unitCode.value =="code.record.unit.self" && !form.unit.value){
} else if (form.unitCode.value && form.unitCode.value =="code.count.unit.self" && !form.unit.value){
errors.push({
field: 'unit',
@@ -417,7 +417,7 @@
},
// 단위 코드
getUnitLabel(code) {
const found = ENV.data.unitList.find(i => i.id === code);
const found = ENV.data.countList.find(i => i.id === code);
return found ? found.codeText : '-';
},
// 재배형태
@@ -441,7 +441,7 @@
if(key == 'transferCategoryCode' && val == "code.bank.input.self"){
document.getElementById(val+"_value").value = product["transferCategory"];
}
if(key == 'unitCode' && val == "code.record.unit.self"){
if(key == 'unitCode' && val == "code.count.unit.self"){
document.getElementById("unitDiv").style.display = "";
}
}
@@ -535,7 +535,7 @@
let tagCount = '';
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
const unitText = product.unitCode !== 'code.count.unit.self'
? getUnit(product.unitCode)
: product.unit;

View File

@@ -152,7 +152,7 @@
</div>
<div class="select-scroll">
<ul class="">
<th:block th:each="item : ${unitList}">
<th:block th:each="item : ${countList}">
<li class="option" th:data-value="${item.id}"
th:text="${item.codeText}">option1
</li>

View File

@@ -113,7 +113,7 @@
data: {
transferCategoryCodeList: /*[[${transferCategoryList}]]*/ [],
codeRecordCropList: /*[[${codeRecordCropList}]]*/ [],
unitList: /*[[${unitList}]]*/ [],
countList: /*[[${countList}]]*/ [],
bankList : /*[[${bankList.content}]]*/ [],
pastBankList : /*[[${pastBankList.content}]]*/ [],
id: /*[[${currentMonthlyInfo.id}]]*/'',
@@ -279,7 +279,7 @@
ENV.elementRefs.select.unitCodeSelect.core.init($select3,{
selectItemCallback({selectValue, dataValue}){
document.querySelector('#unitCode').value=dataValue;
if(dataValue === "code.record.unit.self") {
if(dataValue === "code.count.unit.self") {
document.querySelector('#unit').value="";
document.querySelector('#unitDiv').style.display ='block';
} else {
@@ -372,7 +372,7 @@
field: 'unitCode',
message: '단위를 선택해주세요.'
});
} else if (form.unitCode.value && form.unitCode.value =="code.record.unit.self" && !form.unit.value){
} else if (form.unitCode.value && form.unitCode.value =="code.count.unit.self" && !form.unit.value){
errors.push({
field: 'unit',
@@ -411,7 +411,7 @@
},
// 단위 코드
getUnitLabel(code) {
const found = ENV.data.unitList.find(i => i.id === code);
const found = ENV.data.countList.find(i => i.id === code);
return found ? found.codeText : '-';
},
// 재배형태
@@ -435,7 +435,7 @@
if (key === 'transferCategoryCode' && val === "code.bank.input.self") {
document.getElementById(val + "_value").value = product["transferCategory"];
}
if (key === 'unitCode' && val === "code.record.unit.self") {
if (key === 'unitCode' && val === "code.count.unit.self") {
document.getElementById("unitDiv").style.display = "";
}
}
@@ -528,7 +528,7 @@
let tagCount = '';
if (product.count > 0) {
const unitText = product.unitCode !== 'code.record.unit.self'
const unitText = product.unitCode !== 'code.count.unit.self'
? getUnit(product.unitCode)
: product.unit;

View File

@@ -111,7 +111,7 @@
</div>
<div class="select-scroll">
<ul class="">
<th:block th:each="item : ${unitList}">
<th:block th:each="item : ${countList}">
<li class="option" th:data-value="${item.id}"
th:text="${item.codeText}">option1
</li>

View File

@@ -333,24 +333,22 @@
// selectboxInstance1.setValue($('input[name=regionMainCode]').val());
},
confirmPopup() {
// 이름 변경 여부 처리
const currentName = document.querySelector('input[name="ownerName"]').value.trim();
const isNameChanged = currentName !== ENV.initialOwnerName;
if (currentName === '') { // 이름 비어있을 경우 유효성검사 실시
formControl.updateUserInfo();
} else if (currentName !== ENV.initialOwnerName) { // 이름이 변경됐을 경우 개인정보동의 모달창 띄우기
ENV.module.confirmPopup.open();
} else {
formControl.updateUserInfo();
}
formControl.updateUserInfo(isNameChanged);
},
confirmPopupOk() {
ENV.module.confirmPopup.close();
setTimeout(function () {
formControl.updateUserInfo();
setTimeout(() => {
ajaxUtil._alert('개인정보 변경이 완료되었습니다.', null, () => {
location.href = '/info';
});
}, 500);
},
updateUserInfo() {
updateUserInfo(showPopupIfValidNameChanged = false) {
const f = document.reqForm;
// // TODO 어쩔수 없이 이렇게 하는데..... 콤포넌트값 핸들링 방법 UX에서 지정하면 수정해야함.
@@ -386,14 +384,13 @@
obj,
function (rstData, status) {
if (rstData.code === 'SUCCESS') {
ajaxUtil._alert('개인정보 변경이 완료되었습니다.', null, function () {
/**
* TODO
* 내정보에서만 들어온다는 가정하에서 back을 하게함 SB에는 내정보로 이동하게 되어 있음.
*/
// history.back();
// 유효성 검사를 모두 통과한 후
if (showPopupIfValidNameChanged) {
// 이름이 바뀐 경우만 팝업
ENV.module.confirmPopup.open();
} else {
location.href = '/info';
});
}
} else if (rstData.code === 'ERROR') {
ajaxUtil._alert('잠시 뒤에 다시 시도해 주세요.', null);
}

21
pom.xml
View File

@@ -137,21 +137,29 @@
<dependency>
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>2.9.2</version> </dependency>
<version>2.9.2</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-text</artifactId>
<version>1.12.0</version> </dependency>
<version>1.12.0</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
<version>5.2.5</version> </dependency>
<version>5.2.5</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>5.2.5</version> </dependency>
<version>5.2.5</version>
</dependency>
<dependency>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP</artifactId>
<version>5.1.0</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
@@ -166,7 +174,8 @@
<groupId>io.florianlopes</groupId>
<artifactId>spring-mvc-test-utils</artifactId>
<version>3.1.0</version>
<scope>test</scope> </dependency>
<scope>test</scope>
</dependency>
</dependencies>
<modules>