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

Compare commits

base: DBNT:4a4ee41870a7a34c2fdb61bb683ff8d4fec17fc1
Branches Tags
DBNT:main
DBNT:master
DBNT:cks
..
compare: DBNT:56cf37e9b4b9ccec92e2e18d1ddd2d9b5d77a8b1
Branches Tags
DBNT:main
DBNT:master
DBNT:cks

No commits in common. "4a4ee41870a7a34c2fdb61bb683ff8d4fec17fc1" and "56cf37e9b4b9ccec92e2e18d1ddd2d9b5d77a8b1" have entirely different histories.
4a4ee41870 ... 56cf37e9b4

4 changed files with 4 additions and 34 deletions
Show Stats Expand all files Collapse all files

3
src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc01Controller.java
View File

@ -148,9 +148,6 @@ public class ManageExcelUploadProc01Controller {
List<EgovMap> map2 = selectClass2019Service.selectTest1(params);
EgovMap map3 = selectClass2019Service.selectTest2(params);
if( map3.get("resistivityCount") == null ) {
throw new Exception("map3.get(\"resistivityCount\") is null");
}
String resistivityCount = String.valueOf(map3.get("resistivityCount"));
String refractionCount = String.valueOf(map3.get("refractionCount"));

7
src/main/java/geoinfo/regi/manageList/ManageExcelUploadProc03Controller.java
View File

@ -1259,7 +1259,8 @@ public class ManageExcelUploadProc03Controller {
*/
@SuppressWarnings("unchecked")
@RequestMapping(value = "/stepUpload03.do", method = RequestMethod.POST)
public @ResponseBody String stepUpload03(@RequestParam List<MultipartFile> files, HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest multi) throws Exception{ WebUtil wUtil = new WebUtil();
public @ResponseBody String stepUpload03(@RequestParam List<MultipartFile> files, HashMap<String,Object> params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response, MultipartHttpServletRequest multi) throws Exception{
WebUtil wUtil = new WebUtil();
strUtil sUtil = new strUtil();
String resultMsg = "";
@ -1519,7 +1520,7 @@ public class ManageExcelUploadProc03Controller {
jaWp = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
}
if("".equals((String)resultMap.get("resultMsg"))){
excelWp = ExcelUtil.getRsWp(strFile, "현장수압시험부정보", 1, 2, 8);
excelWp = ExcelUtil.getRsWp(strFile, "현장수압시험부정보", 1, 2, 9);
resultMap = checkStep03_300_waterPressure_sub(request, params, excelWp, savePath, strFile, (List<HashMap<String, Object>>) resultMap.get("list"),_projectCode,_holeCode);
jaWpSub = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
}
@ -1531,7 +1532,7 @@ public class ManageExcelUploadProc03Controller {
jaPe = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
}
if("".equals((String)resultMap.get("resultMsg"))){
excelWp = ExcelUtil.getRsWp(strFile, "현장투수시험부정보", 1, 2, 7);
excelWp = ExcelUtil.getRsWp(strFile, "현장투수시험부정보", 1, 2, 8);
resultMap = checkStep03_300_permeablity_sub(request, params, excelWp, savePath, strFile, (List<HashMap<String, Object>>) resultMap.get("list"),_projectCode,_holeCode);
jaPeSub = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
}

27
src/main/java/geoinfo/util/ExcelUtil.java
View File

@ -165,11 +165,6 @@ public class ExcelUtil {
//2
public static RsWrapper getRsWp(String excelPath, String sheetName, int colNmRow, int startRow, int maxCol) throws Exception {
RsWrapper rsWp = new RsWrapper();
if( sheetName == null ) {
throw new Exception("sheetName is null");
}
Sheet exlSheet = getExcelWorkSheet(excelPath, sheetName);
if(exlSheet == null) { return rsWp; }
@ -186,28 +181,6 @@ public class ExcelUtil {
if(cells == null) { break; }
boolean isOk = false;
for(short j=0; j < maxCol && j < cells.length; j++) {
if( cells[j] == null ) {
System.out.println("excelPath: [" + excelPath + "]\n" +
"sheetName: [" + sheetName + "]\n" +
"cells[" + j + "]: [" + "cells[" + j + "]" + " is null ]\n"
);
} else if( cells[j].getContents() == null ) {
System.out.println("excelPath: [" + excelPath + "]\n" +
"sheetName: [" + sheetName + "]\n" +
"cells[" + j + "].getContents(): [" + "cells[" + j + "].getContents()" + " is null ]\n"
);
} else if( cells[j].getContents().trim().equals("") ) {
System.out.println("excelPath: [" + excelPath + "]\n" +
"sheetName: [" + sheetName + "]\n" +
"cells[" + j + "].getContents().trim().equals(\"\"): [" + "cells[" + j + "].getContents().trim().equals(\"\")" + " is empty ]\n"
);
}
if( sheetName.equals("현장투수시험부정보") && i == 2) {
isOk = true; break;
} else if( sheetName.equals("현장수압시험부정보") && i == 2) {
isOk = true; break;
}
if(cells[j] != null && cells[j].getContents() != null && !cells[j].getContents().trim().equals("")) { isOk = true; break; }
}
if(!isOk) { break; }

1
src/main/webapp/WEB-INF/views/web/input/excel_step31.jsp
View File

@ -948,7 +948,6 @@ function fn_help_tour(){
<!-- 저장 후 다음 버튼 시작 -->
<div id="btnArea" name="btnArea" class="contentsRow marT10 t-right">
<span style="font-weight: 500; padding-right: 30px;">저장버튼은 ↑↑↑↑ 위로 화면 스크롤 후, 시추공번호(BH001, TB001 등) 우측에 '저장 후 다음 시추공 입력' 버튼이 존재합니다.</span>
<button type="button" id="btnNext1" name="btnNextStep" class="k-button k-button-icontext k-button-skyBlue" data-target="next-step1">
등록대기목록<span class="k-icon k-i-arrow-chevron-right"></span>
</button>