발주기관 건설현장 등록시 건설사 자동검색 통하여 지정 및 건설사 계정과 연동작업

encryptId 값 여부: 수정하면서 건설사 지정 처리 여부, orgConstUserid 값 여부: 최초 등록시에 건설사 지정 여부
       * 1) encryptId == "" && orgConstUserid == "" : 기지정 하지 않았고 새로 지정하지 않음 -> spUdtTblCsi 호출
       * 2) encryptId == "" && orgConstUserid != "" : 기지정했는데 미선정으로 수정            -> TEMP_META_~, TEMP_PROJECT_~ 삭제 그리고 TEMP_CONSTRUCT_~ UPDATE 완료 후 spUdtTblCsi 호출
       * 3) encryptId != "" && orgConstUserid == "" : 기지정 하지 않았는데 새로 지정함       -> SaveAndInsertMeta 호출. (기존에 생성된 PROJECT_CODE 없음, TEMP_META~, TEMP_PROJECT~에 추가) 그리고 spUdtTblCsi 호출
       * 4) encryptId != "" && orgConstUserid != "" : 기지정했고 그대로 둠                      -> spUdtTblCsi 호출
       * 5) encryptId != "" && orgConstUserid != "" : 기지정했는데 다른 사람으로 지정        -> orgConstUser 입력 진행 여부 판단 쿼리 수행()
       *     5-1)  orgConstUser가 입력을 시작했음 -> spUdtTblCsiParams.put("message", '기업사용자 수정 불가. 이전 기업사용자가 이미 입력을 시작한 프로젝트입니다'); // 발주기관 사용자에게  해당 메시지 보여주기
       *     5-2)  orgConstUser가 입력을      전임 -> 기지정계정 삭제하고  SaveAndInsertMeta 호출. (기존에 생성된 PROJECT_CODE 없음, TEMP_META~, TEMP_PROJECT~에 추가) 그리고 spUdtTblCsi 호출

src/main/java/geoinfo/drilling/input/DrillingInputController.java

@@ -421,5 +421,38 @@ public class DrillingInputController {
 
         return jSONOResponse;
     }
-	
+
+	/**
+	 * 발주기관 건설현장 수정화면 - 건설사 미선정 처리
+	 * @param request
+	 * @param strJSON
+	 * @param response
+	 * @return
+	 * @throws Exception 
+	 */
+	@RequestMapping(value = "/drilling/input/uncheckConstCompany.do", method = RequestMethod.POST)
+    @ResponseBody
+    public JSONObject modifyUncheckConstCompany( HttpServletRequest request, @RequestParam HashMap<String, Object> params, HttpServletResponse response) throws Exception {
+
+		JSONObject jsonResult = new JSONObject();
+//		HashMap<String, Object> params = new HashMap<>();
+		int rowCnt = 0;	// 처리 행 개수(3-정상:TEMP_META_INFO 정보, TEMP_PROJECT_INFO 정보 DELETE됨, TEMP_CONSTRUCTION_SITE_INFO 정보UPDATE됨)
+		
+		rowCnt = drillingInputService.deleteTempMetaInfo(params);
+		rowCnt += drillingInputService.deleteTempProjectInfo(params);
+		rowCnt += drillingInputService.updateTempConstructSiteInfoSetPROJECT_CODE_NULL(params);
+		
+		if (rowCnt < 3) {
+			jsonResult.put("resultCode", rowCnt);
+    		jsonResult.put("result", "FAIL");
+    		jsonResult.put("message", "삭제처리 중 오류가 발생했습니다.");
+		} else {
+			jsonResult.put("resultCode", rowCnt);
+			jsonResult.put("result", "SUCCESS");
+			jsonResult.put("message", "삭제되었습니다.");
+		}
+		
+		
+		return jsonResult; // @ResponseBody이므로 반환 값은 필요 없습니다.
+	}
 }

src/main/java/geoinfo/drilling/input/service/DrillingInputMapper.java

