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 c07fa28..08d454e 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 @@ @@ -47,19 +50,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},'%') + + + + + +