기업사용자 입력시스템: 엑셀양식변경 토사시험(입도분석, 일축압), 암석시험(점하중, 절리면절단) 테스트번호 추가됨
parent
d023b43d36
commit
83f394b58f
|
|
@ -1608,7 +1608,7 @@ public class ManageExcelUploadProc03Controller {
|
|||
RsWrapper excelWp = new RsWrapper();
|
||||
if("Y".equals(classInfoMap.get("sandClassification"))){
|
||||
if("".equals((String)resultMap.get("resultMsg"))){
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "입도분석정보", 0, 1, 22);
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "입도분석정보", 0, 1, 23);
|
||||
resultMap = checkStep03_500_class(request, params, excelWp, savePath, strFile,_projectCode,_holeCode);
|
||||
jaCl5 = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
|
||||
}
|
||||
|
|
@ -1635,7 +1635,7 @@ public class ManageExcelUploadProc03Controller {
|
|||
}
|
||||
if("Y".equals(classInfoMap.get("sandUnconfinedUsual"))){
|
||||
if("".equals((String)resultMap.get("resultMsg"))){
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "일축압축정보", 0, 2, 18);
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "일축압축정보", 0, 2, 19);
|
||||
resultMap = checkStep03_500_unconfined(request, params, excelWp, savePath, strFile,_projectCode,_holeCode);
|
||||
jaUn5 = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
|
||||
}
|
||||
|
|
@ -1709,14 +1709,14 @@ public class ManageExcelUploadProc03Controller {
|
|||
}
|
||||
if("Y".equals(classInfoMap.get("rockPointload"))){
|
||||
if("".equals((String)resultMap.get("resultMsg"))){
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "점하중정보", 0, 1, 8);
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "점하중정보", 0, 1, 9);
|
||||
resultMap = checkStep03_600_rockPointload(request, params, excelWp, savePath, strFile,_projectCode,_holeCode);
|
||||
jaRpo6 = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
|
||||
}
|
||||
}
|
||||
if("Y".equals(classInfoMap.get("rockJointshear"))){
|
||||
if("".equals((String)resultMap.get("resultMsg"))){
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "절리면전단정보", 0, 1, 8);
|
||||
excelWp = ExcelUtil.getRsWp(strFile, "절리면전단정보", 0, 1, 9);
|
||||
resultMap = checkStep03_600_rockJointshear(request, params, excelWp, savePath, strFile,_projectCode,_holeCode);
|
||||
jaRjo6 = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue