DBNT
/
geoinfo_eGov_work
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

기관사용자 신규 프로젝트 생성 시, 발주기관에서 입력한 건설현장 조회는 중복검사에서 제외처리

main
thkim 2025-08-13 09:10:11 +09:00
parent ff8f9f6fcb
commit 9c1570761a
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/geoinfo/main/login/LoginController.java
View File

@ -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";
}

2
src/main/java/geoinfo/regi/projectList/ProjectListController.java
View File

@ -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");

20
src/main/webapp/WEB-INF/views/drilling/inquiry/drilling_inquiry.jsp
View File

@ -122,6 +122,10 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
color: red;
}
#const-state-code {
width: 160px;
}
</style>
@ -209,9 +213,8 @@ 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++ ) {
@ -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="">