From 9ddb7aaee9c1dd524e1f786453151d8d6b629f12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= <jiyoo@dbnt.co.kr>
Date: Mon, 22 Dec 2025 17:41:54 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20>=20=EA=B1=B4?=
 =?UTF-8?q?=EC=84=A4=ED=98=84=EC=9E=A5=EA=B4=80=EB=A6=AC=20>=EA=B1=B4?=
 =?UTF-8?q?=EC=84=A4=ED=98=84=EC=9E=A5=20=EC=A1=B0=ED=9A=8C=20:=20?=
 =?UTF-8?q?=EB=AA=A9=EB=A1=9D=EC=97=90=20=EB=B0=9C=EC=A3=BC=EC=B2=98=20?=
 =?UTF-8?q?=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admins/user/DrillingInquiryMapper.xml     | 56 ++++++++++++++++++-
 .../construction-site-index.jsp               | 22 ++++++--
 src/main/webapp/css/admins/sass/style.scss    |  2 +-
 src/main/webapp/css/admins/style.css          |  2 +-
 4 files changed, 73 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml
index 70d085e..549ae7f 100644
--- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml
+++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/DrillingInquiryMapper.xml
@@ -84,7 +84,7 @@
 	</select>
 	
 	<select id="spGetTblCsiByKeyword" parameterType="map" resultType="egovMap">		
