견문 수정, 상세 페이지 무가치 판정기준 적용.

견문보고 > 관리기능 하위 메뉴 쿼리 오류 수정.

src/main/resources/sqlmapper/mappers/report/report.xml

@@ -1230,19 +1230,14 @@
 	<!-- 평가기록부 -->
 	<select id="Report.selectRecordList" parameterType="reportSearchVO" resultMap="reportMap">
 
-        SELECT 	*
+      SELECT (ROW_NUMBER() OVER()) AS RNUM,
-        FROM 	(
+             T.*
-	    	SELECT
+			FROM (
-	    		(ROW_NUMBER() OVER()) AS RNUM, T.*
+			  SELECT (IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
-			FROM
-				(SELECT
-					(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
 					R.*
-				FROM
+				FROM RPT_INFO R
-					RPT_INFO R
+				WHERE IN_STATE_CODE != '99'
-				WHERE
+					AND IN_COMPLETE = '1'
-					IN_STATE_CODE != '99'
-					AND IN_COMPLETE = 1
 
 			<if test="dateStart != null and dateStart != ''">
 					AND IN_INFODATE &gt;= #{dateStart}::date
@@ -1256,17 +1251,11 @@
 			<if test="placeGroup == null or placeGroup == ''">
 					AND IN_PLACE_CODE = #{userPlace}
 			</if>
-
 			<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
 				ORDER BY ${orderCol} ${orderAsc}
 			</if>
-
+      ) T
-				) T
+      limit #{recordCountPerPage} offset #{firstIndex}
-			)
-	  	WHERE
-	  		RNUM > #{firstIndex} AND
-	  		RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
-
 	</select>
 	<select id="Report.selectRecordListCnt" parameterType="reportSearchVO" resultType="int">
 
@@ -1276,7 +1265,7 @@
 			RPT_INFO
 		WHERE
 			IN_STATE_CODE != '99'
-			AND IN_COMPLETE = 1
+			AND IN_COMPLETE = '1'
 
 		<if test="dateStart != null and dateStart != ''">
 			AND IN_INFODATE &gt;= #{dateStart}::date

src/main/resources/sqlmapper/mappers/report/reportGoal.xml

@@ -19,26 +19,24 @@
 	</resultMap>
 
 	<select id="ReportGoal.selectList" parameterType="reportSearchVO" resultMap="ReportGoalMap">
-		SELECT 
+    select (row_number () over()) AS rn,
-			T.*, ROWNUM AS RN
+           t.*
-		FROM
+    from (
-			(
+           select
-				SELECT 
+             a.name,
-					A.NAME, 
+             a.userid as go_id,
-					A.USERID AS go_id, 
+             coalesce(b.go_goal1, 0) AS goGoal1,
-					COALESCE(G.GO_GOAL1, 0) AS goGoal1, 
+             coalesce(b.go_goal2, 0) AS goGoal2,
-					COALESCE(G.GO_GOAL2, 0) AS goGoal2, 
+             coalesce(b.go_goal3, 0) AS goGoal3,
-					COALESCE(G.GO_GOAL3, 0) AS goGoal3, 
+             coalesce(b.go_goal4, 0) AS goGoal4,
-					COALESCE(G.GO_GOAL4, 0) AS goGoal4,
+             coalesce(b.go_total, 0) AS goTotal
-					COALESCE(G.GO_TOTAL, 0) AS goTotal
+           from tagent a
-				FROM 
+                  left outer join rpt_agent_goal b on a.userid  = b.go_id
-					(SELECT * FROM TAGENT WHERE PLACE1 = #{placeGroup}) A 
+                         and a.place1 = #{placeGroup}
-						LEFT OUTER JOIN  
+                         and b.go_month = ${month}
-					(SELECT DISTINCT * FROM RPT_AGENT_GOAL WHERE GO_MONTH = #{month} AND GO_YEAR = #{year}) G
+                         and b.go_year = ${year}
-						ON G.GO_ID = A.USERID
+           order by position desc, place2, place3, duties, name
-				ORDER BY 
+         ) t
-					POSITION DESC, PLACE2, PLACE3, DUTIES, NAME
-			) T
 	</select>
 	
 	<select id="ReportGoal.select" parameterType="reportGoalVO" resultMap="ReportGoalMap">
@@ -73,27 +71,40 @@
 	</update>
 	
 	<select id="ReportGoal.getStats" parameterType="reportSearchVO" resultType="hashMap">
-		SELECT
+    select (row_number () over()) AS rn,
-			ROWNUM AS RN, T.*
+           t.*
-		FROM
+    from (
-			(
+           select a.name,
-				SELECT 
+                  a.userid as go_id,
-					NAME, 
+                  coalesce(b.go_goal1, 0) AS goal1,
-					COALESCE(GO_GOAL1, 0) AS GOAL1, COALESCE(GO_GOAL2, 0) AS GOAL2, COALESCE(GO_GOAL3, 0) AS GOAL3, COALESCE(GO_GOAL4, 0) AS GOAL4, 
+                  coalesce(b.go_goal2, 0) AS goal2,
-					COALESCE(GO_GOAL1, 0) + COALESCE(GO_GOAL2, 0) + COALESCE(GO_GOAL3, 0) + COALESCE(GO_GOAL4, 0) AS GOAL_TOTAL,
+                  coalesce(b.go_goal3, 0) AS goal3,
-					(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '01') AS RESULT1,
+                  coalesce(b.go_goal4, 0) AS goal4,
-					(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '02') AS RESULT2,
+                  coalesce(b.go_total, 0) AS goal_total,
-					(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 IN ('03', '04', '05')) AS RESULT3,
+                  coalesce(c.result1, 0) as result1,
-					(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH AND IN_CATEGORY4 = '06') AS RESULT4, 
+                  coalesce(c.result2, 0) as result2,
-					(SELECT COUNT(*) FROM RPT_INFO WHERE IN_COMPLETE = 1 AND IN_USERID = A.USERID AND IN_INFO_YEAR = G.GO_YEAR AND IN_INFO_MONTH = G.GO_MONTH) AS RESULT_TOTAL
+                  coalesce(c.result3, 0) as result3,
-				FROM 
+                  coalesce(c.result4, 0) as result4,
-					(SELECT * FROM TAGENT WHERE PLACE1 = #{placeGroup}) A 
+                  coalesce(c.result_total, 0) as result_total
-						LEFT OUTER JOIN 
+           from tagent a
-					(SELECT DISTINCT * FROM RPT_AGENT_GOAL WHERE GO_YEAR = #{year} AND GO_MONTH = #{month}) G 
+                  left outer join rpt_agent_goal b
-						ON G.GO_ID = A.USERID
+                                  on a.place1 = #{placeGroup} and b.go_year = ${year} and b.go_month = ${month} and a.userid = b.go_id
-				ORDER BY
+                  left outer join (
-					POSITION DESC, PLACE2, PLACE3, DUTIES, NAME
+                         select in_userid,
-			) T
+                               count(1) filter (where in_category4 = '01') as result1,
+                               count(1) filter (where in_category4 = '02') as result2,
+                               count(1) filter (where in_category4 in ('03', '04', '05')) as result3,
+                               count(1) filter (where in_category4 = '06') as result4,
+                               count(1) as result_total
+                         from rpt_info
+                         where in_complete = '1'
+                           and in_place_code = #{placeGroup}
+                           and in_info_year = ${year}
+                           and in_info_month = ${month}
+                         group by in_userid
+                       ) c	on c.in_userid = a.userid
+           order by position desc, place2, place3, duties, name
+         ) t
 	</select>
 	
 	<select id="ReportGoal.getStatsPlace" parameterType="reportSearchVO" resultType="hashMap">

src/main/webapp/WEB-INF/jsp/report/goalStats.jsp

@@ -111,64 +111,64 @@
 		<c:forEach var="item" items="${goalStats}" varStatus="status">
 			<tr>
 				<td align="center">
-					<c:out value="${item.RN}"/>
+					<c:out value="${item.rn}"/>
 				</td>
 				<td align="left">
 					<c:if test="${reportSearchVO.placeGroup != '' and reportSearchVO.placeGroup != null}">
-						<c:out value="${item.NAME}"/>
+						<c:out value="${item.name}"/>
 					</c:if>
 					<c:if test="${reportSearchVO.placeGroup == '' or reportSearchVO.placeGroup == null}">
 						<a href="<c:url value="/report/goalStats.do">
-								<c:param name="placeGroup" value="${item.CODE}" />
+								<c:param name="placeGroup" value="${item.code}" />
 								<c:param name="year" value="${reportSearchVO.year}" />
 								<c:param name="month" value="${reportSearchVO.month}" />
-							</c:url>"><span><c:out value="${item.NAME}"/></span></a>
+							</c:url>"><span><c:out value="${item.name}"/></span></a>
 					</c:if>
 				</td>
 				
 				<!-- 전종요원 -->
 				<td align="center">
-					<c:if test="${item.RESULT1 < item.GOAL1}"><span class="text_red"><c:out value="${item.RESULT1}"/></span></c:if>
+					<c:if test="${item.result1 < item.goal1}"><span class="text_red"><c:out value="${item.result1}"/></span></c:if>
-					<c:if test="${item.RESULT1 >= item.GOAL1}"><span class="text_blue"><c:out value="${item.RESULT1}"/></span></c:if>
+					<c:if test="${item.result1 >= item.goal1}"><span class="text_blue"><c:out value="${item.result1}"/></span></c:if>
 				</td>
 				<td align="center">
-					<c:out value="${item.GOAL1}" />
+					<c:out value="${item.goal1}" />
 				</td>
 				
 				<!-- 대외협력 -->
 				<td align="center">
-					<c:if test="${item.RESULT2 < item.GOAL2}"><span class="text_red"><c:out value="${item.RESULT2}"/></span></c:if>
+					<c:if test="${item.result2 < item.goal2}"><span class="text_red"><c:out value="${item.result2}"/></span></c:if>
-					<c:if test="${item.RESULT2 >= item.GOAL2}"><span class="text_blue"><c:out value="${item.RESULT2}"/></span></c:if>
+					<c:if test="${item.result2 >= item.goal2}"><span class="text_blue"><c:out value="${item.result2}"/></span></c:if>
 				</td>
 				<td align="center">
-					<c:out value="${item.GOAL2}" />
+					<c:out value="${item.goal2}" />
 				</td>
 				
 				<!-- 정보협력 -->
 				<td align="center">
-					<c:if test="${item.RESULT3 < item.GOAL3}"><span class="text_red"><c:out value="${item.RESULT3}"/></span></c:if>
+					<c:if test="${item.result3 < item.goal3}"><span class="text_red"><c:out value="${item.result3}"/></span></c:if>
-					<c:if test="${item.RESULT3 >= item.GOAL3}"><span class="text_blue"><c:out value="${item.RESULT3}"/></span></c:if>
+					<c:if test="${item.result3 >= item.goal3}"><span class="text_blue"><c:out value="${item.result3}"/></span></c:if>
 				</td>
 				<td align="center">
-					<c:out value="${item.GOAL3}" />
+					<c:out value="${item.goal3}" />
 				</td>
 				
 				<!-- 신고요원 -->
 				<td align="center">
-					<c:if test="${item.RESULT4 < item.GOAL4}"><span class="text_red"><c:out value="${item.RESULT4}"/></span></c:if>
+					<c:if test="${item.result4 < item.goal4}"><span class="text_red"><c:out value="${item.result4}"/></span></c:if>
-					<c:if test="${item.RESULT4 >= item.GOAL4}"><span class="text_blue"><c:out value="${item.RESULT4}"/></span></c:if>
+					<c:if test="${item.result4 >= item.goal4}"><span class="text_blue"><c:out value="${item.result4}"/></span></c:if>
 				</td>
 				<td align="center">
-					<c:out value="${item.GOAL4}" />
+					<c:out value="${item.goal4}" />
 				</td>
 				
 				<!-- 계 -->
 				<td align="center">
-					<c:if test="${item.RESULT_TOTAL < item.GOAL_TOTAL}"><span class="text_red"><c:out value="${item.RESULT_TOTAL}"/></span></c:if>
+					<c:if test="${item.result_total < item.goal_total}"><span class="text_red"><c:out value="${item.result_total}"/></span></c:if>
-					<c:if test="${item.RESULT_TOTAL >= item.GOAL_TOTAL}"><span class="text_blue"><c:out value="${item.RESULT_TOTAL}"/></span></c:if>
+					<c:if test="${item.result_total >= item.goal_total}"><span class="text_blue"><c:out value="${item.result_total}"/></span></c:if>
 				</td>
 				<td align="center">
-					<c:out value="${item.GOAL_TOTAL}" />
+					<c:out value="${item.goal_total}" />
 				</td>
 			</tr>
 		</c:forEach>

src/main/webapp/WEB-INF/jsp/report/presentList.jsp

@@ -80,6 +80,7 @@
 			<col width="34">
 			<col width="34">
 			<col width="34">
+      <col width="34">
 		</colgroup>
 		
 		<thead>
@@ -91,7 +92,7 @@
 				<th align="center" rowspan="2"><span class="order" value="in_subject"><spring:message code="board.header.title" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
 				<th align="center" rowspan="2"><span class="order" value="in_infodate"><spring:message code="report.view.infodate" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
 				<th align="center" colspan="2" class="tbl_list_col"><spring:message code="report.view.approval" /></th>
-				<th align="center" colspan="7" class="tbl_list_col"><spring:message code="report.type.judge" /></th>
+				<th align="center" colspan="8" class="tbl_list_col"><spring:message code="report.type.judge" /></th>
 				<th align="center" colspan="2" class="tbl_list_col"><spring:message code="report.type.fullReport" /></th>
 			</tr>
 			<tr>
@@ -104,6 +105,7 @@
 				<th align="center"><spring:message code="report.type.record" /></th>
 				<th align="center"><spring:message code="report.type.survey" /></th>
 				<th align="center"><spring:message code="report.type.reference" /></th>
+        <th align="center"><spring:message code="report.type.worthless" /></th>
 				<th align="center"><spring:message code="report.type.fullReport1" /></th>
 				<th align="center"><spring:message code="report.type.fullReport2" /></th>
 			</tr>
@@ -156,9 +158,12 @@
 				<td align="center" class="bold">
 					<c:out value="${result.isJudge6}" />
 				</td>
-				<td align="center" class="bold">
+        <td align="center" class="bold">
-					<c:out value="${result.isJudge7}" />
+          <c:out value="${result.isJudge7}" />
-				</td>
+        </td>
+        <td align="center" class="bold">
+          <c:out value="${result.isJudge8}" />
+        </td>
 				<td align="center" class="bold">
 					<c:out value="${result.isReport1}" />
 				</td>

src/main/webapp/WEB-INF/jsp/report/reportModify.jsp

@@ -360,16 +360,6 @@
 		
 		<c:if test="${reportVO.stateCodeName eq '결재 완료'}">
 			<table class="tbl_add">
-				<colgroup>
-					<col width="200" />
-					<col width="200" />	
-					<col width="200" />	
-					<col width="200" />	
-					<col width="200" />	
-					<col width="200" />	
-					<col width="200" />	
-					<col width="200" />					
-				</colgroup>
 				<tr class="th-bg">
 					<th style="text-align:center;"><spring:message code="report.type.newsflash" /></th>
 					<th style="text-align:center;"><spring:message code="report.type.judge" /></th>
@@ -378,6 +368,7 @@
 					<th style="text-align:center;"><spring:message code="report.type.record" /></th>
 					<th style="text-align:center;"><spring:message code="report.type.survey" /></th>
 					<th style="text-align:center;"><spring:message code="report.type.reference" /></th>
+          <th style="text-align:center;"><spring:message code="report.type.worthless" /></th>
 					<th style="text-align:center;"><spring:message code="report.type.fullReport" /></th>
 				</tr>
 				<tr>
@@ -388,6 +379,7 @@
 					<td align="center"><c:if test="${reportVO.inJudge eq 5}">○</c:if></td>
 					<td align="center"><c:if test="${reportVO.inJudge eq 6}">○</c:if></td>
 					<td align="center"><c:if test="${reportVO.inJudge eq 7}">○</c:if></td>
+          <td align="center"><c:if test="${reportVO.inJudge eq 8}">○</c:if></td>
 					<td align="center"><c:if test="${reportVO.inReport eq 1}">○</c:if></td>
 				</tr>
 			</table>
@@ -398,17 +390,6 @@
 			<%-- 안전서 --%>
 			<c:if test="${(num1 > 1 || (num1 eq 1 && num2 >= 2)) && docGroupCode eq 1}">
 				<table class="tbl_add">
-					<colgroup>
-						<col width="150" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-					</colgroup>
 					<tr class="th-bg">
 						<th>해양경찰서</th>
 						<th style="text-align:center;"><spring:message code="report.type.newsflash"/></th>
@@ -418,6 +399,7 @@
 						<th style="text-align:center;"><spring:message code="report.type.record"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.survey"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.reference"/></th>
+            <th style="text-align:center;"><spring:message code="report.type.worthless"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.fullReport"/></th>
 					</tr>
 					<tr>
@@ -437,6 +419,7 @@
 							<td align="center"><form:radiobutton path="inJudge1" value="5" /></td>
 							<td align="center"><form:radiobutton path="inJudge1" value="6" /></td>
 							<td align="center"><form:radiobutton path="inJudge1" value="7" /></td>
+              <td align="center"><form:radiobutton path="inJudge1" value="8" /></td>
 						</c:if>
 						<c:if test="${loginUser.isSysAdmin eq false}">
 							<td align="center"><c:if test="${reportVO.inJudge1 eq 1}">○</c:if></td>
@@ -446,6 +429,7 @@
 							<td align="center"><c:if test="${reportVO.inJudge1 eq 5}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge1 eq 6}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge1 eq 7}">○</c:if></td>
+              <td align="center"><c:if test="${reportVO.inJudge1 eq 8}">○</c:if></td>
 						</c:if>
 						<td align="center"><c:if test="${reportVO.inReport1 > 0}">○</c:if></td>
 					</tr>
@@ -459,6 +443,7 @@
 							<td align="center"><c:if test="${reportVO.inJudge5 eq 5}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge5 eq 6}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge5 eq 7}">○</c:if></td>
+              <td align="center"><c:if test="${reportVO.inJudge5 eq 8}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inReport5 > 0}">○</c:if></td>
 						</tr>
 					</c:if>
@@ -506,17 +491,6 @@
 			<%-- 지방청 --%>
 			<c:if test="${(num1 > 2 || (num1 eq 2 && num2 >= 2)) && docGroupCode <= 2}">
 				<table class="tbl_add">
-					<colgroup>
-						<col width="150" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-						<col width="40" />
-					</colgroup>
 					<tr>
 						<th>지방해양경찰청</th>
 						<th style="text-align:center;"><spring:message code="report.type.newsflash"/></th>
@@ -526,6 +500,7 @@
 						<th style="text-align:center;"><spring:message code="report.type.record"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.survey"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.reference"/></th>
+            <th style="text-align:center;"><spring:message code="report.type.worthless"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.fullReport"/></th>
 					</tr>
 					<tr>
@@ -545,6 +520,7 @@
 							<td align="center"><form:radiobutton path="inJudge2" value="5" /></td>
 							<td align="center"><form:radiobutton path="inJudge2" value="6" /></td>
 							<td align="center"><form:radiobutton path="inJudge2" value="7" /></td>
+              <td align="center"><form:radiobutton path="inJudge2" value="8" /></td>
 						</c:if>
 						<c:if test="${loginUser.isSysAdmin eq false}">
 							<td align="center"><c:if test="${reportVO.inJudge2 eq 1}">○</c:if></td>
@@ -554,6 +530,7 @@
 							<td align="center"><c:if test="${reportVO.inJudge2 eq 5}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge2 eq 6}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge2 eq 7}">○</c:if></td>
+              <td align="center"><c:if test="${reportVO.inJudge2 eq 8}">○</c:if></td>
 						</c:if>
 						<td align="center"><c:if test="${reportVO.inReport2 > 0}">○</c:if></td>
 					</tr>
@@ -567,6 +544,7 @@
 							<td align="center"><c:if test="${reportVO.inJudge6 eq 5}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge6 eq 6}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge6 eq 7}">○</c:if></td>
+              <td align="center"><c:if test="${reportVO.inJudge6 eq 8}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inReport6 > 0}">○</c:if></td>
 						</tr>
 					</c:if>
@@ -614,16 +592,6 @@
 			<%-- 본청 --%>
 			<c:if test="${num1 eq 3 && num2 >= 2 && docGroupCode <= 3}">
 				<table class="tbl_add">
-					<colgroup>
-						<col width="125">
-						<col width="125">
-						<col width="125">
-						<col width="125">
-						<col width="125">
-						<col width="125">
-						<col width="125">
-						<col width="125">						
-					</colgroup>
 					<tr class="th-bg">
 						<th>본청</th>
 						<th style="text-align:center;"><spring:message code="report.type.newsflash"/></th>
@@ -633,6 +601,7 @@
 						<th style="text-align:center;"><spring:message code="report.type.record"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.survey"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.reference"/></th>
+            <th style="text-align:center;"><spring:message code="report.type.worthless"/></th>
 						<th style="text-align:center;"><spring:message code="report.type.fullReport"/></th>
 					</tr>
 					<tr>
@@ -652,6 +621,7 @@
 							<td align="center"><form:radiobutton path="inJudge3" value="5" /></td>
 							<td align="center"><form:radiobutton path="inJudge3" value="6" /></td>
 							<td align="center"><form:radiobutton path="inJudge3" value="7" /></td>
+              <td align="center"><form:radiobutton path="inJudge3" value="8" /></td>
 						</c:if>
 						<c:if test="${loginUser.isSysAdmin eq false}">
 							<td align="center"><c:if test="${reportVO.inJudge3 eq 1}">○</c:if></td>
@@ -661,6 +631,7 @@
 							<td align="center"><c:if test="${reportVO.inJudge3 eq 5}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge3 eq 6}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge3 eq 7}">○</c:if></td>
+              <td align="center"><c:if test="${reportVO.inJudge3 eq 8}">○</c:if></td>
 						</c:if>
 						<td align="center"><c:if test="${reportVO.inReport3 > 0}">○</c:if></td>
 					</tr>
@@ -674,6 +645,7 @@
 							<td align="center"><c:if test="${reportVO.inJudge4 eq 5}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge4 eq 6}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inJudge4 eq 7}">○</c:if></td>
+              <td align="center"><c:if test="${reportVO.inJudge4 eq 8}">○</c:if></td>
 							<td align="center"><c:if test="${reportVO.inReport4 > 0}">○</c:if></td>
 						</tr>
 					</c:if>