From 99cd88b4ac70145b6e68936f05ba00300ca24420 Mon Sep 17 00:00:00 2001 From: "DESKTOP-V7KL26R\\DBNT" Date: Fri, 18 Feb 2022 14:01:33 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=80=EC=83=89,=20=ED=8E=98=EC=9D=B4?= =?UTF-8?q?=EC=A7=80=EB=84=A4=EC=9D=B4=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mca/util/ImgPaginationRenderer.java | 20 ++- .../sqlmap/mappers/map/fieldData.xml | 15 ++ .../sqlmap/mappers/map/useHistory.xml | 16 +- .../webapp/WEB-INF/jsp/admin/fieldData.jsp | 17 +- src/main/webapp/WEB-INF/jsp/admin/history.jsp | 24 ++- src/main/webapp/WEB-INF/jsp/admin/request.jsp | 145 +++++++++--------- .../webapp/WEB-INF/jsp/admin/userInfo.jsp | 14 +- 7 files changed, 146 insertions(+), 105 deletions(-) diff --git a/src/main/java/com/mca/util/ImgPaginationRenderer.java b/src/main/java/com/mca/util/ImgPaginationRenderer.java index 342df62..0eccbd9 100644 --- a/src/main/java/com/mca/util/ImgPaginationRenderer.java +++ b/src/main/java/com/mca/util/ImgPaginationRenderer.java @@ -52,12 +52,20 @@ public class ImgPaginationRenderer extends AbstractPaginationRenderer implements */ public void initVariables() { - firstPageLabel = "" + " "; - previousPageLabel = "" + " "; - currentPageLabel = "{0} "; - otherPageLabel = "{2} "; - nextPageLabel = "" + " "; - lastPageLabel = "" + " "; + firstPageLabel = "";//""" + " "; + previousPageLabel = "
  • \n" + + "\t\t\t\t\t \n" + + "\t\t\t\t\t\t«\n" + + "\t\t\t\t\t \n" + + "\t\t\t\t\t
    • "; + currentPageLabel = "
  • {0}
    • "; + otherPageLabel = "
  • {2}
    • "; + nextPageLabel = "
  • \n" + + "\t\t\t\t\t \n" + + "\t\t\t\t\t\t»\n" + + "\t\t\t\t\t \n" + + "\t\t\t\t\t
    • "; + lastPageLabel = "";//""" + " "; } @Override diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml b/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml index 9d138ec..ad83efb 100644 --- a/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml +++ b/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml @@ -35,6 +35,21 @@ FROM map_field_data a LEFT JOIN t_user b ON a.userid=b.userid WHERE 1=1 + + + + + + AND (a.region LIKE CONCAT('%',#{searchKeyword},'%') + OR b.name LIKE CONCAT('%',#{searchKeyword},'%') + OR b.company LIKE CONCAT('%',#{searchKeyword},'%')) + + + AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') + + + + ORDER BY id DESC LIMIT #{recordCountPerPage} OFFSET #{firstIndex} diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml index 95b1693..7f2ed96 100644 --- a/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml +++ b/src/main/resources/egovframework/sqlmap/mappers/map/useHistory.xml @@ -7,20 +7,19 @@ SELECT log_date AS logDate, req_area AS reqArea, - -- content, a.userid, b.name, b.company FROM map_use_history a JOIN t_user b ON a.userid=b.userid - WHERE 1 = 1 + WHERE 1 = '1' - AND (content LIKE CONCAT('%',#{searchKeyword},'%') - OR b.name LIKE CONCAT('%',#{searchKeyword},'%') + + AND (b.name LIKE CONCAT('%',#{searchKeyword},'%') OR b.company LIKE CONCAT('%',#{searchKeyword},'%') - OR a.area LIKE CONCAT('%',#{searchKeyword},'%')) + OR a.req_area LIKE CONCAT('%',#{searchKeyword},'%')) AND ${searchCondition} LIKE CONCAT('%',#{searchKeyword},'%') @@ -40,10 +39,9 @@ - AND (content LIKE CONCAT('%',#{searchKeyword},'%') - OR b.name LIKE CONCAT('%',#{searchKeyword},'%') - OR b.company LIKE CONCAT('%',#{searchKeyword},'%')) - OR a.area 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/fieldData.jsp b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp index 472dbc2..37b88c4 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp @@ -42,10 +42,9 @@
    " /> @@ -90,12 +89,16 @@ - -
    - - + +
    +
    -
    diff --git a/src/main/webapp/WEB-INF/jsp/admin/history.jsp b/src/main/webapp/WEB-INF/jsp/admin/history.jsp index 6957725..c93585f 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/history.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/history.jsp @@ -20,6 +20,13 @@ " rel="stylesheet"> + <%@ include file="../include/header.jsp"%> @@ -34,10 +41,9 @@
    @@ -50,7 +56,6 @@ 지도사용 이력 위치 - 작업내용 소속 담당자 날짜 @@ -61,7 +66,6 @@ - <%----%> @@ -73,12 +77,16 @@ - -
    + +
    +
    - + + + +
    diff --git a/src/main/webapp/WEB-INF/jsp/admin/request.jsp b/src/main/webapp/WEB-INF/jsp/admin/request.jsp index ead85ab..a50a226 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/request.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/request.jsp @@ -28,79 +28,84 @@ <%@ include file="../include/header.jsp"%>
    +
    + + " /> +
    +
    + +
    + +
    + + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    지도사용 요청
    번호작업명소속담당자날짜상태
    + + + + + +
    요청한 목록이 없습니다.
    + +
    + +
    +
    +
    -
    - - " /> -
    -
    - -
    - -
    - - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    지도사용 요청
    번호작업명소속담당자날짜상태
    - - - - - -
    요청한 목록이 없습니다.
    - -
    - - -
    -     -
    diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp index 31cc6ea..f914858 100644 --- a/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp +++ b/src/main/webapp/WEB-INF/jsp/admin/userInfo.jsp @@ -110,12 +110,16 @@ - -
    - - + +
    +
    -