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

feat: 검수등록대기에서 처리상태 변경시 공급일시를 기준으로 정렬되도록 개선

main
thkim 2025-11-18 15:03:27 +09:00
parent 8a7798c69f
commit 927058d733
3 changed files with 77 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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[

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

@ -1637,7 +1637,7 @@ function table3display(){
</li>
</ul>
</li>
<li class="closed">
<li class="closed" style="display: none;">
<span>지반조사</span>
<ul>
<li>
@ -1652,27 +1652,57 @@ 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>
<li class="closed">

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

@ -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";
@ -5407,3 +5407,42 @@ function geologySteepSlope() {
}
}
//물리탐사
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('급경사지 정보는 빨간색 선으로 보여집니다.');
}
}