diff --git a/src/main/java/com/mca/cmmn/web/AdminController.java b/src/main/java/com/mca/cmmn/web/AdminController.java index 2da6da6..da72236 100644 --- a/src/main/java/com/mca/cmmn/web/AdminController.java +++ b/src/main/java/com/mca/cmmn/web/AdminController.java @@ -86,6 +86,15 @@ public class AdminController { int standByCount = userService.selectUserStandByCount(); model.addAttribute("standByCount", standByCount); + // 확인요청 데이터 + FieldDataSearchVO fieldDataSearchVO = new FieldDataSearchVO(); + fieldDataSearchVO.setStatus0(1); + fieldDataSearchVO.setStatus1(1); + fieldDataSearchVO.setStatus2(1); + fieldDataSearchVO.setStatus3(1); + int standFieldData = fieldDataService.selectFieldDataCnt(fieldDataSearchVO); + model.addAttribute("standFieldData", standFieldData); + // 일, 월 방문자 수 BaseSearchVO searchVO = new BaseSearchVO(); LocalDate searchStartDate = LocalDate.now(); diff --git a/src/main/java/com/mca/map/vo/FieldDataSearchVO.java b/src/main/java/com/mca/map/vo/FieldDataSearchVO.java index ae7ce84..50c8560 100644 --- a/src/main/java/com/mca/map/vo/FieldDataSearchVO.java +++ b/src/main/java/com/mca/map/vo/FieldDataSearchVO.java @@ -2,6 +2,52 @@ package com.mca.map.vo; import com.mca.cmmn.vo.BaseSearchVO; -public class FieldDataSearchVO extends BaseSearchVO{ +import java.util.List; +public class FieldDataSearchVO extends BaseSearchVO{ + private int status0; + private int status1; + private int status2; + private int status3; + private int status4; + + public int getStatus0() { + return status0; + } + + public void setStatus0(int status0) { + this.status0 = status0; + } + + public int getStatus1() { + return status1; + } + + public void setStatus1(int status1) { + this.status1 = status1; + } + + public int getStatus2() { + return status2; + } + + public void setStatus2(int status2) { + this.status2 = status2; + } + + public int getStatus3() { + return status3; + } + + public void setStatus3(int status3) { + this.status3 = status3; + } + + public int getStatus4() { + return status4; + } + + public void setStatus4(int status4) { + this.status4 = status4; + } } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml b/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml index ad83efb..95096b2 100644 --- a/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml +++ b/src/main/resources/egovframework/sqlmap/mappers/map/fieldData.xml @@ -36,7 +36,6 @@ map_field_data a LEFT JOIN t_user b ON a.userid=b.userid WHERE 1=1 - @@ -49,17 +48,50 @@ - + AND( 1=0 + + OR status = 0 + + + OR status = 1 + + + OR status = 2 + + + OR status = 3 + + + OR status = 4 + + ) ORDER BY id DESC LIMIT #{recordCountPerPage} OFFSET #{firstIndex} - SELECT COUNT(*) FROM map_field_data WHERE 1 = 1 + AND( 1=0 + + OR status = 0 + + + OR status = 1 + + + OR status = 2 + + + OR status = 3 + + + OR status = 4 + + ) + + + + + + + + + + + -
- - - - - - " /> - -
-
--%> diff --git a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp index 5c97056..a3a4aea 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp @@ -29,7 +29,7 @@  지도사용 요청
  • class="thisOn" onclick="location.href='/admin/history'">  지도사용 이력
    • -
  • class="thisOn" onclick="location.href='/admin/fieldData'"> +
  • class="thisOn" onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'">  현장수집 데이터
  • class="thisOn" onclick="location.href='/admin/userInfo?auth=99'">  회원 관리
    • diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 4b75dee..49044e9 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -719,4 +719,12 @@ a { text-align: left; color: #fff; font-weight: bold; +} + +.check_fidelData { + vertical-align: middle; + font-size: 19px; + background-color: #337ab7; + color:#fff; + } \ No newline at end of file diff --git a/src/main/webapp/js/admin/fieldData.js b/src/main/webapp/js/admin/fieldData.js index f535640..27eab0d 100644 --- a/src/main/webapp/js/admin/fieldData.js +++ b/src/main/webapp/js/admin/fieldData.js @@ -1,6 +1,24 @@ - function fn_link_page(pageNo) { +$(document).on("change", ".statusChkBox", function (){ + debugger + $("[name='searchForm']").submit(); +}) + +function fn_link_page(pageNo) { document.searchForm.pageIndex.value = pageNo; document.searchForm.action = ""; document.searchForm.submit(); } +function getCheckoxValue() { + const query = 'input[name="check1"]:checked'; + const selectedEls = + document.querySelectorAll(query); + let result = ''; + selectedEls.forEach((el) => { + result += el.value + ' '; + }); + + // 출력 + document.getElementById('result').innerText + = result; +}