From 561e05b4fcf23b06c547aa7b6884ff72462c0866 Mon Sep 17 00:00:00 2001
From: thkim <thkim@dbnt.co.kr>
Date: Tue, 6 Aug 2024 14:36:48 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=EA=B8=B0=EC=97=85=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=9D=80=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EB=8C=80=EC=8B=A0=20=ED=9A=8C=EC=82=AC=EB=AA=85?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9A=B0=EC=B8=A1=20=EC=83=81=EB=8B=A8=20=ED=97=A4?=
 =?UTF-8?q?=EB=8D=94=EC=97=90=20=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/community/CommunityController.java   |  3 +++
 .../geoinfo/main/login/LoginController.java   | 12 +++++++++
 .../geoinfo/main/main/MainController.java     | 22 +++++++++++++--
 .../regi/complete/CompleteController.java     |  2 ++
 .../sqlmap/mapper/main/Home_SQL.xml           |  9 ++++---
 .../sqlmap/mapper/main/Login_SQL.xml          |  3 ++-
 .../views/body/jiban_info/SearchSitu.jsp      |  8 +++---
 .../webapp/WEB-INF/views/home/include/top.jsp |  7 ++++-
 src/main/webapp/WEB-INF/views/home/main.jsp   |  2 +-
 .../views/web/include/includeTopInput.jsp     | 27 ++++++++++++++++---
 .../WEB-INF/views/web/input/sampleInfo.jsp    |  2 +-
 src/main/webapp/kendo-ui/styles/custom.css    |  1 +
 12 files changed, 81 insertions(+), 17 deletions(-)

diff --git a/src/main/java/geoinfo/main/community/CommunityController.java b/src/main/java/geoinfo/main/community/CommunityController.java
index 84a736fe..cd257c8d 100644
--- a/src/main/java/geoinfo/main/community/CommunityController.java
+++ b/src/main/java/geoinfo/main/community/CommunityController.java
@@ -94,6 +94,8 @@ public class CommunityController {
 				mv.addObject("USEREMAIL", email);
 
 			mv.addObject("USERNAME", name);
+			mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME"));
+			mv.addObject("cls", request.getSession().getAttribute("CLS"));
 		}
 
 		return mv;
@@ -882,6 +884,7 @@ public class CommunityController {
 				mv.addObject("content", content);
 				String name = (String)request.getSession().getAttribute("USERNAME");
 				mv.addObject("username", name);
+				mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME"));
 				mv.addObject("A", "작성자");
 				mv.addObject("B", "비밀번호");
 				mv.addObject("C", "제목");
diff --git a/src/main/java/geoinfo/main/login/LoginController.java b/src/main/java/geoinfo/main/login/LoginController.java
index 715336cb..d05f2149 100644
--- a/src/main/java/geoinfo/main/login/LoginController.java
+++ b/src/main/java/geoinfo/main/login/LoginController.java
@@ -591,6 +591,8 @@ public class LoginController {
 			} else {
 				mv.addObject("username", request.getSession().getAttribute("USERNAME")); // 20200625 수정
 				mv.addObject("userid", request.getSession().getAttribute("USERID")); // 20200625 수정
+				mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME"));
+				mv.addObject("cls", request.getSession().getAttribute("CLS"));
 				mv.addObject("isLogin", true);
 			}
 		}
