build: remove list.txt git list
parent
87306a7636
commit
8dc6ffe035
|
|
@ -3,7 +3,7 @@ setlocal enabledelayedexpansion
|
||||||
|
|
||||||
set source_prefix=src\main\webapp\
|
set source_prefix=src\main\webapp\
|
||||||
set target_prefix=C:\Users\dbnt\eclipse-workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_eGov_work\
|
set target_prefix=C:\Users\dbnt\eclipse-workspace\.metadata\.plugins\org.eclipse.wst.server.core\tmp0\wtpwebapps\geoinfo_eGov_work\
|
||||||
set target_directory=C:\Users\dbnt\git\dbnt\geoinfo.or.kr\geoinfo_eGov_work\
|
set target_directory=D:\git\dbnt\geoinfo.or.kr\geoinfo_eGov_work\
|
||||||
|
|
||||||
set source_file=
|
set source_file=
|
||||||
set target_file=
|
set target_file=
|
||||||
|
|
|
||||||
23
list.txt
23
list.txt
|
|
@ -1,19 +1,10 @@
|
||||||
src\main\resources\egovframework\egovProps\globals.properties
|
#src\main\resources\egovframework\egovProps\globals.properties
|
||||||
src\main\webapp\com\css\common.v2.0.css
|
src\main\webapp\com\css\common.v2.0.css
|
||||||
src\main\webapp\com\css\common.v2.0.css.map
|
src\main\webapp\com\css\common.v2.0.css.map
|
||||||
src\main\webapp\js\map\main\section.js
|
|
||||||
src\main\webapp\web\rex\holeForMap.reb
|
|
||||||
src\main\webapp\WEB-INF\clipreport4\DataConnection.properties
|
|
||||||
src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp
|
src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp
|
||||||
src\main\webapp\WEB-INF\views\drilling\inquiry\drilling_inquiry.jsp
|
src\main\webapp\js\map\main\map.js
|
||||||
src\main\resources\egovframework\sqlmap\mapper\drilling\input\DrillingInputMapper.xml
|
src\main\java\geoinfo\map\left\service\impl\MapLeftServiceImpl.java
|
||||||
src\main\webapp\WEB-INF\views\drilling\home\drilling_index.jsp
|
src\main\resources\egovframework\sqlmap\mapper\map\MapLeft_SQL.xml
|
||||||
src\main\webapp\com\img\drilling\logos\06.svg
|
src\main\webapp\proxyo2map.jsp
|
||||||
src\main\webapp\com\img\drilling\logos\07.svg
|
src\main\resources\egovframework\sqlmap\mapper\map\MapMain_SQL.xml
|
||||||
src\main\webapp\com\img\drilling\logos\08.svg
|
src\main\resources\egovframework\sqlmap\mapper\map\MapControl_SQL.xml
|
||||||
src\main\webapp\com\img\drilling\logos\09.svg
|
|
||||||
src\main\webapp\com\img\drilling\logos\10.svg
|
|
||||||
src\main\webapp\com\img\drilling\logos\28.svg
|
|
||||||
src\main\webapp\com\img\drilling\logos\43.svg
|
|
||||||
src\main\webapp\com\img\drilling\maps\map.svg
|
|
||||||
src\main\webapp\WEB-INF\views\drilling\common\includeTopMenu.jsp
|
|
||||||
|
|
@ -53,6 +53,7 @@ public class MapLeftServiceImpl implements MapLeftService{
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public List<EgovMap> getAllAreaSearchList(Map<String, Object> params) throws Exception {
|
public List<EgovMap> getAllAreaSearchList(Map<String, Object> params) throws Exception {
|
||||||
|
params.get("");
|
||||||
return mapLeftMapper.getAllAreaSearchList(params);
|
return mapLeftMapper.getAllAreaSearchList(params);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -390,8 +390,18 @@
|
||||||
|
|
||||||
<select id="selectWebCartIndex" parameterType="map" resultType="egovMap">
|
<select id="selectWebCartIndex" parameterType="map" resultType="egovMap">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
SELECT IDX, SELECT_CODE, HOLE_CODE FROM WEB_CART
|
SELECT
|
||||||
|
IDX, SELECT_CODE, HOLE_CODE
|
||||||
|
FROM
|
||||||
|
(
|
||||||
|
SELECT *
|
||||||
|
FROM WEB_CART
|
||||||
WHERE TRIM(USERID) = #{userId}
|
WHERE TRIM(USERID) = #{userId}
|
||||||
|
AND CART_TYPE = 'CTP002'
|
||||||
|
ORDER BY IDX DESC
|
||||||
|
)
|
||||||
|
WHERE
|
||||||
|
ROWNUM = 1
|
||||||
]]>
|
]]>
|
||||||
<if test="metadataId != '' and metadataId != null and metadataId != 'null' and metadataId != 'NULL'">
|
<if test="metadataId != '' and metadataId != null and metadataId != 'null' and metadataId != 'NULL'">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
|
|
@ -429,7 +439,16 @@
|
||||||
|
|
||||||
<select id="selectWebCartUserId" parameterType="map" resultType="egovMap">
|
<select id="selectWebCartUserId" parameterType="map" resultType="egovMap">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
select select_code from web_cart where userid= #{userId} and cart_type='CTP002'
|
SELECT
|
||||||
|
SELECT_CODE
|
||||||
|
FROM (
|
||||||
|
SELECT SELECT_CODE, IDX
|
||||||
|
FROM WEB_CART
|
||||||
|
WHERE TRIM(USERID) = #{userId}
|
||||||
|
AND CART_TYPE = 'CTP002'
|
||||||
|
ORDER BY IDX DESC
|
||||||
|
)
|
||||||
|
WHERE ROWNUM = 1
|
||||||
]]>
|
]]>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -216,7 +216,7 @@
|
||||||
AND NVL(A.USE_YN,' ') <> 'N'
|
AND NVL(A.USE_YN,' ') <> 'N'
|
||||||
]]>
|
]]>
|
||||||
|
|
||||||
<if test="masterCompanyCode != null and masterCompanyProjectCodes !=''">
|
<if test="masterCompanyCode != null and masterCompanyProjectCodes != null and masterCompanyProjectCodes !=''">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
AND TRIM(a.PROJECT_CODE) IN( ${masterCompanyProjectCodes} )
|
AND TRIM(a.PROJECT_CODE) IN( ${masterCompanyProjectCodes} )
|
||||||
]]>
|
]]>
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,16 @@
|
||||||
|
|
||||||
<select id="selectWebSelectCode" parameterType="map" resultType="egovMap">
|
<select id="selectWebSelectCode" parameterType="map" resultType="egovMap">
|
||||||
<![CDATA[
|
<![CDATA[
|
||||||
SELECT SELECT_CODE FROM WEB_CART
|
SELECT
|
||||||
WHERE TRIM(USERID) = #{userId} AND CART_TYPE = 'CTP002'
|
SELECT_CODE
|
||||||
|
FROM (
|
||||||
|
SELECT SELECT_CODE, IDX
|
||||||
|
FROM WEB_CART
|
||||||
|
WHERE TRIM(USERID) = #{userId}
|
||||||
|
AND CART_TYPE = 'CTP002'
|
||||||
|
ORDER BY IDX DESC
|
||||||
|
)
|
||||||
|
WHERE ROWNUM = 1
|
||||||
]]>
|
]]>
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -216,17 +216,17 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
|
||||||
<tr>
|
<tr>
|
||||||
<th>발주기관</th>
|
<th>발주기관</th>
|
||||||
<td colspan="3">
|
<td colspan="3">
|
||||||
<input type="text" value="토목과" class="input-box information1" id="master-company-dept-` + tableId + `" placeholder="담당부서">
|
<input type="text" class="input-box information1" id="master-company-dept-` + tableId + `" placeholder="담당부서">
|
||||||
<input type="text" value="홍길동" class="input-box information2" id="master-company-admin-` + tableId + `" placeholder="담당자">
|
<input type="text" value="홍길동" class="input-box information2" id="master-company-admin-` + tableId + `" placeholder="담당자">
|
||||||
<input type="text" value="02-1234-5678" class="input-box information3" id="master-company-tel-` + tableId + `" placeholder="담당자 연락처">
|
<input type="text" value="02-0000-0000" class="input-box information3" id="master-company-tel-` + tableId + `" placeholder="담당자 연락처">
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<th>건설사</th>
|
<th>건설사</th>
|
||||||
<td colspan="3">
|
<td colspan="3">
|
||||||
<input type="text" value="" class="input-box information1" id="const-company-dept-` + tableId + `" placeholder="건설사명">
|
<input type="text" value="OOO건설" class="input-box information1" id="const-company-dept-` + tableId + `" placeholder="건설사명">
|
||||||
<input type="text" value="" class="input-box information2" id="const-company-admin-` + tableId + `" placeholder="담당자">
|
<input type="text" value="" class="input-box information2" id="const-company-admin-` + tableId + `" placeholder="담당자">
|
||||||
<input type="text" value="" class="input-box information3" id="const-company-tel-` + tableId + `" placeholder="담당자 연락처">
|
<input type="text" value="010-0000-0000" class="input-box information3" id="const-company-tel-` + tableId + `" placeholder="담당자 연락처">
|
||||||
<label class="check-box unselected-constructor-label" for="unselected-constructor-` + tableId + `"><input type="checkbox" id="unselected-constructor-` + tableId + `">
|
<label class="check-box unselected-constructor-label" for="unselected-constructor-` + tableId + `"><input type="checkbox" id="unselected-constructor-` + tableId + `">
|
||||||
<span class="unselected-constructor-label-text">건설사 미선정</span>
|
<span class="unselected-constructor-label-text">건설사 미선정</span>
|
||||||
</label>
|
</label>
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -13,10 +13,14 @@
|
||||||
request.setCharacterEncoding("UTF-8");
|
request.setCharacterEncoding("UTF-8");
|
||||||
|
|
||||||
final String O2MAP_WMS_URL = EgovProperties.getProperty("O2MAP.wms.url") == null ? null : EgovProperties.getProperty("O2MAP.wms.url").trim();
|
final String O2MAP_WMS_URL = EgovProperties.getProperty("O2MAP.wms.url") == null ? null : EgovProperties.getProperty("O2MAP.wms.url").trim();
|
||||||
|
final String LOCAL_WMS_URL = EgovProperties.getProperty("LOCAL.wms.url") == null ? null : EgovProperties.getProperty("LOCAL.wms.url").trim();
|
||||||
|
|
||||||
|
|
||||||
// post, get에서 쓸 url
|
// post, get에서 쓸 url
|
||||||
String reqUrl = "http://218.232.234.166/o2map/services/wms";
|
String reqUrl = "http://218.232.234.166/o2map/services/wms";
|
||||||
if( O2MAP_WMS_URL != null ) {
|
if( LOCAL_WMS_URL != null ) {
|
||||||
|
reqUrl = LOCAL_WMS_URL;
|
||||||
|
} else if( O2MAP_WMS_URL != null ) {
|
||||||
reqUrl = O2MAP_WMS_URL;
|
reqUrl = O2MAP_WMS_URL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue