From 66301827dce0d9aa536728bdf356b29d0158d2e9 Mon Sep 17 00:00:00 2001 From: kmg Date: Tue, 28 Nov 2023 10:47:59 +0900 Subject: [PATCH 1/4] =?UTF-8?q?2023/11/28=20=EC=B2=B4=ED=97=98=EA=B5=90?= =?UTF-8?q?=EC=8B=A4=20>=20=EC=9A=B4=EC=98=81=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=83=81=EB=8B=A8(=EA=B2=80?= =?UTF-8?q?=EC=83=89=EC=98=81=EC=97=AD)=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmEnd/exprnClsrmEndList.jsp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp index 036a5617..42a941fb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp @@ -53,16 +53,12 @@
-
-
-
- - ※ 각종 서류 제출은 하단 목록을 클릭하셔서 운영내역 -
    상세페이지에서 제출해주시기 바랍니다. +
+ ※ 각종 서류 제출은 하단 목록을 클릭하셔서 운영내역 상세페이지에서 제출해주시기 바랍니다.
    ('결과보고제출'버튼은 상세 페이지 하단에 있습니다) - - + +
+

신청일 : ${vEEduAplctVO.searchEndSbmtPnttm}

<%-- --%> From 536618fdc925e9eb9b7db0e7535a928e9d2f5150 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 28 Nov 2023 10:59:56 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=A0=80=EC=9E=91=EA=B6=8C=EC=B2=B4?= =?UTF-8?q?=ED=97=98=EA=B5=90=EC=8B=A4=20=EC=9A=B4=EC=98=81=EC=8B=A0?= =?UTF-8?q?=EC=B2=AD=20=EC=95=88=EB=82=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 4 +++- .../exprnClsrmInfo/exprnClsrmAplctGuide.jsp | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index adeed16a..2b3bac08 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -446,7 +446,9 @@ FROM lettnfiledetail WHERE atch_file_id = a.atch_file_id LIMIT 1 ) - AS atchFileNm + AS atchFileNm, + a.dprtm_nm AS dprtmNm , + a.cn_atch_file_id AS cnAtchFileId FROM ve_prcs_aplct_prd a WHERE 1 = 1 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp index b352088d..dca5d0b1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp @@ -87,16 +87,16 @@
-

+

-

담당부서

-

등록일

+

담당부서

+

등록일

- +
From 3b846ceb5c67836ba8ce29a30502e1fc2d700d90 Mon Sep 17 00:00:00 2001 From: kmg Date: Tue, 28 Nov 2023 12:50:28 +0900 Subject: [PATCH 3/4] =?UTF-8?q?2023/11/28=20=EA=B5=90=EC=9C=A1=EB=B0=B0?= =?UTF-8?q?=EC=B9=98=EA=B4=80=EB=A6=AC=20=EA=B2=80=EC=83=89=ED=99=94?= =?UTF-8?q?=EB=A9=B4=20=EC=A0=95=EB=A0=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oprtn/tngrVisitEdu/eduCnfrmMngList.jsp | 28 +++++++++---------- .../visitEdu/adm/publish/css/content.css | 3 ++ 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp index f5359c7a..59ad04a2 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp @@ -970,19 +970,18 @@

학교(기관)명

-
- +
+
+ -
-
- +
+
+ - - - - -
+ + +
@@ -991,13 +990,14 @@

강사명

-
+
+
-
-
+
+
-
+
diff --git a/src/main/webapp/visitEdu/adm/publish/css/content.css b/src/main/webapp/visitEdu/adm/publish/css/content.css index a466044f..15c3b9db 100644 --- a/src/main/webapp/visitEdu/adm/publish/css/content.css +++ b/src/main/webapp/visitEdu/adm/publish/css/content.css @@ -84,6 +84,9 @@ .btn_down_excel{ height: 40px; padding: 0 18px 0 41px; border: 1px solid #0e8040; margin-left: 2px; background-color: #f9f9f9; color: #0e803f; font-size: 16px; border-radius: 5px; box-sizing: border-box; letter-spacing: -0.5px; background-image: url(../image/content/btn_down_excel.png); background-repeat: no-repeat; background-position: 18px center; vertical-align: middle;} .btn_down_excel:hover{background-color: #f2f2f2;} +.right_box {text-align:right;} +.right_box .btn_type06 {font-size:16px; width:200px; padding:0 3px; margin:1px 0;} + /* 기타 input select type */ input[type="text"]:disabled,input[type="password"]:disabled{border: 1px solid #d5d5d5; background-color: #ededed; color: #888; height: 40px; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px;} input[type="text"],input[type="password"],select{height: 40px; border: 1px solid #d5d5d5; border-radius: 5px; padding: 0 0 0 14px; font-size: 16px; color: #222; box-sizing: border-box;} From bdabb31cc685a0656422dd510d0c56dbc059b37f Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 28 Nov 2023 12:51:19 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98,=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20=EA=B0=95?= =?UTF-8?q?=EC=82=AC=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20=EA=B0=95=EC=9D=98?= =?UTF-8?q?=EA=B3=84=ED=9A=8D=EC=84=9C=20=EC=A3=BC=EC=84=9D=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 2b3bac08..433c2c89 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -500,11 +500,12 @@ ,a.edu_strt_pnttm AS eduStrtPnttm ,a.edu_ddln_pnttm AS eduDdlnPnttm ,b.prcs_cn AS prcsCn - ,(SELECT lctr_plan_atch_file_id + + ,'' AS lctrPlanRsltAtchFileId FROM ve_prcs_aplct_prd a , ve_prcs b