From 41cca0b766ac00e505f3510bf2d4cfcbc8c36e3e Mon Sep 17 00:00:00 2001 From: thkim Date: Tue, 14 Jan 2025 16:35:47 +0900 Subject: [PATCH] . --- list.txt | 10 +++++++- .../input/DrillingInputController.java | 2 +- .../input/service/DrillingInputMapper.java | 5 +++- .../impl/DrillingInputServiceImpl.java | 24 ++++++++++++++++++- .../main/login/service/LoginMapper.java | 2 ++ .../login/service/impl/LoginServiceImpl.java | 1 - .../drilling/input/DrillingInputMapper.xml | 22 ++++++++++++++++- .../sqlmap/mapper/main/Home_SQL.xml | 2 +- .../sqlmap/mapper/main/Login_SQL.xml | 13 ++++++++++ .../views/drilling/input/drilling_input.jsp | 6 +---- .../views/web/input/uniaxial/rockUniaxial.jsp | 9 ------- 11 files changed, 75 insertions(+), 21 deletions(-) diff --git a/list.txt b/list.txt index 53ee6a1c..0cbd1cb7 100644 --- a/list.txt +++ b/list.txt @@ -1,3 +1,11 @@ #src\main\resources\egovframework\egovProps\globals.properties # 일축압축 첨부 파일 하나 씩 올리면 에러나는 버그 수정중.. 2025-01-06 18:01 -src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp \ No newline at end of file +src\main\webapp\WEB-INF\views\web\input\uniaxial\rockUniaxial.jsp +#건설현장 입력 +src\main\webapp\WEB-INF\views\drilling\input\drilling_input.jsp +src\main\java\geoinfo\drilling\input\DrillingInputController.java +src\main\java\geoinfo\drilling\input\service\DrillingInputMapper.java +src\main\resources\egovframework\sqlmap\mapper\drilling\input\DrillingInputMapper.xml +src\main\java\geoinfo\main\login\service\impl\LoginServiceImpl.java +src\main\java\geoinfo\main\login\service\LoginMapper.java +src\main\resources\egovframework\sqlmap\mapper\main\Login_SQL.xml \ No newline at end of file diff --git a/src/main/java/geoinfo/drilling/input/DrillingInputController.java b/src/main/java/geoinfo/drilling/input/DrillingInputController.java index 83589fb1..bf5a99fa 100644 --- a/src/main/java/geoinfo/drilling/input/DrillingInputController.java +++ b/src/main/java/geoinfo/drilling/input/DrillingInputController.java @@ -84,7 +84,7 @@ public class DrillingInputController { "\n--------------------------------------------------------------\n" + request.getRequestURI() + " IN:" + "\n--------------------------------------------------------------\n" + - "jstrJSON" + strJSON + "\n" + + "jstrJSON: \n" + strJSON + "\n" + "\n--------------------------------------------------------------\n" ); diff --git a/src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java b/src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java index b45bf7d5..703a96a4 100644 --- a/src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java +++ b/src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java @@ -4,12 +4,15 @@ import java.sql.SQLException; import java.util.HashMap; import egovframework.rte.psl.dataaccess.mapper.Mapper; +import egovframework.rte.psl.dataaccess.util.EgovMap; @Mapper("drillingInputMapper") public interface DrillingInputMapper { - public HashMap callSpAddTblCsi(HashMap params) throws SQLException; + public HashMap spAddTblCsi(HashMap params) throws SQLException; public String test(HashMap params) throws SQLException; public Long findConstCompanyCodeByConstCompanyName(HashMap params) throws SQLException; + + public EgovMap sPGetMasterCompanyDistrict(HashMap sPGetMasterCompanyDistrictParams) throws SQLException; } diff --git a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java index c6042488..a99ba648 100644 --- a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java +++ b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java @@ -2,25 +2,47 @@ package geoinfo.drilling.input.service.impl; import geoinfo.drilling.input.service.DrillingInputMapper; import geoinfo.drilling.input.service.DrillingInputService; +import geoinfo.main.login.service.LoginMapper; import java.sql.SQLException; import java.util.HashMap; +import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Service; +import egovframework.rte.psl.dataaccess.util.EgovMap; + @Service("drillingInputService") public class DrillingInputServiceImpl implements DrillingInputService { @Resource(name="drillingInputMapper") private DrillingInputMapper drillingInputMapper; + @Resource(name="loginMapper") + private LoginMapper loginMapper; + @Override public HashMap drillingInputAdd(HttpServletRequest request, HashMap params) throws Exception { String userId = (String)request.getSession().getAttribute("USERID"); + + + String projectMasterCompanyName = loginMapper.findProjectMasterCompanyNameByUserid(userId); + + if( projectMasterCompanyName == null ) { + throw new Exception( "발주 기관 계정에 설정된 기관이 존재하지 않습니다" ); + } + + HashMap sPGetMasterCompanyDistrictParams = new HashMap(); + sPGetMasterCompanyDistrictParams.put("projectMasterCompanyName", projectMasterCompanyName); + EgovMap egovMap = drillingInputMapper.sPGetMasterCompanyDistrict(sPGetMasterCompanyDistrictParams); + + List test = egovMap.keyList(); + + params.put("userId", userId); params.put("masterCompanyOCode", "01"); @@ -33,7 +55,7 @@ public class DrillingInputServiceImpl implements DrillingInputService { try { Long constCompanyCode = drillingInputMapper.findConstCompanyCodeByConstCompanyName(params); params.put("constCompanyCode", constCompanyCode); - drillingInputMapper.callSpAddTblCsi(params); + drillingInputMapper.spAddTblCsi(params); return params; } catch (SQLException e) { throw new Exception( e.getMessage() ); diff --git a/src/main/java/geoinfo/main/login/service/LoginMapper.java b/src/main/java/geoinfo/main/login/service/LoginMapper.java index ce2abd33..5dedca82 100644 --- a/src/main/java/geoinfo/main/login/service/LoginMapper.java +++ b/src/main/java/geoinfo/main/login/service/LoginMapper.java @@ -98,4 +98,6 @@ public interface LoginMapper { EgovMap selectSearchIniUserId(Map params); public int checkWebMemberIn(Map map) throws Exception; + + String findProjectMasterCompanyNameByUserid(String userId); } diff --git a/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java b/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java index a10f264e..2241aabb 100644 --- a/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java +++ b/src/main/java/geoinfo/main/login/service/impl/LoginServiceImpl.java @@ -4,7 +4,6 @@ import egovframework.com.cmm.service.EgovProperties; import egovframework.rte.psl.dataaccess.util.EgovMap; import geoinfo.main.login.service.LoginMapper; import geoinfo.main.login.service.LoginService; -import geoinfo.main.login.service.selectSearchIdByNameAndPhoneAndDupinfoIsNullAndCertificationYnFalse; import geoinfo.util.FileUtil; import java.io.FileNotFoundException; diff --git a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml b/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml index d0e208d7..a8b6dac3 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml @@ -9,7 +9,14 @@ - { CALL SP_ADD_TBL_CSI( #{constName}, #{constStartDate}, @@ -42,4 +49,17 @@ + + + + + \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml index 13cf7645..e39df5ec 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml @@ -272,7 +272,7 @@ AND TRIM(PASSWD) = #{pass} - + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp b/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp index 614b3098..5f3d91ed 100644 --- a/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp +++ b/src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp @@ -178,11 +178,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe jsonItem.constCompanyTel = constCompanyTelEle.value; } jsonData.push(jsonItem); - } - - console.log('%o', jsonData); - - + } let xhr; diff --git a/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp b/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp index 0ee0bf30..3942b58d 100644 --- a/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp +++ b/src/main/webapp/WEB-INF/views/web/input/uniaxial/rockUniaxial.jsp @@ -169,15 +169,6 @@ function fn_save(rUrl){ alert("Stress-Strain 그래프 첨부는 필수입니다."); return false; } - /* - if(fileImgCheck1 === true || fileImgCheck2 === true){ - if (fileImgBkCheck1 === true || fileImgBkCheck2 === true){ - - alert("그래프 업로드는 필수입니다."); - return false; - } - } - */ /* if(fileImgBkCheck1 === true || fileImgBkCheck2 === true){ */ /* } */ //그리드 저장