diff --git a/src/main/java/com/mca/map/vo/UseHistoryVO.java b/src/main/java/com/mca/map/vo/UseHistoryVO.java index f828d42..492a05d 100644 --- a/src/main/java/com/mca/map/vo/UseHistoryVO.java +++ b/src/main/java/com/mca/map/vo/UseHistoryVO.java @@ -3,11 +3,29 @@ package com.mca.map.vo; public class UseHistoryVO { private String logDate; private String reqArea; + private int client_type; + private int log_type; // private String content; private String userid; private String name; private String company; + public int getClient_type() { + return client_type; + } + + public void setClient_type(int client_type) { + this.client_type = client_type; + } + + public int getLog_type() { + return log_type; + } + + public void setLog_type(int log_type) { + this.log_type = log_type; + } + public String getLogDate() { return logDate; } diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml index eff892c..78b57ca 100644 --- a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml +++ b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml @@ -6,26 +6,29 @@ @@ -35,19 +38,20 @@ COUNT(*) FROM map_use_history a JOIN t_user b ON a.userid=b.userid - WHERE 1 = 1 - - - - AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') - OR b.company LIKE CONCAT('%',#{searchKeyword},'%') - OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) - - - AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') - - - + + + + + AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') + OR b.company LIKE CONCAT('%',#{searchKeyword},'%') + OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) + + + AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') + + + + - - - - - - -
- -
-
- -
+
+
+
+
+ +
+
+ +
+
+
- + + + + + + + + + + + + + + + + + + + + + + - - - - + - - + + +
소속담당자동작위치날짜
+ + + 로그인 + + + 로그아웃 + + + 지도사용 + + +
위치소속담당자날짜요청한 목록이 없습니다.
+
+ +
+ + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - + + + - +
소속
담당자
동작 + + + 로그인 + + + 로그아웃 + + + 지도사용 + + +
위치
날짜
요청한 목록이 없습니다.
요청한 목록이 없습니다.
+
diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp index 6e20224..5626bec 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp @@ -4,7 +4,7 @@ <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -
+