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

feat: 발주기관 사용자가 자신의 프로젝트만 검색되도록 수정

main
thkim 2025-11-11 15:07:24 +09:00
parent d4117d5d09
commit 3ac28ed8a8
8 changed files with 59 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/geoinfo/drilling/home/service/DrillingHomeService.java
View File

@ -10,5 +10,5 @@ public interface DrillingHomeService {
public List<EgovMap> drillingMapSearchHole(String projectCode);
public List<EgovMap> drillingMapSearchHoleWithMbr(HashMap<String, Object> params);
public String projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception;
public List<String> projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception;
}

6
src/main/java/geoinfo/drilling/home/service/impl/DrillingHomeServiceImpl.java
View File

@ -45,7 +45,7 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
}
@Override
public String projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception {
public List<String> projectCodesByProjectMasterCompanyCodeAsList(HashMap<String, Object> params) throws Exception {
if( params.get("COM_CODE") == null ) {
throw new Exception("comCode 값은 필수입니다.");
}
@ -59,6 +59,7 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
if (projectCodes == null || projectCodes.isEmpty()) {
return null;
}
/*
// 2. StringBuilder를 사용해 쉼표(,)로 문자열을 조합합니다.
StringBuilder sb = new StringBuilder();
@ -71,6 +72,9 @@ public class DrillingHomeServiceImpl implements DrillingHomeService {
// 3. 조합된 문자열을 반환합니다.
return sb.toString();
*/
return projectCodes;
}

10
src/main/java/geoinfo/map/left/MapLeftController.java
View File

@ -328,16 +328,16 @@ public class MapLeftController {
// 발주기관 프로젝트 코드만 조회
String masterCompanyCode = null;
String masterCompanyProjectCodes = null;
List<String> masterCompanyProjectCodes = null;
if( params.get("masterCompanyCode") != null ) {
masterCompanyCode = GeoinfoCommon.parseData(params.get("masterCompanyCode").toString().trim());
HashMap<String, Object> paramsMasterCompanyCode = new HashMap<String, Object>();
paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode);
masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsList(paramsMasterCompanyCode);
//HashMap<String, Object> paramsMasterCompanyCode = new HashMap<String, Object>();
//paramsMasterCompanyCode.put("COM_CODE", masterCompanyCode);
//masterCompanyProjectCodes = drillingHomeService.projectCodesByProjectMasterCompanyCodeAsList(paramsMasterCompanyCode);
params.put("masterCompanyCode", masterCompanyCode);
params.put("masterCompanyProjectCodes", masterCompanyProjectCodes);
//params.put("masterCompanyProjectCodes", masterCompanyProjectCodes);
}

1
src/main/java/geoinfo/map/left/service/impl/MapLeftServiceImpl.java
View File

@ -55,7 +55,6 @@ public class MapLeftServiceImpl implements MapLeftService{
@Override
public List<EgovMap> getAllAreaSearchList(Map<String, Object> params) throws Exception {
params.get("");
return mapLeftMapper.getAllAreaSearchList(params);
}

9
src/main/resources/egovframework/sqlmap/mapper/map/MapCoordSearch_SQL.xml
View File

@ -15,6 +15,11 @@
<![CDATA[
NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
]]>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="tmX != ''">
<![CDATA[
AND HOLE_LOCATION_TM_X - 100 <= #{tmX}
@ -48,6 +53,10 @@
]]>
A.PROJECT_CODE = B.PROJECT_CODE
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="tmX != ''">
<![CDATA[
AND DECODE(sign(HOLE_LOCATION_TM_X),-1,FLOOR(HOLE_LOCATION_TM_X)+1,FLOOR(HOLE_LOCATION_TM_X))-100 <= #{tmX}

17
src/main/resources/egovframework/sqlmap/mapper/map/MapLeft_SQL.xml
View File

@ -24,6 +24,10 @@
AND NVL(A.USE_YN,' ') <> 'N'
]]>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="gugun != 'all'">
<![CDATA[
AND (B.HOLE_LOCATION_TM_X >= C.MINX AND B.HOLE_LOCATION_TM_X <= C.MAXX)
@ -62,6 +66,10 @@
AND NVL(A.USE_YN,' ') <> 'N'
]]>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="gugun != 'all'">
<![CDATA[
AND (B.HOLE_LOCATION_TM_X >= C.MINX AND B.HOLE_LOCATION_TM_X <= C.MAXX)
@ -161,6 +169,9 @@
WHERE NVL(A.USE_YN,' ') <> 'N' AND NVL(B.USE_YN,' ') <> 'N' AND A.PROJECT_CODE = B.PROJECT_CODE
AND NVL(A.USE_YN,' ') <> 'N'
]]>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="gugun != 'all'">
<![CDATA[
@ -216,10 +227,8 @@
AND NVL(A.USE_YN,' ') <> 'N'
]]>
<if test="masterCompanyCode != null and masterCompanyProjectCodes != null and masterCompanyProjectCodes !=''">
<![CDATA[
AND TRIM(a.PROJECT_CODE) IN( ${masterCompanyProjectCodes} )
]]>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="gugun != 'all'">

9
src/main/resources/egovframework/sqlmap/mapper/map/MapProjectSearch_SQL.xml
View File

@ -29,6 +29,10 @@
]]>
</if>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="comClass != 'all'">
<![CDATA[
AND A.PROJECT_WORK_COMPANY_CODE = #{comClass}
@ -432,6 +436,11 @@
]]>
<if test="masterCompanyCode != null">
AND TRIM(A.PROJECT_MASTER_COMPANY_CODE) = #{masterCompanyCode}
</if>
<if test="pName != ''">
<![CDATA[
AND A.PROJECT_NAME LIKE '%' || #{pname} || '%'

15
src/main/webapp/js/map/main/left/left.js
View File

@ -518,6 +518,11 @@ function onSichCheck() {
var params = $("#searchSichuForm").serialize();
if( getQueryString("masterCompanyCode") ) {
params += "&masterCompanyCode="+getQueryString("masterCompanyCode");
}
$.ajax({
url : "/map/mapSearchArea.do",
method : "post",
@ -541,6 +546,10 @@ function onSaupCheck() {
var params = $("#searchSaupForm").serialize();
if( getQueryString("masterCompanyCode") ) {
params += "&masterCompanyCode="+getQueryString("masterCompanyCode");
}
$.ajax({
url : "/map/projectSearch.do",
method : "post",
@ -627,6 +636,12 @@ function resultxyForm() {
openWaitWin();
var params = $("#searchLocateForm").serialize();
if( getQueryString("masterCompanyCode") ) {
params += "&masterCompanyCode="+getQueryString("masterCompanyCode");
}
var numberTrue = params;
if( (Object.is((Number(f.tmx.value) ), NaN)) || (Object.is((Number(f.tmy.value) ), NaN)) ){