fixed: 기본물성시험이 없는 사업 -999로 표기되는 문제 수정
parent
431381e25d
commit
2e71fc8cd7
13
list.txt
13
list.txt
|
|
@ -1,13 +1,2 @@
|
|||
#src\main\resources\egovframework\egovProps\globals.properties
|
||||
src\main\webapp\WEB-INF\views\visitEducationApplication\inquiry\visitEducationApplicationInquiry.jsp
|
||||
src\main\webapp\com\css\common.v2.0.css
|
||||
src\main\webapp\com\img\visitEducationApplication\chevron.svg
|
||||
src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Light.woff
|
||||
src\main\webapp\com\fonts\NotoSansKr\NotoSansKR-Light.woff2
|
||||
#'입력중인프로젝트 현황'에서 '검수등록대기 목록'으로 이동 기능 추가
|
||||
src\main\webapp\WEB-INF\views\web\manage\list_reg.jsp
|
||||
src\main\java\geoinfo\regi\listReg\ListRegController.java
|
||||
src\main\java\geoinfo\regi\listReg\service\ListRegService.java
|
||||
src\main\java\geoinfo\regi\listReg\service\impl\ListRegServiceImpl.java
|
||||
src\main\java\geoinfo\regi\listReg\service\ListRegMapper.java
|
||||
src\main\resources\egovframework\sqlmap\mapper\regi\listReg.xml
|
||||
src\main\webapp\web\service\SAMPLE.reb
|
||||
|
|
@ -27,18 +27,17 @@ public class WebConfirm
|
|||
|
||||
WebUtil wUtil = new WebUtil();
|
||||
|
||||
String user = "geoinfo";
|
||||
String pw = "geoinfo";
|
||||
//String pw = "dbnt060928!rlaxogh";
|
||||
//String user = "geoinfo";
|
||||
//String pw = "geoinfo";
|
||||
//String url = "jdbc:oracle:thin:@192.168.0.71:1521:orcl";
|
||||
/*String url = "jdbc:oracle:thin:@192.168.0.29:1521:xe";이전*/
|
||||
//String url = "jdbc:oracle:thin:@218.232.234.200:1521:orageodev"; // 실서버
|
||||
String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버
|
||||
//String url = "jdbc:oracle:thin:@118.219.150.34:1521:ORAGEODEV"; // DBNT 개발 서버
|
||||
//String url = "jdbc:oracle:thin:@grok-10:1521:ORAGEODEV"; // thkim local 개발 서버
|
||||
|
||||
public String thkimTestOracleUrl = EgovProperties.getProperty("Oracle.Url");
|
||||
public String thkimTestOracleId = EgovProperties.getProperty("Oracle.ID");
|
||||
public String thkimTestOraclePassword = EgovProperties.getProperty("Oracle.Password");
|
||||
String url = EgovProperties.getProperty("Oracle.Url").trim();
|
||||
String user = EgovProperties.getProperty("Oracle.ID").trim();
|
||||
String pw = EgovProperties.getProperty("Oracle.Password").trim();
|
||||
|
||||
/*
|
||||
* public WebConfirm() { this.connection = null; this.connectionPool = null;
|
||||
|
|
@ -47,16 +46,20 @@ public class WebConfirm
|
|||
*/
|
||||
public boolean ConfirmProject(HttpServletRequest request, final String PROJECT_CODE) {
|
||||
|
||||
System.out.println(
|
||||
"\n--------------------------------------------------------------\n" +
|
||||
request.getRequestURI() + " " + " ConfirmProject" +
|
||||
"\n--------------------------------------------------------------\n" +
|
||||
"thkimTestOracleUrl:[" + thkimTestOracleUrl + "]\n" +
|
||||
"thkimTestOracleId:[" + thkimTestOracleId + "]\n" +
|
||||
"thkimTestOraclePassword:[" + thkimTestOraclePassword + "]\n" +
|
||||
"\n--------------------------------------------------------------\n"
|
||||
);
|
||||
|
||||
if( url == null || url.isEmpty() || user == null || user.isEmpty() || pw == null || pw.isEmpty() ) {
|
||||
System.out.println(
|
||||
"\n--------------------------------------------------------------\n" +
|
||||
request.getRequestURI() + " " + " ConfirmProject" +
|
||||
"\n--------------------------------------------------------------\n" +
|
||||
"url:[" + (url == null || url.isEmpty()) + "]\n" +
|
||||
"user:[" + (user == null || user.isEmpty()) + "]\n" +
|
||||
"pw:[" + (pw == null || pw.isEmpty()) + "]\n" +
|
||||
"\n--------------------------------------------------------------\n"
|
||||
);
|
||||
|
||||
}
|
||||
|
||||
try {
|
||||
Class.forName("oracle.jdbc.driver.OracleDriver");
|
||||
connection = DriverManager.getConnection(url,user,pw);
|
||||
|
|
|
|||
|
|
@ -295,11 +295,11 @@ public class CommunityController {
|
|||
@RequestMapping(value = "/cmuboard_read.do")
|
||||
public ModelAndView cmuboard_read(@RequestParam Map<String, Object> params, HttpServletRequest request, HttpServletResponse response, @RequestParam("id") int id) throws Exception {
|
||||
ModelAndView mv = new ModelAndView("body/cmuboard/cmuboard_read");
|
||||
|
||||
|
||||
Map<String, Object> result = communityService.selectContent(id);
|
||||
|
||||
|
||||
if (result != null) {
|
||||
if ((result.get("email") != null && result.get("name") != null)) {
|
||||
if ( false && (result.get("email") != null && result.get("name") != null)) {
|
||||
mv.addObject("EM", "<a href=mailto:" + result.get("email") + ">" + result.get("name") + "</a>");
|
||||
} else {
|
||||
mv.addObject("EM", result.get("name"));
|
||||
|
|
|
|||
|
|
@ -779,6 +779,11 @@ public class HeaderController {
|
|||
|
||||
//INSERT TEMP_HEADER
|
||||
}
|
||||
|
||||
//케이싱심도의 -(hyphen 값 입력을 허용한다. 케이싱심도값이 없는 경우, -999로 변환하여 저장한다. 왜냐하면 케이싱심도가 저장되는 column이 숫자만 들어가기 때문이다.
|
||||
if( oHOLE_CASING_DEPTH.equals("-") ) {
|
||||
oHOLE_CASING_DEPTH = "-999";
|
||||
}
|
||||
|
||||
//PARAM SET
|
||||
params.put("PROJECT_CODE",oPROJECT_CODE );
|
||||
|
|
|
|||
|
|
@ -422,7 +422,12 @@ public class InfoController {
|
|||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (oPROJECT_CODE != null && "".equals(oPROJECT_CODE) == false && oPROJECT_HOLE_NUMBER != null && "".equals(oPROJECT_HOLE_NUMBER) == false ) {
|
||||
params.put("PROJECT_CODE", oPROJECT_CODE);
|
||||
params.put("HOLE_NUMBER", oPROJECT_HOLE_NUMBER);
|
||||
int nReturn = infoService.updateMetaHoleNumber(params);
|
||||
}
|
||||
model.put("msg", "저장 성공");
|
||||
} catch (ParseException e) {
|
||||
model.put("msg", "저장 실패");
|
||||
|
|
|
|||
|
|
@ -42,7 +42,10 @@ public interface InfoMapper {
|
|||
|
||||
void updateTempExpertOpinion(HashMap<String, Object> params) throws Exception;
|
||||
|
||||
List<EgovMap> getGDisCode(Map<String, Object> params);
|
||||
List<EgovMap> getGDisCode(Map<String, Object> params);
|
||||
|
||||
int updateMetaHoleNumber(HashMap<String, Object> params) throws Exception;
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -42,5 +42,7 @@ public interface InfoService {
|
|||
void updateTempExpertOpinion(HashMap<String, Object> params) throws Exception;
|
||||
|
||||
List<EgovMap> getGDisCode(Map<String, Object> params);
|
||||
|
||||
public int updateMetaHoleNumber(HashMap<String, Object> params) throws Exception;
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -103,4 +103,11 @@ public class InfoServiceImpl implements InfoService {
|
|||
public List<EgovMap> getGDisCode(Map<String, Object> params) {
|
||||
return infoMapper.getGDisCode(params);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public int updateMetaHoleNumber(HashMap<String, Object> params) throws Exception {
|
||||
return infoMapper.updateMetaHoleNumber(params);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -276,4 +276,15 @@
|
|||
AND DISTRICT = #{gdis}
|
||||
</select>
|
||||
|
||||
<update id="updateMetaHoleNumber" parameterType="hashmap">
|
||||
UPDATE
|
||||
TEMP_META_INFO
|
||||
SET
|
||||
HOLE_NUMBER = #{HOLE_NUMBER}
|
||||
<![CDATA[
|
||||
WHERE
|
||||
PROJECT_CODE = #{PROJECT_CODE}
|
||||
]]>
|
||||
</update>
|
||||
|
||||
</mapper>
|
||||
|
|
@ -247,14 +247,6 @@ function fn_help_tour(){
|
|||
title:'Step 2',
|
||||
content: '프로젝트 목록이 조회 되며, 프로젝트명을 클릭하시면 해당 프로젝트를 조회 또는 입력하실 수 있습니다. ',
|
||||
target:'grid'
|
||||
},{
|
||||
title:'Step 3',
|
||||
content: '엑셀 업로드버튼을 클릭하시면 엑셀자료입력 페이지로 이동하여 표준 엑셀서식에 한꺼번에 작성하여 업로드하실 수 있습니다.',
|
||||
target:'excel-btn'
|
||||
},{
|
||||
title:'Step 4',
|
||||
content: 'Font Download 버튼을 클릭하여 폰트를 컴퓨터에 설치하시면 입력서식의 폰트를 자연스럽게 보실 수 있습니다.',
|
||||
target:'font-download'
|
||||
}],
|
||||
});
|
||||
return false;
|
||||
|
|
@ -352,9 +344,6 @@ function fn_help_tour(){
|
|||
<div class="table-info-group form-inline">
|
||||
Total : ${fn:length(result)} 건
|
||||
</div>
|
||||
<div class="table-btn-group">
|
||||
<a href="/web/file/Font.zip" class="btn btn-small btn-rounded5 btn-ske-blue btn-icon-left btn-icon-download-w" data-target="font-download"><span>Font Download</span></a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- kendoUI grid start -->
|
||||
|
|
|
|||
|
|
@ -114,9 +114,11 @@ function fn_save(rUrl){
|
|||
if ($('#HOLE_TOTAL_DEPTH').val() && $('#HOLE_CASING_DEPTH').val()) {
|
||||
var _totalDepth = $('#HOLE_TOTAL_DEPTH').val();
|
||||
var _casingDepth = $('#HOLE_CASING_DEPTH').val();
|
||||
|
||||
if( _casingDepth === '-' ) {
|
||||
_casingDepth = -999;
|
||||
}
|
||||
_totalDepth = parseFloat(_totalDepth);
|
||||
_casingDepth = parseFloat(_casingDepth);
|
||||
_casingDepth = Number(parseFloat(_casingDepth));
|
||||
|
||||
if (_totalDepth < _casingDepth) {
|
||||
alert('케이싱심도가 굴진심도보다 큽니다.');
|
||||
|
|
@ -138,11 +140,16 @@ function fn_save(rUrl){
|
|||
{"id":"HOLE_LONG_M", "start_num":2, "end_num":0},
|
||||
{"id":"HOLE_LONG_S", "start_num":2, "end_num":2},
|
||||
{"id":"HOLE_TOTAL_DEPTH", "start_num":8, "end_num":2},
|
||||
{"id":"HOLE_CASING_DEPTH", "start_num":8, "end_num":2},
|
||||
{"id":"HOLE_LAYER_NUM", "start_num":10, "end_num":0},
|
||||
{"id":"HOLE_WL", "start_num":8, "end_num":2}
|
||||
|
||||
];
|
||||
if( _casingDepth !== -999) {
|
||||
colInfo.push(
|
||||
{"id":"HOLE_CASING_DEPTH", "start_num":8, "end_num":2}
|
||||
);
|
||||
|
||||
}
|
||||
if(fn_saveNumberCheckHTML(colInfo) == false)return false;
|
||||
|
||||
//표고, 지하수위 (음수 입력 가능)
|
||||
|
|
@ -356,6 +363,20 @@ function is_checked(){
|
|||
|
||||
}
|
||||
|
||||
function casingDepthKeyupValidator() {
|
||||
//케이싱심도 유효성 체크
|
||||
var holeCasingDepth = document.getElementById("HOLE_CASING_DEPTH");
|
||||
|
||||
holeCasingDepth.addEventListener("keyup", function(event) {
|
||||
if (!(event.keyCode >= 37 && event.keyCode <= 40)) {
|
||||
var inputVal = this.value.trim();
|
||||
if (inputVal !== '-') {
|
||||
this.value = inputVal.replace(/[^0-9.]/gi, '');
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
window.onload = function() {
|
||||
|
||||
if("${param.MAP_CFRM_YN}" == "Y"){
|
||||
|
|
@ -375,12 +396,13 @@ window.onload = function() {
|
|||
fn_onkeyNumber("HOLE_EL", "float02");
|
||||
fn_onkeyNumber("HOLE_WL", "float");
|
||||
fn_onkeyNumber("HOLE_TOTAL_DEPTH", "float");
|
||||
fn_onkeyNumber("HOLE_CASING_DEPTH", "float");
|
||||
fn_onkeyNumber("HOLE_LAYER_NUM", "int");
|
||||
fn_onkeyNumber("PROJECT_START_DATE", "int");
|
||||
fn_onkeyNumber("PROJECT_START_DATE", "int");
|
||||
fn_onkeyNumber("PROJECT_START_DATE", "int");
|
||||
|
||||
casingDepthKeyupValidator();
|
||||
|
||||
/*
|
||||
//지자체'L_DIS','M_DIS'
|
||||
if('${sd}' != null && '${sd}' != ''){
|
||||
|
|
@ -1479,7 +1501,7 @@ function fn_HoleLoad(){
|
|||
<tr>
|
||||
<th class="td-head">케이싱심도(m) </th>
|
||||
<td colspan="3">(-) :
|
||||
<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도)
|
||||
<input name="HOLE_CASING_DEPTH" id="HOLE_CASING_DEPTH" type="text" style="width:200px;" maxlength="11" value="${mapHeader.holeCasingDepth == -999 ? '-' : mapHeader.holeCasingDepth}" valid="notnull" validNm="케이싱심도"/> m (케이싱심도 ≤ 굴진심도)
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue