From 9c1570761a05bf2f8664a86966e65f12a0f0cf83 Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Wed, 13 Aug 2025 09:10:11 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B8=B0=EA=B4=80=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=20=EC=8B=A0=EA=B7=9C=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=8B=9C,=20=EB=B0=9C=EC=A3=BC=EA=B8=B0?=
 =?UTF-8?q?=EA=B4=80=EC=97=90=EC=84=9C=20=EC=9E=85=EB=A0=A5=ED=95=9C=20?=
 =?UTF-8?q?=EA=B1=B4=EC=84=A4=ED=98=84=EC=9E=A5=20=EC=A1=B0=ED=9A=8C?=
 =?UTF-8?q?=EB=8A=94=20=EC=A4=91=EB=B3=B5=EA=B2=80=EC=82=AC=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EC=A0=9C=EC=99=B8=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../geoinfo/main/login/LoginController.java   |  8 ++++---
 .../projectList/ProjectListController.java    |  2 +-
 .../drilling/inquiry/drilling_inquiry.jsp     | 22 ++++++++++++++-----
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java
index 0dda691a..77cdcf1f 100644
--- a/src/main/java/geoinfo/main/login/LoginController.java
+++ b/src/main/java/geoinfo/main/login/LoginController.java
@@ -2894,10 +2894,12 @@ public class LoginController {
 		byte[] digest = md.digest();
 		String shaHex = "";
 		shaHex = DatatypeConverter.printHexBinary(digest);
-		newPass = GeoinfoCommon.parseData(newPass);
-		newPass = ScriptUtil.getSha256(newPass, "UTF-8").substring(0, 20);
+		String newPassHash = GeoinfoCommon.parseData(newPass);
+		newPassHash = ScriptUtil.getSha256(newPassHash, "UTF-8").substring(0, 20);
     	
-		model.put("data", newPass);
+		model.put("data", newPassHash);
+		model.put("original", newPass);
+		model.put("notice", "# sharp is not supported");
 
 		return "jsonView";
 	}
diff --git a/src/main/java/geoinfo/regi/projectList/ProjectListController.java b/src/main/java/geoinfo/regi/projectList/ProjectListController.java
index 61622783..85718136 100644
--- a/src/main/java/geoinfo/regi/projectList/ProjectListController.java
+++ b/src/main/java/geoinfo/regi/projectList/ProjectListController.java
@@ -92,7 +92,7 @@ public class ProjectListController {
 					jsonObject.put("resultCode", "The name already exists.");
 					jsonObject.put("message", "해당 사업명이 이미 있습니다. 다른 사업명으로 입력해 주세요. code 2");
 				}
-			} else if( 0 < arrConstNameByProjectNameFromTempConstructSiteInfo.size() ) { 
+			} else if( false && 0 < arrConstNameByProjectNameFromTempConstructSiteInfo.size() ) { 
 				jsonObject.put("result", "false");
 				jsonObject.put("resultCode", "The name already exists.");
 				jsonObject.put("message", "해당 사업명이 이미 있습니다. 다른 사업명으로 입력해 주세요. code 3");
diff --git a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
index f7a57f76..4d77ce3a 100644
--- a/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
+++ b/src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
@@ -122,6 +122,10 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
     color: red;
   }
   
+  #const-state-code {
+  	width: 160px;
+  }
+  
 	
 </style>
 
@@ -209,10 +213,9 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                	let lastIndicator = Math.ceil(nPage / nCount) * 10;						// 현재 페이지의 마지막 페이지인디케이터 번호
                	let totalIndicator = Math.ceil(obj.count / nCount);						// 총 페이지인디케이터 번호
                 let pagingEleHTML = "<ul>"
-                if (!(firstIndicator-1) < 1) {
-                	pagingEleHTML += `<li data-npage="` + (firstIndicator-1) +`" class="page-button"><a href="#"><img src="/com/img/common/icon/ico_chevron.svg" alt="Chevron-prev" class="page-prev"></a></li>
-                    `;
-                } 
+               	if (!((firstIndicator - 1) < 1)) {
+               	    pagingEleHTML = pagingEleHTML + '<li data-npage="' + (firstIndicator - 1) + '" class="page-button"><a href="#"><img src="/com/img/common/icon/ico_chevron.svg" alt="Chevron-prev" class="page-prev"></a></li>';
+               	}
                             
                 for( let i = firstIndicator; i<lastIndicator+1; i++ ) {
                 	if (i <= totalIndicator) {
@@ -445,7 +448,16 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                                 <input type="date" id="const-start-date" name="const-start-date" >
                                 <span>~</span>
                                 <input type="date" id="const-end-date" name="const-end-date" >
-                                <input type="hidden" id="const-state-code" name="const-end-date">
+                                <input type="hidden" >	
+                                <select id="const-state-code" name="const-state-code">
+								    <option value="" selected="selected">전체</option>
+								    <option value="1">미입력</option>
+								    <option value="2">입력 중</option>
+								    <option value="3">검수 준비 대기중</option>
+								    <option value="4">검수 중</option>
+								    <option value="6">수정 요청</option>
+								    <option value="7">등록 완료</option>
+								</select>
                             </form>
                             <form class="form-inline-row">
                                 <input type="text" id="company-dept" name="company-dept" class="input input-1" placeholder="담당부서,건설사명" title="" value="">