-		SELECT * FROM TABLE(SP_GET_TBL_CSI_BY_KEYWORD(
+<!-- 		SELECT * FROM TABLE(SP_GET_TBL_CSI_BY_KEYWORD(
 			#{constTag, jdbcType=VARCHAR},
 			#{constName, jdbcType=VARCHAR},
 			#{constStartDate, jdbcType=VARCHAR},
@@ -102,7 +102,59 @@
 			#{sortfield},
 			#{sorttype},
 			#{nCount},
-			#{nPage}))
+			#{nPage}))	 -->
+			
+			SELECT A.*
+                 ,(/* 발주처명 */
+			       SELECT D1.DISTRICT
+			       FROM   GEOINFO.TBL_DISTRICT D1
+			       WHERE  D1.GL_CODE = A.MASTER_COMPANY_O_CODE
+			         AND  D1.GM_CODE IS NULL
+			         AND  D1.GS_CODE IS NULL
+			         AND  D1.USE_YN  = 'Y'
+			         AND  D1.DEL_YMD IS NULL
+			         AND  ROWNUM = 1
+			   	  ) AS GL_NAME
+			      ,(/* 소속산하기관 */
+			        SELECT D2.DISTRICT
+			        FROM   GEOINFO.TBL_DISTRICT D2
+			        WHERE  D2.GL_CODE = A.MASTER_COMPANY_O_CODE
+			          AND  D2.GM_CODE = A.MASTER_COMPANY_TW_CODE
+			          AND  D2.GS_CODE IS NULL
+			          AND  D2.USE_YN  = 'Y'
+			          AND  D2.DEL_YMD IS NULL
+			          AND  ROWNUM = 1
+			       ) AS GM_NAME
+                  ,(/* 하위기관 */
+			        SELECT D3.DISTRICT
+			        FROM   GEOINFO.TBL_DISTRICT D3
+			        WHERE  D3.GL_CODE = A.MASTER_COMPANY_O_CODE
+			          AND  D3.GM_CODE = A.MASTER_COMPANY_TW_CODE
+			          AND  D3.GS_CODE = A.MASTER_COMPANY_TH_CODE
+			          AND  D3.USE_YN  = 'Y'
+			          AND  D3.DEL_YMD IS NULL
+			          AND  ROWNUM = 1
+                    ) AS GS_NAME
+			FROM TABLE(SP_GET_TBL_CSI_BY_KEYWORD(
+				#{constTag, jdbcType=VARCHAR},
+				#{constName, jdbcType=VARCHAR},
+				#{constStartDate, jdbcType=VARCHAR},
+				#{constEndDate, jdbcType=VARCHAR},
+				#{constStateCode, jdbcType=VARCHAR},
+				#{masterCompanyOCode, jdbcType=VARCHAR},
+				#{masterCompanyTwCode, jdbcType=VARCHAR},
+				#{masterCompanyThCode, jdbcType=VARCHAR},
+				#{masterCompanyName, jdbcType=VARCHAR},
+				#{constCompanyName, jdbcType=VARCHAR},			
+				#{constComCodes, jdbcType=VARCHAR},
+				#{constCompanyAdmin, jdbcType=VARCHAR},
+				#{constCompanyTel, jdbcType=VARCHAR},
+				#{projectStateCode, jdbcType=VARCHAR},
+				#{sortfield},
+				#{sorttype},
+				#{nCount},
+				#{nPage})) A
+			
 	</select>
 	
 	<select id="getComCodes"  parameterType="map" resultType="String">		
diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp
index 30c5eaf..efd4ef9 100644
--- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp
+++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-site-index.jsp
@@ -81,14 +81,18 @@
                     const coinstCompanyDept     = obj.datas[idx].coinstCompanyDept == null ? '-' : obj.datas[idx].coinstCompanyDept;
                     const constCompanyAdmin     = obj.datas[idx].constCompanyAdmin == null ? '-' : obj.datas[idx].constCompanyAdmin;
                     const constCompanyTel       = obj.datas[idx].constCompanyTel == null ? '-' : obj.datas[idx].constCompanyTel;
+                    const glName       			= obj.datas[idx].glName == null ? '' : obj.datas[idx].glName + ' ';
+                    const gmName       			= obj.datas[idx].gmName == null ? '' : obj.datas[idx].gmName + ' ';
+                    const gsName       			= obj.datas[idx].gsName == null ? '' : obj.datas[idx].gsName + ' ';
                     
 //                  content += '<tr onclick="location.href=\'modify.do?CID=' + obj.datas[idx].cid + '\';" data-cid="' + obj.datas[idx].cid + '">';
                     content += '<tr <%--onmousedown="handleMouseDown()" onmousemove="handleMouseMove()" --%> onmouseup="handleRowClick(' + obj.datas[idx].cid + ')" data-cid="' + obj.datas[idx].cid + '">';
                     content += '<td>' + (obj.count - idx - (nCount * (nPage - 1))) + '</td>';
-                    content += '<td style="text-align: left; text-indent: 10px;">' + obj.datas[idx].constName + '</td>';
+                    content += '<td style="text-align: left; text-indent: 10px;" title="' + obj.datas[idx].constName + '">' + obj.datas[idx].constName + '</td>';
                     content += '<td>' + obj.datas[idx].projectStateCodeName + '</td>';
                     content += '<td>' + constStartDate + ' ~ ' + constEndDate + '</td>';
                     content += '<td>' + obj.datas[idx].constStateCodeName + '</td>';
+                    content += '<td>' + glName + gmName + gsName + '</td>';
                     content += '<td>' + masterCompanyDept + '</td>';
                     content += '<td>' + masterCompanyAdmin + '</td>';
                     content += '<td>' + masterCompanyTel + '</td>';
@@ -412,8 +416,8 @@ li {
     position_: absolute;
     background-color: white;
     display: none;
-    left: 82px;
-    top: 42px;
+    left: 23px;
+    top: 35px;
     z-index: 3;
   }
   #suggestionList div {
@@ -437,6 +441,12 @@ li {
 	padding: 6px 14px;
 	resize: none;
   }	
+  .drilling .table-wrap table td:nth-child(2) {
+	    max-width: 230px;
+	    text-overflow: ellipsis;
+	    white-space: nowrap;
+	    overflow: hidden;
+	}
 </style>
 </head>
 <body>
@@ -504,10 +514,11 @@ li {
                             <table>
                                 <colgroup>
                                     <col style="width: 3%;">
-                                    <col style="width: 27%;">
+                                    <col style="width: 17%;">
                                     <col style="width: 5%;">
                                     <col style="width: 10%;">
                                     <col style="width: 10%;">
+                                    <col style="width: 10%;">
                                     <col style="width: 13%;">
                                     <col style="width: 5%;">
                                     <col style="width: 7%;">
@@ -521,12 +532,13 @@ li {
                                     <th rowspan="2">사업명</th>
                                     <th rowspan="2">입력상태</th>
                                     <th colspan="2">사업내용</th>
-                                    <th colspan="3">발주기관현황</th>
+                                    <th colspan="4">발주기관현황</th>
                                     <th colspan="3">건설사현황</th>
                                 </tr>
                                 <tr>
                                     <th>사업기간</th>
                                     <th>사업단계 <br>(설계 시공 준공 유지관리)</th>
+                                    <th>발주처</th>
                                     <th>담당부서</th>
                                     <th>담당자</th>
                                     <th>담당연락처</th>
diff --git a/src/main/webapp/css/admins/sass/style.scss b/src/main/webapp/css/admins/sass/style.scss
index b627bfe..5ffaf0f 100644
--- a/src/main/webapp/css/admins/sass/style.scss
+++ b/src/main/webapp/css/admins/sass/style.scss
@@ -1049,7 +1049,7 @@ a:hover			{font-family: "굴림체"; font-size: 9pt; color: #FF8000;	text-decora
         text-align: center;
         color: #333;    
         height: 50px;
-        font-size: 14px;
+        font-size: 13px;
         line-height: 21px;
         border-top: 2px solid #114672;
         border-bottom: 2px solid #ddd;
diff --git a/src/main/webapp/css/admins/style.css b/src/main/webapp/css/admins/style.css
index 477443e..9caee80 100644
--- a/src/main/webapp/css/admins/style.css
+++ b/src/main/webapp/css/admins/style.css
@@ -1188,7 +1188,7 @@ a:hover {
   text-align: center;
   color: #333;
   height: 50px;
-  font-size: 14px;
+  font-size: 13px;
   line-height: 21px;
   border-top: 2px solid #114672;
   border-bottom: 2px solid #ddd;