diff --git a/src/main/java/geoinfo/drilling/input/service/DrillingInputService.java b/src/main/java/geoinfo/drilling/input/service/DrillingInputService.java index c720ed05..231ae542 100644 --- a/src/main/java/geoinfo/drilling/input/service/DrillingInputService.java +++ b/src/main/java/geoinfo/drilling/input/service/DrillingInputService.java @@ -25,6 +25,7 @@ public interface DrillingInputService { HashMap updateProjectCodeAndProjectStateCodeByProjectCode(HttpServletRequest request, HashMap params) throws Exception; HashMap drillingInputModify(HttpServletRequest request, HttpServletResponse response, HashMap params) throws Exception; + HashMap findConstCompanyCodeByConstCompanyName(HashMap params) throws Exception; public int deleteTempMetaInfo(HashMap params) throws Exception; public int deleteTempProjectInfo(HashMap params) throws Exception; 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 b20d1908..d4340583 100644 --- a/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java +++ b/src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java @@ -259,6 +259,10 @@ public class DrillingInputServiceImpl implements DrillingInputService { updateProjectCodeParams.put("PROJECT_CODE", params.get("PROJECT_CODE")); updateProjectCodeParams.put("PROJECT_STATE_CODE", params.get("PROJECT_STATE_CODE")); updateProjectCodeParams.put("CID", params.get("CID")); + if (params.get("CONST_COMPANY_CODE") != null && !"".equals(params.get("CONST_COMPANY_CODE"))) updateProjectCodeParams.put("CONST_COMPANY_CODE", params.get("CONST_COMPANY_CODE")); + if (params.get("CONST_COMPANY_ADMIN") != null && !"".equals(params.get("CONST_COMPANY_ADMIN"))) updateProjectCodeParams.put("CONST_COMPANY_ADMIN", params.get("CONST_COMPANY_ADMIN")); + if (params.get("CONST_COMPANY_TEL") != null && !"".equals(params.get("CONST_COMPANY_TEL"))) updateProjectCodeParams.put("CONST_COMPANY_TEL", params.get("CONST_COMPANY_TEL")); + if (params.get("CONST_USERID") != null && !"".equals(params.get("CONST_USERID"))) updateProjectCodeParams.put("CONST_USERID", params.get("CONST_USERID")); int nResult = drillingInputMapper.updateProjectCodeAndProjectStateCodeByCid(updateProjectCodeParams); if( nResult == 0 ) { @@ -470,6 +474,13 @@ public class DrillingInputServiceImpl implements DrillingInputService { } + @Override + public HashMap findConstCompanyCodeByConstCompanyName(HashMap params) throws Exception { + Long constCompanyCode = drillingInputMapper.findConstCompanyCodeByConstCompanyName(params); + params.put("constCompanyCode", constCompanyCode); + return params; + } + private int insertTempConstructSiteInfo(HttpServletRequest request, EgovMap tbl, HashMap params, String userId) throws SQLException { HashMap histParams = new HashMap(); diff --git a/src/main/java/geoinfo/regi/projectList/ProjectListController.java b/src/main/java/geoinfo/regi/projectList/ProjectListController.java index 40c2d4f2..4a617212 100644 --- a/src/main/java/geoinfo/regi/projectList/ProjectListController.java +++ b/src/main/java/geoinfo/regi/projectList/ProjectListController.java @@ -118,6 +118,22 @@ public class ProjectListController { // 지반정보등록 @RequestMapping(value = "/insertMeta.do") public ModelAndView insertMeta(@RequestParam HashMap params, ModelAndView model ,HttpServletRequest request, HttpServletResponse response) throws Exception{ + + + String userId = (String)request.getSession().getAttribute("USERID"); + String username = (String)request.getSession().getAttribute("USERNAME"); + String phone = (String)request.getSession().getAttribute("PHONE"); + String constCompanyName = (String)request.getSession().getAttribute("COMPANYNAME"); + HashMap companyMap = new HashMap(); + params.put("constCompanyName", constCompanyName); + companyMap = drillingInputService.findConstCompanyCodeByConstCompanyName(params); + if (companyMap != null && companyMap.get("constCompanyCode") != null && !"".equals(companyMap.get("constCompanyCode"))) { + params.put("CONST_COMPANY_CODE", companyMap.get("constCompanyCode")); // 건설사 회사코드 + params.put("CONST_COMPANY_ADMIN", username); // 건설사 담당자 + params.put("CONST_COMPANY_TEL", phone); // 건설사 담당자 연락처 + params.put("CONST_USERID", userId); // 건설사 사용자ID + } + masterService.insertMeta(params, model, request, response); return model; } 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 f9a0a1a1..6626eb40 100644 --- a/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml +++ b/src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml @@ -183,9 +183,21 @@ UPDATE TEMP_CONSTRUCT_SITE_INFO SET PROJECT_CODE = #{PROJECT_CODE} ,PROJECT_STATE_CODE = #{PROJECT_STATE_CODE} + ]]> + + ,CONST_COMPANY_CODE = #{CONST_COMPANY_CODE} + + + ,CONST_COMPANY_ADMIN = #{CONST_COMPANY_ADMIN} + + + ,CONST_COMPANY_TEL = #{CONST_COMPANY_TEL} + + + ,CONST_USERID = #{CONST_USERID} + WHERE TRIM(CID) = #{CID} AND (PROJECT_CODE IS NULL OR PROJECT_CODE = #{PROJECT_CODE}) - ]]>