@@ -644,6 +646,8 @@ public class LoginController {
 				StringBuffer sql = new StringBuffer();
 				String virtualNo = "";
 				String userName = "";
+				String companyName = "";
+				
 				int loginCnt = 0;
 				String lastLoginDate = "";
 
@@ -755,11 +759,15 @@ public class LoginController {
 									if (selectWebMemberIn != null) {
 										loginSuccess = true;
 										userName = (String) selectWebMemberIn.get("user_name");
+										if( selectWebMemberIn.get("company_name") != null ) {
+											companyName = selectWebMemberIn.get("company_name").toString();											
+										}
 										cls = selectWebMemberIn.get("cls").toString();
 
 										if (!"".equals(request.getSession()) && !request.getSession().equals(null)) {
 											request.getSession().setAttribute("USERID", userid);
 											request.getSession().setAttribute("USERNAME", userName);
+											request.getSession().setAttribute("COMPANYNAME", companyName);											
 											request.getSession().setAttribute("MASTERCODE", masterCode);
 											request.getSession().setAttribute("CLS", cls);
 											request.getSession().setAttribute("GOVECODE", goveCode);
@@ -789,6 +797,9 @@ public class LoginController {
 										virtualNo = (String) selectWebMemberIn.get("virtualno");
 										userid = selectWebMemberIn.get("userid").toString();
 										userName = selectWebMemberIn.get("user_name").toString();
+										if( selectWebMemberIn.get("company_name") != null ) {
+											companyName = selectWebMemberIn.get("company_name").toString();											
+										}
 										loginCnt = Integer.parseInt(selectWebMemberIn.get("login_count").toString()); // 현재시간
 										sysdate = selectWebMemberIn.get("sysdate2").toString(); // 마지막 로그인실패시간 +10분 날짜
 
@@ -805,6 +816,7 @@ public class LoginController {
 
 										request.getSession().setAttribute("USERID", userid);
 										request.getSession().setAttribute("USERNAME", userName);
+										request.getSession().setAttribute("COMPANYNAME", companyName);
 										request.getSession().setAttribute("MASTERCODE", masterCode);
 										request.getSession().setAttribute("CLS", cls);
 										request.getSession().setAttribute("GOVECODE", goveCode);
diff --git a/src/main/java/geoinfo/main/main/MainController.java b/src/main/java/geoinfo/main/main/MainController.java
index 750b4ca8..c662ec7c 100644
--- a/src/main/java/geoinfo/main/main/MainController.java
+++ b/src/main/java/geoinfo/main/main/MainController.java
@@ -166,6 +166,7 @@ public class MainController
 		{
 			// login 아래 btn 설정 html
 			mv.addObject("isLogin", false);
+			mv.addObject("msg", "로그인이 필요한 시버스입니다.");
 		}else {
 			mv.addObject("isLogin", true);
 
@@ -482,6 +483,7 @@ public class MainController
 
 		mv.addObject("userid", request.getSession().getAttribute("USERID"));
 		mv.addObject("username", request.getSession().getAttribute("USERNAME"));
+		mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME"));
 		mv.addObject("url", url);
 		mv.addObject("cls", request.getSession().getAttribute("CLS"));
 		mv.addObject("eGovUrl", eGovUrl);
@@ -637,6 +639,7 @@ public class MainController
 			startDate = (String)params.get("startDate");
 		}else {
 			startDate = Integer.toString(thisYear);
+			startDate = "2014";
 		}
 
 		if(!"".equals(endDate) && endDate != null && !"null".equals(endDate) && !"undefined".equals(endDate)) {
@@ -657,18 +660,27 @@ public class MainController
 		String userid = "";
 		userid = (String)request.getSession().getAttribute("USERID");
 		_masterCode = (String)request.getSession().getAttribute("MASTERCODE");
+		
+		if( userid == null ) {
+			mv.addObject("msg", "<script>alert('로그인 후 이용하실 수 있습니다.');</script>");
+		}
 
 		strUtil util = new strUtil();
 
 		try	{
 			initPageIndex(page,startDate,endDate,searchKey); // Page Numbering
 			Map<String, Object> map = new HashMap<String, Object>();
+			
+
+			long firstRow 	= _pageIndex * 15;
+			long lastRow 	= (_pageIndex + 1) * 15;
+			
 			map.put("startDate", startDate);
 			map.put("endDate", endDate);
 			map.put("searchKey", searchKey);
 			map.put("masterCode", _masterCode);
-			map.put("firstRow", _pageIndex * 15);
-			map.put("lastRow", (_pageIndex + 1) * 15);
+			map.put("firstRow", firstRow);
+			map.put("lastRow", lastRow);
 
 			List<Map<String, Object>> result = mainService.selectSituTable(map);
 			Iterator<Map<String, Object>> iter = result.iterator();
@@ -1027,6 +1039,8 @@ public class MainController
 
 				mv.addObject("userid", userid);
 				mv.addObject("username", username);
+				mv.addObject("companyname", request.getSession().getAttribute("COMPANYNAME"));
+				mv.addObject("cls", request.getSession().getAttribute("CLS"));
 
 				cls = mainService.selectCls(map);// 개인, 기업, 관리자
 				input_cnt = ""; // 입력중
@@ -1136,7 +1150,9 @@ public class MainController
 		else
 		{
 			mv.addObject("userName", request.getSession().getAttribute("USERNAME"));
+			mv.addObject("companyName", request.getSession().getAttribute("COMPANYNAME"));
 			mv.addObject("userId", request.getSession().getAttribute("USERID"));
+			mv.addObject("cls", request.getSession().getAttribute("CLS"));
 		}
 
 		int year;
@@ -1199,7 +1215,9 @@ public class MainController
 		else
 		{
 			mv.addObject("userName", request.getSession().getAttribute("USERNAME"));
+			mv.addObject("companyName", request.getSession().getAttribute("COMPANYNAME"));
 			mv.addObject("userId", request.getSession().getAttribute("USERID"));
+			mv.addObject("cls", request.getSession().getAttribute("CLS"));
 		}
 
 		mv.addObject("han", "님 환영합니다");
diff --git a/src/main/java/geoinfo/regi/complete/CompleteController.java b/src/main/java/geoinfo/regi/complete/CompleteController.java
index 36ae0a7a..ef102489 100644
--- a/src/main/java/geoinfo/regi/complete/CompleteController.java
+++ b/src/main/java/geoinfo/regi/complete/CompleteController.java
@@ -55,6 +55,8 @@ public class CompleteController {
 		model.put("topUserId", topUserId);
 		model.put("topTabId", topTabId);
 		model.put("userName", userName);
+		model.put("cls", topCls);
+		model.put("companyName", request.getSession().getAttribute("COMPANYNAME"));
 
 		return "web/include/includeTopInput";
 	}
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 e6b0210d..89d1110d 100644
--- a/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml
+++ b/src/main/resources/egovframework/sqlmap/mapper/main/Home_SQL.xml
@@ -161,9 +161,9 @@
 	 		<![CDATA[ AND (SUBSTR(TO_CHAR(START_DATE),0,4) >= #{startDate} AND SUBSTR(TO_CHAR(END_DATE),0,4) <= #{endDate}) ]]>
 	 	</if>
 	 	<if test = "searchKey != null">
-	 		<![CDATA[ AND PNAME LIKE '%' || #{searchKey} || '%' ]]>
+	 		<![CDATA[ AND REPLACE(PNAME, ' ', '') LIKE '%' || #{searchKey} || '%' ]]>
 	 	</if>
-	 	<if test="masterCode != 0">
+	 	<if test="masterCode != null and masterCode != 0">
 	 		<![CDATA[ AND PROJECT_MASTER_COMPANY_CODE = #{masterCode} ]]>
 	 	</if>
     </select>
@@ -174,6 +174,7 @@
     	FROM (
     		SELECT AID, ROW_NUMBER() OVER (ORDER BY AID DESC) AS RNK,
     			PNAME,HOLE_COUNT,SUM_HOLE_DEPTH,MINX,MINY,MAXX,MAXY,PCODE
+
    			 FROM (
    			 	SELECT ROW_NUMBER() OVER (ORDER BY START_DATE,PNAME DESC) AS AID,
    			 		PNAME,HOLE_COUNT,SUM_HOLE_DEPTH,MINX,MINY,MAXX,MAXY,PCODE
@@ -184,9 +185,9 @@
 			 		<![CDATA[ AND (SUBSTR(TO_CHAR(START_DATE),0,4) >= #{startDate} AND SUBSTR(TO_CHAR(END_DATE),0,4) <= #{endDate}) ]]>
 			 	</if>
 			 	<if test = "searchKey != null">
-			 		<![CDATA[ AND PNAME LIKE '%' || #{searchKey} || '%' ]]>
+			 		<![CDATA[ AND REPLACE(PNAME, ' ', '') LIKE '%' || #{searchKey} || '%' ]]>
 			 	</if>
-			 	<if test="masterCode != 0">
+			 	<if test="masterCode != null and masterCode != 0">
 			 		<![CDATA[ AND PROJECT_MASTER_COMPANY_CODE = #{masterCode} ]]>
 			 	</if>
 				)
diff --git a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
index f317383b..bd701800 100644
--- a/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
+++ b/src/main/resources/egovframework/sqlmap/mapper/main/Login_SQL.xml
@@ -22,7 +22,8 @@
     <select id="selectWebMemberIn" parameterType="String" resultType="org.apache.commons.collections.map.CaseInsensitiveMap">
     		SELECT AGREEYN, USERID, PASSWD, CLS, USER_NAME, SYSDATE, LOGIN_COUNT, LAST_LOGIN_DATE + 1/(24*12) AS  SYSDATE2, VIRTUALNO,
     				DECODE(PROJECT_MASTER_COMPANY_CODE,'','0',PROJECT_MASTER_COMPANY_CODE) MASTER_COMPANY_CODE,
-                    to_char(trunc(months_between(SYSDATE, PSWD_MONTH))) as PSWD_LIMIT, LIQ_YN, GOVEMENT_CODE, CERTIFICATION_YN
+                    to_char(trunc(months_between(SYSDATE, PSWD_MONTH))) as PSWD_LIMIT, LIQ_YN, GOVEMENT_CODE, CERTIFICATION_YN,
+                    COMPANY_NAME
     		FROM WEB_MEMBER_IN
     		WHERE
     			<if test="userid != null">
diff --git a/src/main/webapp/WEB-INF/views/body/jiban_info/SearchSitu.jsp b/src/main/webapp/WEB-INF/views/body/jiban_info/SearchSitu.jsp
index 909be096..d6caad9e 100644
--- a/src/main/webapp/WEB-INF/views/body/jiban_info/SearchSitu.jsp
+++ b/src/main/webapp/WEB-INF/views/body/jiban_info/SearchSitu.jsp
@@ -57,10 +57,10 @@ $(function(){
 
 		<%-- <div class="f-left">
 			기간 :
-			<select id="startDate" name="startDate" style="width: 160px;" validNm="시작연도" onChange="fn_onSelectStartYear()">
-				<c:forEach items="${year}" var="item">
-					<option value="${item.year}" selected>${item.year}</option>
-				</c:forEach>
+			<select id="startDate" data-test="sdfdfsdf" name="startDate" style="width: 160px;" validNm="시작연도" onChange="fn_onSelectStartYear()">
+			    <c:forEach items="${year}" var="item">
+			        <option value="${item.year}" ${item.year == (java.util.Calendar.getInstance().get(java.util.Calendar.YEAR) - 10) ? 'selected' : ''}>${item.year}</option>
+			    </c:forEach>
 			</select>
 			~
 			<select id="endDate" name="endDate" style="width: 160px;" validNm="종료연도" onChange="fn_onSelectEndYear()">
diff --git a/src/main/webapp/WEB-INF/views/home/include/top.jsp b/src/main/webapp/WEB-INF/views/home/include/top.jsp
index ef977af0..b859e54e 100644
--- a/src/main/webapp/WEB-INF/views/home/include/top.jsp
+++ b/src/main/webapp/WEB-INF/views/home/include/top.jsp
@@ -25,7 +25,12 @@
 							<!-- 로그인시 시작 -->
 							<c:if test="${isLogin == true}">
 								<li>
-									<span class="username-zone"><span class="username">${username}(${userid})</span>님 반갑습니다.</span>
+									<c:if test="${cls != 1}">
+										<span class="username-zone"><span class="username">${username}(${userid})</span>님 반갑습니다.</span>
+									</c:if>
+									<c:if test="${cls == 1}">
+										<span class="username-zone"><span class="username">${companyname}(${userid})</span>님 반갑습니다.</span>
+									</c:if>
 								</li>
 								<%-- <li>
 									<span class="ip-zone">IP : <%=request.getRemoteAddr() %>, 접속시간 : ${fn:substring(SYSDATE,0,16)})</span>
diff --git a/src/main/webapp/WEB-INF/views/home/main.jsp b/src/main/webapp/WEB-INF/views/home/main.jsp
index 506e9d38..83a0aebf 100644
--- a/src/main/webapp/WEB-INF/views/home/main.jsp
+++ b/src/main/webapp/WEB-INF/views/home/main.jsp
@@ -176,7 +176,7 @@
 			endDate = "2024";
 			url = "SearchSitu";
 		}
-
+		console.log('gourlPageSitu');
 		window.location.href="topMenuSelect.do?url=" + url+ "&startDate=" + startDate + "&endDate=" + endDate + "&searchKey=" + searchKey + "&page=" + page;
 	}
 
diff --git a/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp b/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp
index a547dcd0..defb4b81 100644
--- a/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp
+++ b/src/main/webapp/WEB-INF/views/web/include/includeTopInput.jsp
@@ -28,7 +28,14 @@
 
 			window.open("/web/map/mapTop.do?PROJECT_CODE=" + project_code + "&GUBUN=POP", "Calendar", "width=800px, height=600px");
 		}
-	}
+	}	
+
+	
+
+
+
+
+   	
 </script>
 
 <c:if test="${'9' == topCls}">
@@ -54,7 +61,14 @@
 							<ul>
 								<!-- 로그인시 시작 -->
 								<li>
-									<span class="username-zone"><span class="username">${userName}</span>님이 로그인하셨습니다.</span>
+									<c:choose>
+									    <c:when test="${cls != 1}">
+									        <span class="username-zone"><span class="username">${userName}(${userId})</span>님이 로그인하셨습니다.</span>
+									    </c:when>
+									    <c:otherwise>
+									        <span class="username-zone"><span class="username">${companyBame}(${userId})</span>님이 로그인하셨습니다.</span>
+									    </c:otherwise>
+									</c:choose>
 								</li>
 								<li>
 									<a href="/logout.do?location=left" onFocus='this.blur()' class="btn top-btn-member logout-btn">로그아웃</a>
@@ -142,7 +156,14 @@
 							<ul>
 								<!-- 로그인시 시작 -->
 								<li>
-									<span class="username-zone"><span class="username">${userName}</span>님이 로그인하셨습니다.</span>
+									<c:choose>
+									    <c:when test="${cls != 1}">
+									        <span class="username-zone"><span class="username">${userName}(${userId})</span>님이 로그인하셨습니다.</span>
+									    </c:when>
+									    <c:otherwise>
+									        <span class="username-zone"><span class="username">${companyName}(${userId})</span>님이 로그인하셨습니다.</span>
+									    </c:otherwise>
+									</c:choose>
 								</li>
 								<li>
 									<a href="/logout.do?location=left" onFocus='this.blur()' class="btn top-btn-member logout-btn">로그아웃</a>
diff --git a/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp b/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp
index 6e4df102..df043f66 100644
--- a/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp
+++ b/src/main/webapp/WEB-INF/views/web/input/sampleInfo.jsp
@@ -275,7 +275,7 @@ function fn_save(rUrl){
 	}
 	
 	if( data.length === 0 ) {
-		const answer = confirm("기본물성시험 정보가 없습니까?");
+		const answer = confirm("기본물성시험 정보가 없습니까?\n미입력 시 등록이 지연될 수 있습니다.");
 
 		if (answer) {
 		  	console.log("네"); 
diff --git a/src/main/webapp/kendo-ui/styles/custom.css b/src/main/webapp/kendo-ui/styles/custom.css
index 09b19f6d..a1c658ae 100644
--- a/src/main/webapp/kendo-ui/styles/custom.css
+++ b/src/main/webapp/kendo-ui/styles/custom.css
@@ -649,6 +649,7 @@ Last ========
     font-weight: bold;
     text-align: center;
     font-size: 14px;
+    vertical-align: middle;
 }
 .k-grid tr td {
     border-color: #cccccc;