From db0c59e82a19248b6e8db73bb8e5343e583fe690 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 13 Dec 2021 16:29:42 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=EC=97=B4=EB=9E=8C=EC=A4=80=EB=B9=84?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp index 09af5465..a5002011 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp @@ -149,6 +149,9 @@ function fn_search(reqStatusDivCd) { } else if(obj.reqStatusDivCd == "A1") { // 승인 statusHtml1 = '' + obj.reqStatusDivNm + '' + gfn_formatDateStr(obj.modDd,"-") + ''; statusHtml2 = ''; + } else if(obj.reqStatusDivCd == "B") { // 열람준비완료 + statusHtml1 = '' + obj.reqStatusDivNm + '' + gfn_formatDateStr(obj.modDd,"-") + ''; + statusHtml2 = ''; } else if(obj.reqStatusDivCd == "A2") { // 반려 statusHtml1 = '' + obj.reqStatusDivNm + '' + gfn_formatDateStr(obj.modDd,"-") + ''; statusHtml2 = ''; From 3ef9ba0c519373bc3e1be4f91b0888428db55fcc Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 13 Dec 2021 16:30:49 +0900 Subject: [PATCH 2/5] =?UTF-8?q?DB=EC=BB=AC=EB=9F=BC=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EA=B1=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml index 31adb1b6..b51370b5 100644 --- a/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml +++ b/src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml @@ -159,7 +159,7 @@ FROM BD_NLIB_BANNER A LEFT OUTER JOIN BD_FILEDETAIL B ON (A.ATTACH_FILE_ID = B.ATTACH_FILE_ID AND IFNULL(B.USE_AT,'Y') = 'Y') WHERE A.MNG_ORG_CD = #{mngOrgCd} - AND DATE_FORMAT(NOW(), '%Y%m%d%H') BETWEEN IFNULL(A.POST_START_DT, '1901010100') AND IFNULL(A.POST_END_DT , '9999123124') + AND DATE_FORMAT(NOW(), '%Y%m%d%H') BETWEEN IFNULL(A.POST_START_DATE, '1901010100') AND IFNULL(A.POST_END_DATE , '9999123124') AND IFNULL(USE_YN, 'Y') = 'Y' AND DELETE_YN = 'N' ORDER BY ORDER_SEQ From f651be01a40def3a2e6b7b430bb88010ab11f543 Mon Sep 17 00:00:00 2001 From: com02 Date: Mon, 13 Dec 2021 17:16:18 +0900 Subject: [PATCH 3/5] css --- src/main/webapp/css/default.css | 8 +++++--- src/main/webapp/css/media.css | 11 +++++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index 9584591c..b7f65d91 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -726,6 +726,7 @@ transform: rotate(45deg);} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.img {width:auto;padding:0% 40px;margin-right:2%;position: relative;} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type {width:70%;margin-bottom:10px;} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title {width:70%;font-size:16px;font-weight: 500;} +.cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title a {width:100%;display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow: hidden;} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type span {font-size:12px;padding:2px 15px 3px;background:#333;border-radius: 50px;color:#fff;} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type span.online {background:#376795;} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type span.loan {background:#b68946;} @@ -939,7 +940,7 @@ transform: rotate(45deg);} .data.detail .inner .row-top .center .left .cla .con-1 span.visit {color:#2b8b99;border:2px solid #2b8b99;} .data.detail .inner .row-top .center .left .cla .con-2 {display: inline-block;padding:0px 0px 0px 10px;} .data.detail .inner .row-top .center .left .cla .con-2 .code {font-size:16px;color:#fff;line-height: 26px;} -.data.detail .inner .row-top .center .left .tit {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;max-height: 100px;overflow: hidden;} +.data.detail .inner .row-top .center .left .tit {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;max-height: 105px;overflow: hidden;} .data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;} .data.detail .inner .row-top .center .right .con-1 {display: inline-block;width:100%;height:100px;border-bottom:1px solid #ddd;text-align: right;margin-bottom: 30px;} .data.detail .inner .row-top .center .right .con-1 button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 500;text-align: center;border:1px solid #ddd;margin-top:55px;} @@ -1412,6 +1413,7 @@ transform: rotate(45deg);} .contents-frame {width:100%;} .list-table-wrap table {display: table;width:100%;box-sizing: border-box;font-size: 16px;color: #666;letter-spacing: -0.025em;table-layout: fixed;} .list-table-wrap table tbody tr {width: 100%;text-align: center;border-bottom: 1px solid #ddd;} +.list-table-wrap table th {font-size:14px;font-weight:200;} .list-table-wrap table th, .list-table-wrap table td {display: table-cell;height: 60px;vertical-align: middle;} .list-table-wrap table .t-num {width: 6%;} @@ -1425,7 +1427,7 @@ transform: rotate(45deg);} .list-table-wrap table .t-status {width: 10%;} .list-table-wrap table .t-file {width:10%;} .list-table-wrap table .t-answer {width:auto;} -.list-table-wrap table .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:14px;font-weight:400;background: #556676;} +.list-table-wrap table .t-tit-line {width: 100%;/*border-top: 2px solid #000;border-bottom: 1px solid #000;*/color: #fff;font-size:14px;font-weight:400;background: #556676;} .list-table-wrap table .t-tit-line span {text-align: center;} .list-table-wrap table .message {width: 100%;text-align: center;} .list-table-wrap .t-status em {text-align: center;font-size: 14px;width: 82px;height: 30px;line-height: 30px;display: block;margin: 0 auto;border-radius: 15px;border: 1px solid #ddd;} @@ -1610,7 +1612,7 @@ transform: rotate(45deg);} .qna .list-table-wrap table .t-answer {width:8%;text-align: center;} .qna .list-table-wrap table .t-answer span {display:inline-block;background:#e6e7e9;height:auto;padding:2px 10px 4px;border-radius: 50px;font-size:12px;} .qna .list-table-wrap table .t-answer span.compl {background: #b98d4d;color:#fff;font-weight: 400;} -.qna .list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:12px;font-weight:400;background: #556676;} +.qna .list-table-wrap .t-tit-line {width: 100%;/*border-top: 2px solid #000;border-bottom: 1px solid #000;*/color: #fff;font-size:12px;font-weight:400;background: #556676;} .qna .list-table-wrap .t-tit-line span {text-align: center;} .qna .list-table-wrap table .message {width: 100%;text-align: center;} .qna .list-table-wrap .t-status em {text-align: center;font-size: 14px;width: 82px;height: 30px;line-height: 30px;display: block;margin: 0 auto;border-radius: 15px;border: 1px solid #ddd;} diff --git a/src/main/webapp/css/media.css b/src/main/webapp/css/media.css index 3cdef6b2..1618ce4f 100644 --- a/src/main/webapp/css/media.css +++ b/src/main/webapp/css/media.css @@ -351,7 +351,7 @@ footer .family_site {right:10px;} .popularSwiper .swiper-pagination-bullet-active { background: #376795; width: 35px; height: 10px; } .sec6 .onlineSwiper::before, .sec6 .onlineSwiper::after { display: none; } - .sec6 .onlineSwiper {padding:1% 10% 12%;width:80%;} + .sec6 .onlineSwiper {padding:1% 20% 12%;width:60%;} .sec6 .onlineSwiper .items .List .inner div.thumbnail {width:100%;} .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover > a {margin-bottom: 16px; font-size: 16px; border-bottom: 1px solid rgba(255, 255, 255, 0.3); } .sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover .btn-box { } @@ -526,6 +526,8 @@ footer .family_site {right:10px;} .cart .inner .tabs_item .btn-box .left { margin-right: 16px; } .cart .inner .tabs_item .btn-box .btn { width: 100%; } + .cart .inner .tab_content.loan-confirm.visit-confirm .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title {width:100%;padding:38px 0px 40px;} + .cart .inner .tab_content.loan-confirm.visit-confirm .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type {left:10px;} /* .cart .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 5px 0 40px; position:absolute;left:22px;top:50px;font-size:14px;width:270px;overflow:hideen;} .cart .inner .tabs_item .list-cart-wrap .list-cart div.list.t-tit-line > div.t-state {position:static;} @@ -554,6 +556,7 @@ footer .family_site {right:10px;} .cart-confirm .inner .visit-confirm .tabs_item .list-cart-wrap .list-cart div.list { padding: 10px 10px 24px; } .cart-confirm .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.type { left: 10px; } .cart-confirm .inner .tabs_item .list-cart-wrap.confirm .list-cart div.list > div.t-state { width: 100%; } + .cart .inner .visit-confirm .tabs_item .list-cart-wrap.confirm .list-cart div.list > div.t-state {width:50%;} .cart-confirm .inner .tabs_item .list-cart-wrap .list-cart div.list > div.t-data > div.title { padding: 38px 0 40px; } .cart-confirm .inner .visit-confirm .list-cart-wrap .list-cart div.list > div.t-data > div.title { width: 100%; } .cart-confirm .inner .tabs_item .list-cart-wrap .list-cart div.list-content > div.t-state { bottom: 208px; } @@ -725,8 +728,8 @@ footer .family_site {right:10px;} .data.detail .inner .row-bottom { padding: 0; } .data.detail .inner .row-top .center .left .cla { position: relative; } .data.detail .inner .row-top .center .left .cla .con-1 { width: 100%; display: block; } - .data.detail .inner .row-top .center .left .cla .con-2 { position: absolute; top: 103px; padding: 0; } - .data.detail .inner .row-top .center .left .tit { font-size: 22px; margin-bottom: 50px;height:66px;overflow:hidden; } + .data.detail .inner .row-top .center .left .cla .con-2 { position: relative; top: 5px; padding: 0; } + .data.detail .inner .row-top .center .left .tit { font-size: 22px; margin-bottom: 30px;overflow:hidden; } .data.detail .inner .row-top .center .right .con-1 { display: flex; height: auto; border: none; } .data.detail .inner .row-top .center .right .con-1 button { margin-top: 14px; width: 36px; height: 36px; } .data.detail .inner .row-top .center .right .con-1 button.view { flex: 1; } @@ -768,7 +771,7 @@ footer .family_site {right:10px;} .data.detail .inner .row-bottom .con-4 .top h3::before { top: 13px; width: 90%; left: 50%; transform: translate(-50%, 0%); } .data.detail .inner .row-bottom .con-4 .top h3::after { width: 162px; height: 27px; left: calc(50% - 81px); } .data.detail .inner .row-bottom .DetailSwiper1 {padding:1% 0% 12%;} - .data.detail .inner .row-bottom .DetailSwiper2 {padding:1% 10% 12%;width:80%;} + .data.detail .inner .row-bottom .DetailSwiper2 {padding:1% 20% 12%;width:60%;} .data.detail .inner .row-bottom .DetailSwiper2 .swiper-slide { height: auto; } .data.detail .inner .row-bottom .DetailSwiper2 .items.cover .List, .data.detail .inner .row-bottom .DetailSwiper2 .swiper-slide .List .inner, From fd6161c179694e8c358ad68f04d075b0c677d5e6 Mon Sep 17 00:00:00 2001 From: com02 Date: Mon, 13 Dec 2021 17:25:28 +0900 Subject: [PATCH 4/5] css --- src/main/webapp/css/default.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css index b7f65d91..0db89f3a 100644 --- a/src/main/webapp/css/default.css +++ b/src/main/webapp/css/default.css @@ -940,7 +940,7 @@ transform: rotate(45deg);} .data.detail .inner .row-top .center .left .cla .con-1 span.visit {color:#2b8b99;border:2px solid #2b8b99;} .data.detail .inner .row-top .center .left .cla .con-2 {display: inline-block;padding:0px 0px 0px 10px;} .data.detail .inner .row-top .center .left .cla .con-2 .code {font-size:16px;color:#fff;line-height: 26px;} -.data.detail .inner .row-top .center .left .tit {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;max-height: 105px;overflow: hidden;} +.data.detail .inner .row-top .center .left .tit {font-size:24px;color:#fff;font-weight: 500;margin-bottom:20px;/*max-height: 105px;*/height:auto;overflow: hidden;} .data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;} .data.detail .inner .row-top .center .right .con-1 {display: inline-block;width:100%;height:100px;border-bottom:1px solid #ddd;text-align: right;margin-bottom: 30px;} .data.detail .inner .row-top .center .right .con-1 button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 500;text-align: center;border:1px solid #ddd;margin-top:55px;} From 5c61e67d5337084e45fcdabac83d4947f0760355 Mon Sep 17 00:00:00 2001 From: KNKIM Date: Mon, 13 Dec 2021 17:45:36 +0900 Subject: [PATCH 5/5] =?UTF-8?q?LOG4J=20=EB=B2=84=EC=A0=84=20=EC=97=85?= =?UTF-8?q?=EA=B7=B8=EB=A0=88=EC=9D=B4=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dad0f605..be6c718b 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 3.8.0 4.2.5.RELEASE 1.7.2 - 2.11.0 + 2.15.0