확인요청 데이터수정 _220228

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();

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;
+    }
 }

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
 
-
 		<if test='searchKeyword != null and searchKeyword != ""'>
 			<choose>
 				<when test='searchCondition eq "all"'>
@@ -49,17 +48,50 @@
 				</otherwise>
 			</choose>
 		</if>
-
+		AND( 1=0
+		<if test="status0 == 1">
+			OR status = 0
+		</if>
+		<if test="status1 == 1">
+			OR status = 1
+		</if>
+		<if test="status2 == 1">
+			OR status = 2
+		</if>
+		<if test="status3 == 1">
+			OR status = 3
+		</if>
+		<if test="status4 == 1">
+			OR status = 4
+		</if>
+		)
 		ORDER BY id DESC
 		LIMIT #{recordCountPerPage} OFFSET #{firstIndex}
 	</select>
 	
-	<select id="selectFieldDataCnt" resultType="int">
+	<select id="selectFieldDataCnt" resultType="int" parameterType="fieldDataSearchVO">
 		SELECT
 			COUNT(*)
 		FROM
 			map_field_data
 		WHERE 1 = 1
+		   AND( 1=0
+			<if test="status0 == 1">
+				OR status = 0
+			</if>
+			<if test="status1 == 1">
+				OR status = 1
+			</if>
+			<if test="status2 == 1">
+				OR status = 2
+			</if>
+			<if test="status3 == 1">
+				OR status = 3
+			</if>
+			<if test="status4 == 1">
+				OR status = 4
+			</if>
+			)
 	</select>
 	
 	<select id="selectFieldData" parameterType="String" resultType="fieldDataVO">

src/main/webapp/WEB-INF/jsp/admin/dashBoard.jsp

@@ -34,11 +34,12 @@
       <div class="card my-2">
         <div class="card-body row">
           <div class="col-auto">
-            <img src="/images/icon/icon_002.png" width="60" height="60" alt="">
+            <img src="/images/icon/icon_003.png" width="60" height="60" alt="">
           </div>
           <div class="col-auto">
-            <p class="mb-0 text-black-50">-</p>
+            <a href="/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=0" class="mb-0 text-black-50">확인 요청 데이터</a>
-            <h3>0</h3>
+            <h3><c:out value="${standFieldData}" /></h3>
+
           </div>
         </div>
       </div>
@@ -46,6 +47,7 @@
     <div class="col-lg-9">
       <div class="card my-2">
         <div class="card-body">
+
           <div class="col-auto">
             <p class="mb-0 text-black-50">-</p>
             그래프

src/main/webapp/WEB-INF/jsp/admin/fieldData.jsp

@@ -13,13 +13,28 @@
 	}
 </style>
 
-		<div class="section_title">
+		<%--<div class="section_title">
 			<!-- <p>현장 지원 시스템</p> -->
-		</div>
+		</div>--%>
+
 		<div class="section_content">
 			<form:form commandName="fieldDataSearchVO" name="searchForm" action="/admin/fieldData" method="get">
+			<div class="d-flex justify-content-between">
+				<div class="check_fidelData">
+					<div class="form-check" >
+						<input type="checkbox" class="statusChkBox" name="status0" value="1" ${fieldDataSearchVO.status0 eq 1?'checked':''}>
+						<label>수집</label>
+						<input type="checkbox" class="statusChkBox" name="status1" value="1" ${fieldDataSearchVO.status1 eq 1?'checked':''}>
+						<label >검증실패</label>
+						<input type="checkbox" class="statusChkBox" name="status2" value="1" ${fieldDataSearchVO.status2 eq 1?'checked':''}>
+						<label >검증</label>
+						<input type="checkbox" class="statusChkBox" name="status3" value="1" ${fieldDataSearchVO.status3 eq 1?'checked':''}>
+						<label >반영실패</label>
+						<input type="checkbox" class="statusChkBox" name="status4" value="1" ${fieldDataSearchVO.status4 eq 1?'checked':''}>
+						<label >반영</label>
+					</div>
+				</div>
 
-			<div class="d-flex justify-content-end">
 				<div class="row">
 					<div class="col-auto">
 						<select class="form-select" name="searchCondition">
@@ -39,19 +54,6 @@
 				</div>
 			</div>
 
-				<%--<div class="search_div">
-					<div class="search_menu">&nbsp;</div>
-					<div class="search_keyword">
-						<select class="form-control search_selectbox" name="searchCondition">
-							<option <c:if test="${fieldDataSearchVO.searchCondition eq 'all'}"><c:out value="selected" /></c:if> value="all">통합검색</option>
-							<option <c:if test="${fieldDataSearchVO.searchCondition eq 'name'}"><c:out value="selected" /></c:if> value="name">이름</option>
-							<option <c:if test="${fieldDataSearchVO.searchCondition eq 'company'}"><c:out value="selected" /></c:if> value="company">소속</option>
-							<option <c:if test="${fieldDataSearchVO.searchCondition eq 'region'}"><c:out value="selected" /></c:if> value="region">위치</option>
-						</select>
-						<input type="text" class="form-control search_inputbox" name="searchKeyword" value="<c:out value="${fieldDataSearchVO.searchKeyword}" />" />
-						<input class="btn btn-outline-secondary" type="submit" value="검색" />
-					</div>
-				</div>--%>
 				
 				<table class="list-table">
 					<thead>

src/main/webapp/WEB-INF/jsp/layout/leftMenu.jsp

@@ -29,7 +29,7 @@
           <img src="/images/icon/icon_map_on.png" width="30" height="30" alt=""> &nbsp;지도사용 요청</li>
         <li <c:if test="${fn:contains(thisURL, '/history')}">class="thisOn"</c:if> onclick="location.href='/admin/history'">
           <img src="/images/icon/icon_log_on.png" width="30" height="30" alt=""> &nbsp;지도사용 이력</li>
-        <li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData'">
+        <li <c:if test="${fn:contains(thisURL, '/fieldData')}">class="thisOn"</c:if> onclick="location.href='/admin/fieldData?status0=1&status1=1&status2=1&status3=1&status4=1'">
           <img src="/images/icon/icon_eq_on.png" width="30" height="30" alt=""> &nbsp;현장수집 데이터</li>
         <li <c:if test="${fn:contains(thisURL, '/userInfo')}">class="thisOn"</c:if> onclick="location.href='/admin/userInfo?auth=99'">
           <img src="/images/icon/icon_supervisor_on.png" width="30" height="30" alt=""> &nbsp;회원 관리</li>

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;
+
 }

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 = "<c:url value='/admin/fieldData' />";
     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;
+}