@@ -22,6 +22,8 @@ public interface DrillingInputMapper  {
 	public List<EgovMap> sPGetTblCsiByCid(HashMap<String, Object> params) throws SQLException;
 	public EgovMap getItemByCid(HashMap<String, Object> params) throws SQLException;
 	public EgovMap getItemByProjectCode(HashMap<String, Object> params) throws SQLException;	
+	public int selectConstructCompanyProjectByProjectCodeCnt(HashMap<String, Object> params) throws SQLException;
+	public EgovMap selectConstructCompanyProjectWriting(HashMap<String, Object> params) throws SQLException;	
 	
 	public int updateProjectCodeAndProjectStateCodeByCid(HashMap<String, Object> params) throws SQLException;
 	public int updateProjectCodeAndProjectStateCodeByProjectCode(HashMap<String, Object> params) throws SQLException;
@@ -33,6 +35,9 @@ public interface DrillingInputMapper  {
 	 * @throws SQLException
 	 */
 	public int insertConstructSiteHist(HashMap<String, Object> params) throws SQLException;
+	public int deleteTempMetaInfo(HashMap<String, Object> params) throws SQLException;
+	public int deleteTempProjectInfo(HashMap<String, Object> params) throws SQLException;
+	public int updateTempConstructSiteInfoSetPROJECT_CODE_NULL(HashMap<String, Object> params) throws SQLException;
 }
 
 

src/main/java/geoinfo/drilling/input/service/DrillingInputService.java

@@ -19,9 +19,13 @@ public interface DrillingInputService {
 	List<EgovMap> selectConstructCompanyList(HashMap<String, Object> params) throws Exception;
 	Map<String, Object> selectConstructUserInfo(HashMap<String, Object> params) throws Exception;
 	void getDepartments(HttpServletRequest request, HashMap<String, Object> params, JSONObject jsonResponse) throws Exception;
+	public int selectConstructCompanyProjectByProjectCodeCnt(HashMap<String, Object> params) throws Exception;
 	HashMap<String, Object> updateProjectCodeAndProjectStateCodeByCid(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 	HashMap<String, Object> updateProjectCodeAndProjectStateCodeByProjectCode(HttpServletRequest request, HashMap<String, Object> params) throws Exception;
 	
 	HashMap<String, Object> drillingInputModify(HttpServletRequest request, HttpServletResponse response, HashMap<String, Object> params) throws Exception;
-	
+
+	public int deleteTempMetaInfo(HashMap<String, Object> params) throws Exception;
+	public int deleteTempProjectInfo(HashMap<String, Object> params) throws Exception;
+	public int updateTempConstructSiteInfoSetPROJECT_CODE_NULL(HashMap<String, Object> params) throws Exception;
 }

src/main/java/geoinfo/drilling/input/service/impl/DrillingInputServiceImpl.java

@@ -1,13 +1,5 @@
 package geoinfo.drilling.input.service.impl;
 
-import geoinfo.drilling.input.service.DrillingInputMapper;
-import geoinfo.drilling.input.service.DrillingInputService;
-import geoinfo.drilling.inquiry.service.DrillingInquiryService;
-import geoinfo.main.login.service.LoginMapper;
-import geoinfo.regi.common.service.CommonService;
-import geoinfo.regi.projectList.ProjectListController;
-import geoinfo.regi.projectList.service.ProjectListService;
-import geoinfo.util.MyUtil;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -26,6 +18,14 @@ import org.springframework.web.servlet.ModelAndView;
 
 import egovframework.rte.psl.dataaccess.util.EgovMap;
 import geoinfo.com.CryptoUtil;
+import geoinfo.drilling.input.service.DrillingInputMapper;
+import geoinfo.drilling.input.service.DrillingInputService;
+import geoinfo.drilling.inquiry.service.DrillingInquiryService;
+import geoinfo.main.login.service.LoginMapper;
+import geoinfo.regi.common.service.CommonService;
+import geoinfo.regi.projectList.service.ProjectListService;
+import geoinfo.util.MyUtil;
+import ictway.comm.util.strUtil;
 
 @Service("drillingInputService")
 public class DrillingInputServiceImpl implements DrillingInputService {
@@ -200,8 +200,12 @@ public class DrillingInputServiceImpl implements DrillingInputService {
         }
 		
 	}
-	
+
-	
+	@Override
+	public int selectConstructCompanyProjectByProjectCodeCnt(HashMap<String, Object> params) throws Exception {
+		return drillingInputMapper.selectConstructCompanyProjectByProjectCodeCnt(params);
+	}
+
 	@Override
 	public HashMap<String, Object> updateProjectCodeAndProjectStateCodeByCid(HttpServletRequest request, HashMap<String, Object> params) throws Exception {
 			
@@ -305,7 +309,7 @@ public class DrillingInputServiceImpl implements DrillingInputService {
 	@Override
 	public HashMap<String, Object> drillingInputModify(HttpServletRequest request, HttpServletResponse response, HashMap<String, Object> params)
 			throws Exception {
-		// TODO Auto-generated method stub
+		strUtil sUtil = new strUtil();
 		String userId = (String)request.getSession().getAttribute("USERID");
 		params.put("CID", params.get("cid"));
 		
@@ -347,7 +351,7 @@ public class DrillingInputServiceImpl implements DrillingInputService {
 			spUdtTblCsiParams.put("crtUserid", oldTempConstructSiteInfo.get("crtUserid"));
 			spUdtTblCsiParams.put("modUserid", userId);
 			spUdtTblCsiParams.put("userId", userId);
-			drillingInputMapper.spUdtTblCsi(spUdtTblCsiParams);
+//			drillingInputMapper.spUdtTblCsi(spUdtTblCsiParams);
 			
 			// 건설현장 입력 시, 기업사용자를 지정했다면 해당 건설현장을 해당 기업사용자의 프로젝트목록에 추가한다. 로직이 복잡해질까봐 필요한 큰 로직만 넣었습니다.
 			// if( 기업사용자를 지정했다면 ) {
@@ -374,20 +378,65 @@ public class DrillingInputServiceImpl implements DrillingInputService {
 			//}
 			
 
-			if (!"".equals(encryptId)) {
+			String orgConstUserid = "";	// 기존에 발주기관이 지정한 건설사 계정
-				EgovMap tbl = null;	// cid로 발주기관 등록 건설현장 정보 조회(PROJECT_CODE 취득)
+			if (oldTempConstructSiteInfo.get("constUserid") != null && !"".equals(oldTempConstructSiteInfo.get("constUserid"))) {
-				String constUserId = decryptId;
+				orgConstUserid = sUtil.checkNull((String) oldTempConstructSiteInfo.get("constUserid"));
-				params.put("constUserId", constUserId);
+			}
-				tbl = drillingInputMapper.getItemByCid( params );
+			/** encryptId 값 여부: 수정하면서 건설사 지정 처리 여부  
-				if (tbl.get("projectCode") != null && !"".equals(tbl.get("projectCode"))) {	// PROJECT_CODE가 존재하면 입력중인 프로젝트.
+		     * 1) encryptId == "" && orgConstUserid == "" : 기지정 하지 않았고 새로 지정하지 않음 -> spUdtTblCsi 호출
-					// 입력중인 프로젝트
+		     * 2) encryptId == "" && orgConstUserid != "" : 기지정했는데 미선정으로 수정            -> TEMP_META_~, TEMP_PROJECT_~ 삭제 그리고 TEMP_CONSTRUCT_~ UPDATE 완료 후 spUdtTblCsi 호출 
-						// 입력여부 판단 필요
+		     * 3) encryptId != "" && orgConstUserid == "" : 기지정 하지 않았는데 새로 지정함       -> SaveAndInsertMeta 호출. (기존에 생성된 PROJECT_CODE 없음, TEMP_META~, TEMP_PROJECT~에 추가) 그리고 spUdtTblCsi 호출 
-				} else {	// 입력된 정보 없음. INSERT 처리 후 끝
+		     * 4) encryptId != "" && orgConstUserid != "" : 기지정했고 그대로 둠                      -> spUdtTblCsi 호출
-					params.put("constProjectCode", "");
+		     * 5) encryptId != "" && orgConstUserid != "" : 기지정했는데 다른 사람으로 지정        -> orgConstUser 입력 진행 여부 판단 쿼리 수행()
-					params.put("holeNumber", -999); 
+		     *     5-1)  orgConstUser가 입력을 시작했음 -> spUdtTblCsiParams.put("message", '기업사용자 수정 불가. 이전 기업사용자가 이미 입력을 시작한 프로젝트입니다'); // 발주기관 사용자에게  해당 메시지 보여주기
-				} 
+		     *     5-2)  orgConstUser가 입력을      전임 -> 기지정계정 삭제하고  SaveAndInsertMeta 호출. (기존에 생성된 PROJECT_CODE 없음, TEMP_META~, TEMP_PROJECT~에 추가) 그리고 spUdtTblCsi 호출
+			 */
+
+			if ("".equals(encryptId)) {	
+				if ("".equals(orgConstUserid)) {					// 1) 
+//					drillingInputMapper.spUdtTblCsi(spUdtTblCsiParams);
+				} else {											// 2)
+					deleteTempMetaInfo(oldTempConstructSiteInfo);
+					deleteTempProjectInfo(oldTempConstructSiteInfo);
+					updateTempConstructSiteInfoSetPROJECT_CODE_NULL(oldTempConstructSiteInfo);
+				}
+				drillingInputMapper.spUdtTblCsi(spUdtTblCsiParams);
+			} else {	// !"".equals(encryptId)
+				if (orgConstUserid != null && "".equals(orgConstUserid)) {					// 3)
+					EgovMap tbl = null;	// cid로 발주기관 등록 건설현장 정보 조회(PROJECT_CODE 취득)
+					String constUserId = decryptId;
+					params.put("constUserId", constUserId);
+					tbl = drillingInputMapper.getItemByCid( params );
+					if (tbl.get("projectCode") != null && !"".equals(tbl.get("projectCode"))) {	// PROJECT_CODE가 존재하면 입력중인 프로젝트.
+						// 입력중인 프로젝트
+							// 입력여부 판단 필요
+					} else {	// 입력된 정보 없음. INSERT 처리 후 끝
+						params.put("constProjectCode", "");
+						params.put("holeNumber", -999); 
+					}
+					saveAndInsertMeta(params, request, response);
+					drillingInputMapper.spUdtTblCsi(spUdtTblCsiParams);
+				} else {	// !"".equals(orgConstUserId)
+					if (encryptId.equals(orgConstUserid)) {			// 4)
+					} else {	// !encryptId.equals(orgConstUserid) 5)
+						// 기업사용자 입력 진행 여부: !NULL -> 입력 전, NULL -> 입력 중(삭제불가)
+						EgovMap constCompanyProjectWriting = drillingInputMapper.selectConstructCompanyProjectWriting(oldTempConstructSiteInfo);
+						if (constCompanyProjectWriting == null) {	// 5-1)
+							spUdtTblCsiParams.put("v_RetCode", 11);
+							spUdtTblCsiParams.put("v_RetMsg", "기업사용자 수정 불가. 이전 기업사용자가 이미 입력을 시작한 프로젝트입니다.");
+							return spUdtTblCsiParams;
+						} else {									// 5-2)
+							deleteTempMetaInfo(oldTempConstructSiteInfo);
+							deleteTempProjectInfo(oldTempConstructSiteInfo);
+							params.put("holeNumber", -999); 
+							params.put("constProjectCode", oldTempConstructSiteInfo.get("projectCode"));	// 기존에 부여된 PROJECT_CODE 유지
+							params.put("constUserId", decryptId);										// 새로 선정한 건설사계정
+							saveAndInsertMeta(params, request, response);
+						}
+					}
+					drillingInputMapper.spUdtTblCsi(spUdtTblCsiParams);
+				}
 			}
-			saveAndInsertMeta(params, request, response);
 			
 			return spUdtTblCsiParams;
 		} catch (SQLException e) {
@@ -411,7 +460,23 @@ public class DrillingInputServiceImpl implements DrillingInputService {
 		
 		return drillingInputMapper.insertConstructSiteHist(histParams);
 	}
-	
+
+	@Override
+	public int deleteTempMetaInfo(HashMap<String, Object> params) throws Exception {
+		return drillingInputMapper.deleteTempMetaInfo(params);
+	}
+
+
+	@Override
+	public int deleteTempProjectInfo(HashMap<String, Object> params) throws Exception {
+		return drillingInputMapper.deleteTempProjectInfo(params);
+	}
+
+
+	@Override
+	public int updateTempConstructSiteInfoSetPROJECT_CODE_NULL(HashMap<String, Object> params) throws Exception {
+		return drillingInputMapper.updateTempConstructSiteInfoSetPROJECT_CODE_NULL(params);
+	}
 
 	/**
      * 건설현장 입력 시, 기업사용자(수주기관)를 선택하고 저장 시, 입력된 프로젝트가 기업사용자 프로젝트 목록에 추가하는 메서드
@@ -426,7 +491,10 @@ public class DrillingInputServiceImpl implements DrillingInputService {
         HashMap<String, Object> metaParams = new HashMap<String, Object>();
         metaParams.put("REPORT_TYPE", "CH");
         metaParams.put("PROJECT_CODE", params.get("constProjectCode")); // 프로젝트코드
-        metaParams.put("TEMP_CONSTRUCT_SITE_INFO-CID", params.get("v_CID"));
+        metaParams.put("TEMP_CONSTRUCT_SITE_INFO-CID", params.get("v_CID"));	// Add처리에서 넘어온 cid 값
+        if (params.get("cid") != null && !"".equals(params.get("cid"))) {		// Modify처리에서 넘어온 cid 값
+        	metaParams.put("TEMP_CONSTRUCT_SITE_INFO-CID", params.get("CID"));
+        }
         metaParams.put("constUserId", params.get("constUserId")); // 발주기관 선택 건설사 계정
         
         metaParams.put("INPUT_COMPANY", params.get("constCompanyName")); // 입력기관.

src/main/java/geoinfo/drilling/inquiry/service/impl/DrillingInquiryServiceImpl.java

@@ -1,13 +1,5 @@
 package geoinfo.drilling.inquiry.service.impl;
 
-import geoinfo.drilling.input.service.DrillingInputMapper;
-import geoinfo.drilling.input.service.DrillingInputService;
-import geoinfo.drilling.inquiry.service.DrillingInquiryMapper;
-import geoinfo.drilling.inquiry.service.DrillingInquiryService;
-import geoinfo.main.login.service.LoginMapper;
-import geoinfo.main.login.service.LoginService;
-import geoinfo.util.MyUtil;
-
 import java.sql.SQLException;
 import java.sql.Timestamp;
 import java.text.SimpleDateFormat;
@@ -19,13 +11,20 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
-import oracle.sql.TIMESTAMP;
-
 import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import egovframework.rte.psl.dataaccess.util.EgovMap;
+import geoinfo.com.CryptoUtil;
+import geoinfo.drilling.input.service.DrillingInputMapper;
+import geoinfo.drilling.input.service.DrillingInputService;
+import geoinfo.drilling.inquiry.service.DrillingInquiryMapper;
+import geoinfo.drilling.inquiry.service.DrillingInquiryService;
+import geoinfo.main.login.service.LoginMapper;
+import geoinfo.main.login.service.LoginService;
+import geoinfo.util.MyUtil;
+import oracle.sql.TIMESTAMP;
 
 @Service("drillingInquiryService")
 public class DrillingInquiryServiceImpl implements DrillingInquiryService {
@@ -285,7 +284,17 @@ public class DrillingInquiryServiceImpl implements DrillingInquiryService {
         
         List<EgovMap> datas = drillingInputMapper.sPGetTblCsiByCid(params);
         for( EgovMap data : datas ) {
-        	
+        	String orgConstUserId = "";
+        	if (data.get("constUserid")!= null /*&& !"".equals(data.get("constUserid"))*/) {
+        		orgConstUserId = (String) data.get("constUserid");
+        		data.put("orgConstUserId", orgConstUserId);
+        	}
+
+	        String encryptId = "";
+	        if (data.get("constUserid")!= null /*&& !"".equals(data.get("constUserid"))*/) {
+	        	encryptId = CryptoUtil.encryptQuickAES((String) data.get("constUserid"));
+	        	data.put("constUserid", encryptId);
+	        }
         	Long nConstCompanyCodeKey = MyUtil.getLongFromObject(data.get("constCompanyCode"));
         	if( nConstCompanyCodeKey != null ) {
             	params.put("constCompanyCode", nConstCompanyCodeKey);                	

src/main/java/geoinfo/regi/projectList/service/impl/ProjectListServiceImpl.java

@@ -1,8 +1,10 @@
 package geoinfo.regi.projectList.service.impl;
 
 import geoinfo.drilling.input.service.DrillingInputService;
+import geoinfo.drilling.inquiry.service.DrillingInquiryService;
 import geoinfo.regi.projectList.service.ProjectListMapper;
 import geoinfo.regi.projectList.service.ProjectListService;
+import geoinfo.util.MyUtil;
 import ictway.comm.util.strUtil;
 import ictway.comm.web.WebUtil;
 
@@ -13,12 +15,15 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.json.simple.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.util.UrlPathHelper;
 
+import egovframework.rte.psl.dataaccess.util.EgovMap;
+
 @Service("projectListService")
 public class ProjectListServiceImpl implements ProjectListService {
 
@@ -28,6 +33,9 @@ public class ProjectListServiceImpl implements ProjectListService {
 	@Autowired
 	private DrillingInputService drillingInputService;
 	
+	@Autowired
+    DrillingInquiryService drillingInquiryService;
+	
 	//170615
 	@Override
 	public int insertMeta(HashMap<String, Object> params) throws Exception {
@@ -50,6 +58,7 @@ public class ProjectListServiceImpl implements ProjectListService {
 		String oDEPT 							= sUtil.checkNull(String.valueOf(request.getParameter("DEPT")));
 		String oADMIN_NAME 						= sUtil.checkNull(String.valueOf(request.getParameter("ADMIN_NAME")));
 		String oEMAIL 							= sUtil.checkNull(String.valueOf(request.getParameter("EMAIL")));
+		String USERID							= sUtil.checkNull(String.valueOf(request.getParameter("USERID")));
 		String oTEL 							= sUtil.checkNull(String.valueOf(params.get("TEL")));
 		String oPHONE 							= sUtil.checkNull(String.valueOf(params.get("PHONE")));
 		String oSEARCHDATE 						= sUtil.checkNull(String.valueOf(params.get("SEARCHDATE")));
@@ -65,10 +74,21 @@ public class ProjectListServiceImpl implements ProjectListService {
 		String oREMARK 							= sUtil.checkNull(String.valueOf(request.getParameter("REMARK")));
 		String oREPORT_TYPE						=sUtil.checkNull(String.valueOf(params.get("REPORT_TYPE")));
 		String oTEMP_CONSTRUCT_SITE_INFO_CID	=sUtil.checkNull(String.valueOf(params.get("TEMP_CONSTRUCT_SITE_INFO-CID")));  // 발주기관에서 생성한 프로젝트 식별 번호. TEMP_CONSTRUCT_SITE_INFO 테이블의 cid 컬럼 값.
+		int constProjCnt = 0;	// 발주기관이 등록한 건설현장에 연동된 TEMP_META_INFO, TEMP_PROJECT_INFO 정보 유무 확인(존재시 2건) 
+		if (oPROJECT_CODE!= null && (!"null".equals(oPROJECT_CODE) && !"".equals(oPROJECT_CODE))) {
+			HashMap<String, Object> projCntParams = new HashMap<>();
+			projCntParams.put("PROJECT_CODE", oPROJECT_CODE);
+			constProjCnt = drillingInputService.selectConstructCompanyProjectByProjectCodeCnt(projCntParams);
+		}
+		
 //		if("".equals(oPROJECT_CODE)){
-		if(oPROJECT_CODE!= null || "".equals(oPROJECT_CODE)){
+		if((oPROJECT_CODE!= null && ("null".equals(oPROJECT_CODE) || "".equals(oPROJECT_CODE)))	// 발주기관이 최초로 등록, 발주기관이 기지정하지 않은 건설사를 지정하여 수정
+				|| (!"".equals(oPROJECT_CODE) /*&& constProjCnt > 1*/ && (params.get("constUserId") != null && !"".equals(params.get("constUserId"))))	// 발주기관이 기지정한 건설사를 다른 건설사로 변경하여 수정
+				){
+			
 			HashMap prjCd = new HashMap();
 			prjCd = getProjectCd(params);
+			String orgOPROJECT_CODE = (!"null".equals(oPROJECT_CODE) && !"".equals(oPROJECT_CODE)) ? oPROJECT_CODE : "";	// constProjCnt가 2이면 기존 PROJECT_CODE를 사용.
 			oPROJECT_CODE=(String)prjCd.get("P_CODE")+prjCd.get("P_NUM");
 			//System.out.println(oREPORT_TYPE);
 			
@@ -118,6 +138,11 @@ public class ProjectListServiceImpl implements ProjectListService {
 				params.put("HOLE_COMPANY", HOLE_COMPANY);
 				params.put("HOLE_SPOT", HOLE_SPOT);
 				params.put("REMARK", REMARK);
+				if (constProjCnt > 1	// 발주기관 최초 등록 후 기업사용자 등이 수정할 때 
+						|| (!"".equals(orgOPROJECT_CODE) && !"".equals(oPROJECT_CODE)	// 발주기관이 건설현장 수정 중 건설사가 변경되어 건설사의 META, PROJECT 등록 처리 필요한 경우  
+								&& (params.get("constUserId") != null && !"".equals(params.get("constUserId"))))) {	// 발주기관이 기업사용자를 변경한 경우
+					params.put("PROJECT_CODE", orgOPROJECT_CODE);
+				}
 				
 			} else {
 				params.put("USERID",request.getSession().getAttribute("USERID"));
@@ -186,10 +211,11 @@ public class ProjectListServiceImpl implements ProjectListService {
 		}
 		
 		if( oTEMP_CONSTRUCT_SITE_INFO_CID != null ) {
-
+			params.put("PROJECT_CODE", params.get("PROJECT_CODE"));
-			params.put("PROJECT_CODE", oPROJECT_CODE);
 			params.put("CID", oTEMP_CONSTRUCT_SITE_INFO_CID);
 			params.put("PROJECT_STATE_CODE", 1); // 입력상태 1 = 입력 중 하드코딩되어있음. src\main\java\geoinfo\drilling\inquiry\service\impl\DrillingInquiryServiceImpl.java의 drillingInquiryList 메소드 참고.
+			params.put("CONST_NAME", oPROJECT_NAME);
+			params.put("CONST_USERID", params.get("USERID"));
 			
 			drillingInputService.updateProjectCodeAndProjectStateCodeByCid(request, params);
 			// TEMP_CONSTRUCT_SITE_INFO 테이블의 cid 해당하는 record의 PROJECT_CODE를 update한다.

src/main/resources/egovframework/sqlmap/mapper/drilling/input/DrillingInputMapper.xml

@@ -144,11 +144,39 @@
 		]]>
 	</select>
 	
+	<select id="selectConstructCompanyProjectByProjectCodeCnt" parameterType="map" resultType="int">
+		SELECT COUNT(*) AS proj_cnt
+		FROM (
+			    SELECT PROJECT_CODE 
+			    FROM   TEMP_META_INFO 
+			    WHERE  PROJECT_CODE = #{PROJECT_CODE}
+			    UNION ALL
+			    SELECT PROJECT_CODE 
+			    FROM   TEMP_PROJECT_INFO 
+			    WHERE  PROJECT_CODE = #{PROJECT_CODE}
+			)
+	</select>
 	
+	<select id="selectConstructCompanyProjectWriting" parameterType="map" resultType="egovMap">
+		SELECT tpi.PROJECT_CODE
+		FROM   GEOINFO.TEMP_PROJECT_INFO tpi
+		WHERE  HOLE_CB_NUMBER IS NULL
+		  AND  HOLE_SB_NUMBER IS NULL
+		  AND  HOLE_BB_NUMBER IS NULL
+		  AND  HOLE_TB_NUMBER IS NULL
+		  AND  HOLE_BH_NUMBER IS NULL
+		  AND  PROJECT_TESTPITT_NUMBER IS NULL
+		  AND  PROJECT_ORGERBORING_NUMBER IS NULL
+		  AND  tpi.PROJECT_CODE = #{projectCode}
+	</select>
 	
 	<update id="updateProjectCodeAndProjectStateCodeByCid" parameterType="map">
 		<![CDATA[
-			UPDATE TEMP_CONSTRUCT_SITE_INFO SET PROJECT_CODE = #{PROJECT_CODE}, PROJECT_STATE_CODE= #{PROJECT_STATE_CODE} WHERE TRIM(CID) = #{CID} AND PROJECT_CODE IS NULL
+			UPDATE TEMP_CONSTRUCT_SITE_INFO 
+			SET    PROJECT_CODE       = #{PROJECT_CODE}
+				  ,PROJECT_STATE_CODE = #{PROJECT_STATE_CODE} 
+		    WHERE  TRIM(CID)          = #{CID}
+		      AND  (PROJECT_CODE IS NULL OR PROJECT_CODE = #{PROJECT_CODE})
 		]]>
 	</update>
 	
@@ -180,4 +208,28 @@
 		)
 	</insert>
 	
+	
+	
+	<delete id="deleteTempMetaInfo" parameterType="map">
+		DELETE
+		FROM   TEMP_META_INFO
+		WHERE  PROJECT_CODE = #{projectCode}
+	</delete>
+	
+	<delete id="deleteTempProjectInfo" parameterType="map">
+		DELETE
+		FROM   TEMP_PROJECT_INFO
+		WHERE  PROJECT_CODE = #{projectCode}
+	</delete>
+	
+	<update id="updateTempConstructSiteInfoSetPROJECT_CODE_NULL" parameterType="map">
+		UPDATE TEMP_CONSTRUCT_SITE_INFO
+		SET    PROJECT_CODE 		= NULL
+		      ,CONST_COMPANY_CODE 	= NULL
+		      ,CONST_COMPANY_ADMIN 	= NULL
+		      ,CONST_COMPANY_TEL 	= NULL
+		      ,CONST_USERID		 	= NULL
+		WHERE  PROJECT_CODE = #{projectCode}
+	</update>
+	
 </mapper>

src/main/webapp/WEB-INF/views/drilling/input/drilling_input.jsp

@@ -145,7 +145,12 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
 <script src="https://cdnjs.cloudflare.com/ajax/libs/xlsx/0.18.5/xlsx.full.min.js"></script>
 <script type="text/javascript">
 	var tableId = 0;
-	
+	var orgConstName = "";		// 수정시 원 사업명
+	var orgPrjCd = "";			// 수정시 프로젝트코드
+	var orgConstUsr = "";		// 수정시 원건설사 계정
+	var orgConstCompany = "";	// 수정시 원건설사명
+	var orgConstTel = "";		// 수정시 원건설사 담당자연락처
+
 	function getQueryString(paramName) {
 	    var searchString = decodeURI(window.location.search).substring(1),
 	        i, val, params = searchString.split("&");
@@ -463,6 +468,72 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
 
 	            list.style.display = 'none';
 	        });
+	        
+	        // 건설사 미지정 체크시 건설사(계정)정보 초기화
+	        document.querySelectorAll('input[id*=unselected-constructor-]').forEach(function (list) {
+	        	if (!list.contains(e.target)) return;
+
+	        	let chgChk = e.target.checked	// false: 체크박스해제, true: 체크
+	            const userid = list.closest('td')?.querySelector('input[id*=const-user-id]');			// hidden 사용자 id
+	            const company = list.closest('td')?.querySelector('input[id*=const-company-dept-]');	// 건설사명
+	            const admin = list.closest('td')?.querySelector('input[id*=const-company-admin-]');		// 담당자
+	            const tel = list.closest('td')?.querySelector('input[id*=const-company-tel-]');			// 담당자 연락처
+	            const pageType = location.href.includes("modify.do") ? "edit" : "add";
+				if (chgChk) {	// 건설사 미지정에 체크시 입력정보 초기화
+					if (pageType == 'edit' && orgConstUsr != "") {	// 수정하면서 원건설사를 미지정할때 확인진행
+						if (!confirm("건설사에서 입력중인 경우 입력내용이 삭제됩니다. 건설사를 미지정하시겠습니까?")) {
+							return;
+						} else {
+// 					        $.ajax({
+// 					            type: 'POST',
+// 					            url: '/drilling/input/uncheckConstCompany.do',
+// 					            dataType: 'json',
+// 					            data: {
+// 					            	projectCode: orgPrjCd,
+// 					            	encUserId: orgConstUsr
+// 					            },
+// 					            success: function (json) {
+// 									if(json.result == "SUCCESS") {
+// 										alert(json.message);
+// 										orgConstUsr = "";
+// 										document.getElementById('const-user-id-1').value = ''
+// 									} else {	//json.result == "FAIL"
+// 										alert(json.message);
+// 										return;
+// 									}
+// 					            }, error: function(res) {
+// 					            	alert(res);
+// 					            	console.log(res);
+// 					            	return;
+// 					            }
+// 					        });
+							document.getElementById('const-user-id-1').value = ''
+						}
+					}
+				
+					// 건설사 미지정 처리 
+					// 입력값 초기화
+					userid.value = '';
+					company.value = '';
+					admin.value = '';
+					tel.value = '';
+					// 입력 불가
+					userid.disabled = true;
+					company.disabled = true;
+					admin.disabled = true;
+					tel.disabled = true;
+				} else {
+					userid.value = orgConstUsr; 
+					company.value = orgConstCompany;
+					admin.value = orgConstName;
+					tel.value = orgConstTel;
+					// 입력 허용
+					userid.disabled = false;
+					company.disabled = false;
+					admin.disabled = false;
+					tel.disabled = false;
+				}
+	        });
 	    });
 	});
 	
@@ -682,6 +753,7 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                     const item = obj.datas[0]; // 첫 번째 데이터 객체를 사용
 
                     // 매핑 정보에 따라 값 할당
+                    document.getElementById('const-user-id-1').value = item.constUserid || '';
                     document.getElementById('const-name-1').value = item.constName || '';
                     document.getElementById('const-start-date-1').value = item.constStartDate || '';
                     document.getElementById('const-end-date-1').value = item.constEndDate || '';
@@ -692,6 +764,11 @@ if (request.getSession().getAttribute("CLS") == null || "2".equals(request.getSe
                     document.getElementById('const-company-dept-1').value = item.constCompanyName || '';
                     document.getElementById('const-company-admin-1').value = item.constCompanyAdmin || '';
                     document.getElementById('const-company-tel-1').value = item.constCompanyTel || '';
+                    orgConstUsr = item.constUserid ? item.constUserid : "";
+                    orgConstCompany = item.constCompanyName ? item.constCompanyName : "";
+                   	orgConstName = item.constCompanyAdmin ? item.constCompanyAdmin : "";
+                   	orgConstTel = item.constCompanyTel ? item.constCompanyTel : "";	
+                    orgPrjCd = item.projectCode ? item.projectCode : "";
                 }
 			} else if (xhr.readyState === 4) {
 			  // 요청 실패 시 처리