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

Compare commits

base: DBNT:812a10b0044c5d9fcb54cd76e5e0bb6a14b3fa52
Branches Tags
DBNT:main
DBNT:master
DBNT:cks
...
compare: DBNT:927058d733219307c3631d70a87543799b303e6a
Branches Tags
DBNT:main
DBNT:master
DBNT:cks

2 Commits
812a10b004 ... 927058d733

Author SHA1 Message Date
thkim 927058d733 feat: 검수등록대기에서 처리상태 변경시 공급일시를 기준으로 정렬되도록 개선 2025-11-18 15:03:27 +09:00
thkim 8a7798c69f feat: 발주기관 한국철도공사 Korail 로그인 시 로고 안 보이는 문제 수정 건 2025-11-17 16:24:10 +09:00
5 changed files with 93 additions and 16 deletions
Show Stats Expand all files Collapse all files

10
src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java
View File

@ -142,6 +142,10 @@ public class DrillingInputServiceImpl implements DrillingInputService {
Long lCid = MyUtil.getLongFromObject( params.get("CID") );
if( lCid == null ) {
tbl = drillingInputMapper.getItemByProjectCode( params );
if( tbl == null ) {
// 발주기관 프로젝트 아님
return params;
}
params.put("CID", tbl.get("cid"));
} else {
tbl = drillingInputMapper.getItemByCid( params );
@ -187,7 +191,11 @@ public class DrillingInputServiceImpl implements DrillingInputService {
Long lCid = MyUtil.getLongFromObject( params.get("CID") );
if( lCid == null ) {
tbl = drillingInputMapper.getItemByProjectCode( params );
params.put("CID", tbl.get("cid"));
if( tbl != null ) {
params.put("CID", tbl.get("cid"));
} else {
return params;
}
} else {
tbl = drillingInputMapper.getItemByCid( params );
}

6
src/main/resources/egovframework/sqlmap/mapper/regi/manageList.xml
View File

@ -243,15 +243,15 @@
</when>
<!-- 처리상태 정렬 -->
<when test="sortField == 'stateName' and sortDir == 'asc'">
DECODE(T.STATE, '1', 1, '2', 2, '3', 3, '5', 4) ASC, OB.MODIFY_CALL_DATE ASC, T.DATETIME ASC, OC.DATETIME ASC
DECODE(T.STATE, '1', 1, '2', 2, '3', 3, '5', 4) ASC, OC.DATETIME DESC NULLS LAST
</when>
<!-- 처리상태 역순 정렬 -->
<when test="sortField == 'stateName' and sortDir == 'desc'">
DECODE(T.STATE, '5', 1, '3', 2, '2', 3, '1', 4) ASC, OB.MODIFY_CALL_DATE ASC, T.DATETIME ASC, OC.DATETIME ASC
DECODE(T.STATE, '5', 1, '3', 2, '2', 3, '1', 4) ASC, OC.DATETIME ASC NULLS FIRST
</when>
<!-- [등록] 역순 정렬 -->
<when test="sortField == 'ins' and sortDir == 'asc'">
DECODE(T.STATE, '3', 1, '1', 2, '2', 3, '5', 4) ASC, OB.MODIFY_CALL_DATE ASC, T.DATETIME ASC, OC.DATETIME ASC
DECODE(T.STATE, '3', 1, '1', 2, '2', 3, '5', 4) ASC, OB.MODIFY_CALL_DATE DESC NULLS LAST, T.DATETIME ASC, OC.DATETIME ASC
</when>
</choose>
<![CDATA[

8
src/main/webapp/WEB-INF/views/drilling/home/drilling_index.jsp
View File

@ -157,7 +157,7 @@
<!-- 국가철도공단 -->
<div class="region-item" id="region-item-08">
<c:if test="${masterCompanyCode == '9402'}">
<div class="region-logo" id="region-logo-08" title="국가철도동단"></div>
<div class="region-logo" id="region-logo-08" title="국가철도공단"></div>
<div class="region-alone" id="region-alone-08" title="국가철도동단 영역">
<div class="region-map" id="region-map-08" title="국가철도동단 위치">
<p>국가철도공단</p>
@ -180,7 +180,7 @@
<!-- 한국철도공사 -->
<div class="region-item" id="region-item-10">
<c:if test="${masterCompanyCode == '903'}">
<c:if test="${masterCompanyCode == '903' || masterCompanyCode == '671'}">
<div class="region-logo" id="region-logo-10" title="한국철도공사"></div>
<div class="region-alone" id="region-alone-10" title="한국철도공사 영역">
<div class="region-map" id="region-map-10" title="한국철도공사 위치">
@ -414,8 +414,8 @@
<ul class="wrap_service">
<li class="item01"><a href='javascript:void(0);' onclick="onClickBtnViewOnMap()"><i>관할지도 보기</i></a></li>
<li class="item02"><a href="/drilling/inquiry-project.do"><i>관리 시추정보 현황</i></a></li>
<li class="item03"><a href="/drilling/input.do"><i>건설현장 입력</i></a></li>
<li class="item04"><a href="/drilling/inquiry.do"><i>건설현장 조회</i></a></li>
<li class="item03"><a href="/drilling/inquiry.do"><i>건설현장 조회</i></a></li>
<li class="item04"><a href="/drilling/input.do"><i>건설현장 입력</i></a></li>
</ul>
<!-- //메뉴 서비스 -->

40
src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp
View File

@ -1372,7 +1372,7 @@ function table3display(){
}
</script>
<div class="map-division-wrapper">
<div class="map-division-title">
<div class="map-division-title" onclick="forceUncheckHoleLayerOnOff();">
지도구분
</div>
<div class="map-division-contents">
@ -1637,7 +1637,7 @@ function table3display(){
</li>
</ul>
</li>
<li class="closed">
<li class="closed" style="display: none;">
<span>지반조사</span>
<ul>
<li>
@ -1652,26 +1652,56 @@ function table3display(){
<li class="closed">
<span>지반정보</span>
<ul>
<li>
<li style="display: none;">
<input id="hole34" name="hole34" type="checkbox" value="checkbox" onclick="hole_layerOnOff();">
<label for="hole34">
<div class="icon-legend" style="background-color: #555555;"></div>
<span class="folder">지질정보(암상_면)</span>
</label>
</li>
<li>
<li style="display: none;">
<input id="hole35" name="hole35" type="checkbox" value="checkbox" onclick="hole_layerOnOff();">
<label for="hole35">
<div class="icon-legend" style="background-color: #666666;"></div>
<span class="folder">지질정보(단층)</span>
</label>
</li>
<li>
<li style="display: none;">
<input id="hole36" name="hole36" type="checkbox" value="checkbox" onclick="hole_layerOnOff();">
<label for="hole36">
<div class="icon-legend" style="background-color: #777777;"></div>
<span class="folder">관정정보</span>
</label>
</li>
<li>
<input id="geology-mode" name="geology-mode" type="checkbox" value="checkbox" onclick="geologyMode();">
<label for="geology-mode">
<span class="folder">지질정보</span>
</label>
</li>
<li>
<input id="geology-mine" name="geology-mine" type="checkbox" value="checkbox" onclick="geologyMine();">
<label for="geology-mine">
<span class="folder">광산정보</span>
</label>
</li>
<li>
<input id="geology-well" name="geology-well" type="checkbox" value="checkbox" onclick="geologyWell();">
<label for="geology-well">
<span class="folder">관정정보</span>
</label>
</li>
<li>
<input id="geology-steep-slope" name="geology-steep-slope" type="checkbox" value="checkbox" onclick="geologySteepSlope();">
<label for="geology-steep-slope">
<span class="folder">급경사지정보</span>
</label>
</li>
<li>
<input id="geology-resistivity-survey" name="geology-steep-slope" type="checkbox" value="checkbox" onclick="geologyResistivitySurvey();">
<label for="geology-resistivity-survey">
<span class="folder">물리탐사</span>
</label>
</li>
</ul>
</li>

45
src/main/webapp/js/map/main/map.js
View File

@ -209,8 +209,8 @@ function hole_layerOnOff() {
function forceUncheckHoleLayerOnOff() {
//33 글자여야한다.
//var returnValue = "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY";
if( false ) {
var returnValue = "YNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY";
if( true ) {
var returnValue = "NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNY";
for (i = 1; i <= 33; i++) {
var char = returnValue.charAt(i);
if( char==='Y') {
@ -317,7 +317,7 @@ var VWORLD_URL = "https://xdworld.vworld.kr/2d/Base/service/${z}/${x}/${y}.png
// TBL_HEADER_HOLE 설정
// ------------------------------
var T_HOLE = "TBL_HEADER_HOLE";
var T_WEB_STEEP_SLOPE = "WEB_STEEP_SLOPE"; // 급경사지
var T_WEB_STEEP_SLOPE = "WEB_STEEP_SLOPE"; //"";
var T_HOLE_M = "TBL_HEADER_HOLE_M";
var F_PROJECT_CODE = "PROJECT_CODE";
@ -5406,4 +5406,43 @@ function geologySteepSlope() {
alert('급경사지 정보는 빨간색 선으로 보여집니다.');
}
}
//물리탐사
function geologyResistivitySurvey() {
initControl(); // 다른 컨트롤 상태 초기화
// STEEP_SLOPE_LAYER 가 정상적으로 생성되었는지 확인
if (!STEEP_SLOPE_LAYER) {
console.error("급경사지 레이어가 초기화되지 않았습니다.");
return;
}
// 현재 레이어의 표시 상태를 가져옵니다.
var isVisible = STEEP_SLOPE_LAYER.getVisibility();
if (isVisible ) {
// 레이어가 현재 보이고 있다면, 숨깁니다.
STEEP_SLOPE_LAYER.setVisibility(false);
CTL_INFO.setText("급경사지 Off");
CTL_INFO.deactivate(); // 정보창도 비활성화
} else {
// 레이어를 보이게 설정하고 강제로 다시 그립니다.
STEEP_SLOPE_LAYER.setVisibility(true);
STEEP_SLOPE_LAYER.redraw(true);
// CTL_INFO의 infoDiv가 내부 요소를 absolute 포지셔닝할 수 있도록 'relative'로 설정
$(CTL_INFO.infoDiv).css("position", "relative");
// CTL_INFO 텍스트 설정 시 버튼 HTML을 함께 삽입
CTL_INFO.setText("급경사지 On");
CTL_INFO.activate();
$("#CTL_INFO").css("bottom", "65px");
$("#CTL_INFO").css("left", "20px");
alert('급경사지 정보는 빨간색 선으로 보여집니다.');
}
}