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

Compare commits

base: DBNT:83f394b58f2ed1074953b385d96aaf0d6f505e81
Branches Tags
DBNT:main
DBNT:jiyoo
DBNT:master
DBNT:cks
..
compare: DBNT:e2a40e0209c4a1f9b27a7ad67e2dbd2755c27e8b
Branches Tags
DBNT:main
DBNT:jiyoo
DBNT:master
DBNT:cks

No commits in common. "83f394b58f2ed1074953b385d96aaf0d6f505e81" and "e2a40e0209c4a1f9b27a7ad67e2dbd2755c27e8b" have entirely different histories.
83f394b58f ... e2a40e0209

1 changed files with 7 additions and 5 deletions
Show Stats Expand all files Collapse all files

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

@ -1608,7 +1608,7 @@ public class ManageExcelUploadProc03Controller {
RsWrapper excelWp = new RsWrapper(); RsWrapper excelWp = new RsWrapper();
if("Y".equals(classInfoMap.get("sandClassification"))){ if("Y".equals(classInfoMap.get("sandClassification"))){
if("".equals((String)resultMap.get("resultMsg"))){ if("".equals((String)resultMap.get("resultMsg"))){
excelWp = ExcelUtil.getRsWp(strFile, "입도분석정보", 0, 1, 23); excelWp = ExcelUtil.getRsWp(strFile, "입도분석정보", 0, 1, 22);
resultMap = checkStep03_500_class(request, params, excelWp, savePath, strFile,_projectCode,_holeCode); 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")); 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("Y".equals(classInfoMap.get("sandUnconfinedUsual"))){
if("".equals((String)resultMap.get("resultMsg"))){ if("".equals((String)resultMap.get("resultMsg"))){
excelWp = ExcelUtil.getRsWp(strFile, "일축압축정보", 0, 2, 19); excelWp = ExcelUtil.getRsWp(strFile, "일축압축정보", 0, 2, 18);
resultMap = checkStep03_500_unconfined(request, params, excelWp, savePath, strFile,_projectCode,_holeCode); 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")); 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("Y".equals(classInfoMap.get("rockPointload"))){
if("".equals((String)resultMap.get("resultMsg"))){ if("".equals((String)resultMap.get("resultMsg"))){
excelWp = ExcelUtil.getRsWp(strFile, "점하중정보", 0, 1, 9); excelWp = ExcelUtil.getRsWp(strFile, "점하중정보", 0, 1, 8);
resultMap = checkStep03_600_rockPointload(request, params, excelWp, savePath, strFile,_projectCode,_holeCode); 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")); jaRpo6 = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
} }
} }
if("Y".equals(classInfoMap.get("rockJointshear"))){ if("Y".equals(classInfoMap.get("rockJointshear"))){
if("".equals((String)resultMap.get("resultMsg"))){ if("".equals((String)resultMap.get("resultMsg"))){
excelWp = ExcelUtil.getRsWp(strFile, "절리면전단정보", 0, 1, 9); excelWp = ExcelUtil.getRsWp(strFile, "절리면전단정보", 0, 1, 8);
resultMap = checkStep03_600_rockJointshear(request, params, excelWp, savePath, strFile,_projectCode,_holeCode); 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")); jaRjo6 = (null == resultMap.get("list") || "".equals(resultMap.get("list")))?null:JSONArray.fromObject(resultMap.get("list"));
} }
@ -4563,12 +4563,14 @@ public class ManageExcelUploadProc03Controller {
break; break;
} }
} }
HashMap<String,Object> map = new HashMap<>(); HashMap<String,Object> map = new HashMap<>();
map.put("PROJECT_CODE", _projectCode); map.put("PROJECT_CODE", _projectCode);
map.put("HOLE_CODE", _holeCode); map.put("HOLE_CODE", _holeCode);
// map.put("SAMPLE_CODE" , (String) _sampleInfoList.get(i).get("SAMPLE_CODE")); // map.put("SAMPLE_CODE" , (String) _sampleInfoList.get(i).get("SAMPLE_CODE"));
map.put("SAMPLE_CODE" , targetSampleCode); map.put("SAMPLE_CODE", targetSampleCode);
map.put("UNCONF_RINGFACTOR" , excelWp.get("col0", i));
map.put("UNCONF_RINGFACTOR" , excelWp.get("col1", i)); map.put("UNCONF_RINGFACTOR" , excelWp.get("col1", i));
map.put("UNCONF_LOAD_SCALE" , excelWp.get("col2", i)); map.put("UNCONF_LOAD_SCALE" , excelWp.get("col2", i));
map.put("UNCONF_UNDISTURB_HEIGHT" , excelWp.get("col3", i)); map.put("UNCONF_UNDISTURB_HEIGHT" , excelWp.get("col3", i));