Merge branch 'main' of http://10.dbnt.co.kr:50501/DBNT/geoinfo_eGov_work

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

@@ -25,6 +25,7 @@ public interface DrillingInputService {
 	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;
+	HashMap<String, Object> findConstCompanyCodeByConstCompanyName(HashMap<String, Object> params) throws Exception;
 
 	public int deleteTempMetaInfo(HashMap<String, Object> params) throws Exception;
 	public int deleteTempProjectInfo(HashMap<String, Object> params) throws Exception;

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<String, Object> findConstCompanyCodeByConstCompanyName(HashMap<String, Object> params) throws Exception {
+		Long constCompanyCode = drillingInputMapper.findConstCompanyCodeByConstCompanyName(params);			
+		params.put("constCompanyCode", constCompanyCode);
+		return params;
+	}
+
 	private int insertTempConstructSiteInfo(HttpServletRequest request, EgovMap tbl, HashMap<String, Object> params, String userId) throws SQLException {
 		HashMap<String, Object> histParams = new HashMap<String, Object>();
 		

src/main/java/geoinfo/regi/projectList/ProjectListController.java

@@ -118,6 +118,22 @@ public class ProjectListController {
 	// 지반정보등록
 	@RequestMapping(value = "/insertMeta.do")
 	public ModelAndView insertMeta(@RequestParam HashMap<String,Object> 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<String, Object> companyMap = new HashMap<String, Object>();
+		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;
 	}

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} 
+		]]>
+				  <if test='CONST_COMPANY_CODE != null and CONST_COMPANY_CODE !=""'>
+				  ,CONST_COMPANY_CODE = #{CONST_COMPANY_CODE} 
+				  </if>
+				  <if test='CONST_COMPANY_ADMIN != null and CONST_COMPANY_ADMIN !=""'>
+				  ,CONST_COMPANY_ADMIN = #{CONST_COMPANY_ADMIN} 
+				  </if>
+				  <if test='CONST_COMPANY_TEL != null and CONST_COMPANY_TEL !=""'>
+				  ,CONST_COMPANY_TEL = #{CONST_COMPANY_TEL} 
+				  </if>
+				  <if test='CONST_USERID != null and CONST_USERID !=""'>
+				  ,CONST_USERID = #{CONST_USERID} 
+				  </if>
 		    WHERE  TRIM(CID)          = #{CID}
 		      AND  (PROJECT_CODE IS NULL OR PROJECT_CODE = #{PROJECT_CODE})
-		]]>
 	</update>
 	
 	<update id="updateProjectCodeAndProjectStateCodeByProjectCode" parameterType="map">

src/main/webapp/WEB-INF/views/map/index.jsp

@@ -272,16 +272,24 @@ function LoadingShow() {
 									<a href="javascript:geologyMine();"
 									class="map-right-btn map-btn-icon-mine">광산</a>
 								</li>
-								<li id="map-btn-icon-well-button">
+								<c:choose>
-									<a href="javascript:geologyWell();"
+									<c:when test="${ CLS == '2' || CLS == '9' }">
-									class="map-right-btn map-btn-icon-well">관정</a>
+										<li id="map-btn-icon-well-button">
-								</li>
+											<a href="javascript:geologyWell();"
-								<c:if test="${ CLS == '2' || CLS == '9' }">
+											class="map-right-btn map-btn-icon-well">관정</a>
-									<li id="map-btn-icon-steep-slope-button">
+										</li>
-										<a href="javascript:geologySteepSlope();"
+										<li id="map-btn-icon-steep-slope-button">
-										class="map-right-btn map-btn-icon-steep-slope">급경사지</a>
+											<a href="javascript:geologySteepSlope();"
-									</li>
+											class="map-right-btn map-btn-icon-steep-slope">급경사지</a>
-								</c:if>
+										</li>
+									</c:when>
+									<c:otherwise>
+										<li id="map-btn-icon-well-button" style="width:100%">
+											<a href="javascript:geologyWell();"
+											class="map-right-btn map-btn-icon-well">관정</a>
+										</li>
+									</c:otherwise>
+								</c:choose>
 							</ul>
 						</div>
 						<!-- 그리기도구 끝 -->

src/main/webapp/WEB-INF/views/map/left/mapLeft.jsp

@@ -1373,10 +1373,11 @@ function table3display(){
 	</script>
 	<div class="map-division-wrapper">
 		<div class="map-division-title" id="map-label-cals">
-			<input id="toggleChkAll" name="toggleChkAll" type="checkbox" value="checkbox" onclick="forceUncheckHoleLayerOnOff(this);" title="전체 지도 구분(CALS) 숨김/보임" checked />
+<!-- 			<input id="toggleChkAll" name="toggleChkAll" type="checkbox" value="checkbox" onclick="forceUncheckHoleLayerOnOff(this);" title="전체 지도 구분(CALS) 숨김/보임" checked /> -->
 			지도구분
 		</div>
 		<div class="map-division-contents">
+			<label style=" cursor: pointer; font-weight: lighter;"><input id="toggleChkAll" name="toggleChkAll" type="checkbox" value="checkbox" onclick="forceUncheckHoleLayerOnOff(this);" title="전체 지도 구분(CALS) 숨김/보임" checked style="margin-right: 5px;" />전체 표시</label>
 			<!-- 트리메뉴 시작 -->
 			<ul id="browser" class="treeview ground-info-left-treeview">
 				<li class="open">

src/main/webapp/com/css/style.css

@@ -296,7 +296,8 @@ input[type=checkbox],
 input[type=radio] {
 	width: 18px;
     height: 18px;
-    vertical-align: middle;
+/*     vertical-align: middle; */
+    vertical-align: sub;
 }
 .gg-radio, .gg-checkbox {
 	display: inline-block;