견문보고 일부 수정

pom.xml

@@ -277,6 +277,13 @@
 			<version>2.0.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+			<version>1.3.2</version>
+		</dependency>
+
+
 	</dependencies>
 	<build>
 		<defaultGoal>install</defaultGoal>

src/main/java/kcg/imis/report/vo/ReportVO.java

@@ -28,7 +28,7 @@ public class ReportVO {
 				+ fileObj3 + ", strInfodate=" + strInfodate + ", stateCodeName=" + stateCodeName + ", inCategory1Str=" + inCategory1Str + ", inCategory2Str=" + inCategory2Str + ", cateStrOrder="
 				+ cateStrOrder + ", docNo=" + docNo + ", reporter=" + reporter + ", judgeStr=" + judgeStr + ", fullReportStr=" + fullReportStr + ", juMsg=" + juMsg + ", isHead=" + isHead
 				+ ", isSection=" + isSection + ", isJudge1=" + isJudge1 + ", isJudge2=" + isJudge2 + ", isJudge3=" + isJudge3 + ", isJudge4=" + isJudge4 + ", isJudge5=" + isJudge5 + ", isJudge6="
-				+ isJudge6 + ", isJudge7=" + isJudge7 + ", isReport1=" + isReport1 + ", isReport2=" + isReport2 + ", stateCode1=" + stateCode1 + ", stateCode2=" + stateCode2 + ", reportList="
+				+ isJudge6 + ", isJudge7=" + isJudge7 +", isJudge8=" + isJudge8 + ", isReport1=" + isReport1 + ", isReport2=" + isReport2 + ", stateCode1=" + stateCode1 + ", stateCode2=" + stateCode2 + ", reportList="
 				+ reportList + "]";
 	}
 	/**
@@ -179,7 +179,7 @@ public class ReportVO {
 	
 	private String inRegdateStr;
 	/**
-	 * 평가(1:특보, 2:판단, 3:중보, 4:통보, 5:기록, 6:조사, 7:참고)
+	 * 평가(1:특보, 2:판단, 3:중보, 4:통보, 5:기록, 6:조사, 7:참고,8:무가치)
 	 */
 	private int inJudge;
 	
@@ -286,6 +286,7 @@ public class ReportVO {
 	private String isJudge5;
 	private String isJudge6;
 	private String isJudge7;
+	private String isJudge8;
 	private String isReport1;
 	private String isReport2;
 	
@@ -479,6 +480,9 @@ public class ReportVO {
 		case 7:
 			this.isJudge7 = STRCORRECT;
 			break;
+		case 8:
+			this.isJudge8 = STRCORRECT;
+			break;
 		default:
 			break;
 		}
@@ -623,6 +627,9 @@ public class ReportVO {
 	public String getIsJudge7() {
 		return isJudge7;
 	}
+	public String getIsJudge8() {
+		return isJudge8;
+	}
 	public String getIsReport1() {
 		return isReport1;
 	}

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

@@ -250,7 +250,7 @@
 	        	  ELSE '상보' END) AS fullReportStr, 
 	    	(CASE 
 	    		WHEN judge = 1 THEN '특보' WHEN judge = 2 THEN '판단' WHEN judge = 3 THEN '중보' WHEN judge = 4 THEN '통보'
-	    		WHEN judge = 5 THEN '기록' WHEN judge = 6 THEN '조사' WHEN judge = 7 THEN '참고'
+	    		WHEN judge = 5 THEN '기록' WHEN judge = 6 THEN '조사' WHEN judge = 7 THEN '참고' WHEN judge = 8 THEN '무가치'
 	    	END) AS judgeStr
        	FROM
        		(
@@ -460,7 +460,7 @@
 			, T1.IN_FILE_NAME3
 			, CASE 
 	    		WHEN in_judge = 1 THEN '특보' WHEN in_judge = 2 THEN '판단' WHEN in_judge = 3 THEN '중보' WHEN in_judge = 4 THEN '통보'
-	    		WHEN in_judge = 5 THEN '기록' WHEN in_judge = 6 THEN '조사' WHEN in_judge = 7 THEN '참고'
+	    		WHEN in_judge = 5 THEN '기록' WHEN in_judge = 6 THEN '조사' WHEN in_judge = 7 THEN '참고' WHEN in_judge = 8 THEN '무가치'
 	    	END AS judgeStr
 		FROM H2_REPORT_INFO T1 
 	    	LEFT JOIN  H2_COMMON_CODE T2 ON  T1.IN_CATEGORY1 = T2.CC_CODE AND T2.CC_GROUP = 'CAT1'

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

@@ -231,6 +231,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>
 				</tr>
 				<tr>
 					<td align="center"><c:if test="${reportVO.inJudge eq 1}">○</c:if></td>
@@ -240,6 +241,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>
 				</tr>
 			</table>
 		</c:if>
@@ -264,6 +266,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>
 				</tr>
 				<tr>
 					<td align="center">
@@ -280,7 +283,9 @@
 					<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="4"/></c:if></td>
 					<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="5"/></c:if></td>
 					<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="6"/></c:if></td>
-					<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="7" checked="checked" /></c:if></td>
+					<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="7" /></c:if></td>
+					<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="8" checked="checked" /></c:if></td>
+
 				</tr>
 				<tr>
 					<th>평가자</th>

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

@@ -69,7 +69,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"><spring:message code="report.view.approval" /></th>
-				<th align="center" colspan="7"><spring:message code="report.type.judge" /></th>
+				<th align="center" colspan="8"><spring:message code="report.type.judge" /></th>
 			</tr>
 			<tr>
 				<th align="center">팀장</th>
@@ -81,6 +81,8 @@
 				<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" width="20"><spring:message code="report.type.worthless" /></th>
+
 			</tr>
 		</thead>
 		<c:forEach var="result" items="${reportList}" varStatus="status">
@@ -126,6 +128,9 @@
 				<td align="center">
 					<c:out value="${result.isJudge7}" />
 				</td>
+				<td align="center">
+					<c:out value="${result.isJudge8}" />
+				</td>
 			</tr>
 		</c:forEach>
 		<c:if test="${reportList.size() <= 0 }">

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

@@ -77,7 +77,7 @@
 				<th align="center" rowspan="2"><span class="order" value="in_name"><spring:message code="report.search.place" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
 				<th align="center" rowspan="2"><span class="order" value="in_name"><spring:message code="report.search.reporter" /><img src="/images/cmmn/blank_1x1.png" /></span></th>
 				<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" 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>
 			</tr>
 			<tr>
 				<th align="center"><spring:message code="report.type.newsflash" /></th>
@@ -87,6 +87,8 @@
 				<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" width="20"><spring:message code="report.type.worthless" /></th>
+
 			</tr>
 		</thead>
 		
@@ -133,6 +135,9 @@
 				<td align="center">
 					<c:out value="${result.isJudge7}" />
 				</td>
+				<td align="center">
+					<c:out value="${result.isJudge8}" />
+				</td>
 			</tr>
 		</c:forEach>
 		<c:if test="${reportList.size() <= 0 }">

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

@@ -55,7 +55,7 @@
 				<th align="center" rowspan="2"><span class="order">제목</span></th>
 				<th align="center" rowspan="2"><span class="order">보고일</span></th>
 				<th align="center" colspan="2" class="tbl_list3_col">결재</th>
-				<th align="center" colspan="7" class="tbl_list3_col">판단</th>
+				<th align="center" colspan="8" class="tbl_list3_col">판단</th>
 				<th align="center" rowspan="2"><span class="order">분야1</span></th>
 				<th align="center" rowspan="2"><span class="order">분야2</span></th>
 			</tr>
@@ -69,6 +69,7 @@
 				<th align="center">기록</th>
 				<th align="center">조사</th>
 				<th align="center">참고</th>
+				<th align="center">무가치</th>
 			</tr>
 			</thead>
 			<c:forEach var="result" items="${reportList}" varStatus="status">
@@ -86,6 +87,7 @@
 					<td align="center"><c:if test="${result.inJudge eq '5'}">O</c:if></td>
 					<td align="center"><c:if test="${result.inJudge eq '6'}">O</c:if></td>
 					<td align="center"><c:if test="${result.inJudge eq '7'}">O</c:if></td>
+					<td align="center"><c:if test="${result.inJudge eq '8'}">O</c:if></td>
 					<td align="center"><c:out value="${result.inCategory1Str}" /></td>
 					<td align="center"><c:out value="${result.inCategory2Str}" /></td>
 				</tr>

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

@@ -85,7 +85,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>
 			</tr>
 			<tr>
 				<th align="center">담당관</th>
@@ -97,6 +97,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" width="20"><spring:message code="report.type.worthless" /></th>
 			</tr>
 		</thead>
 		
@@ -147,6 +148,9 @@
 				<td align="center" class="bold">
 					<c:out value="${result.isJudge7}" />
 				</td>
+				<td align="center" class="bold">
+					<c:out value="${result.isJudge8}" />
+				</td>
 			</tr>
 		</c:forEach>
 		</form:form>

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

@@ -92,6 +92,8 @@
 						<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>
+
 						<c:if test="${myGroupCode ne 3}">
 							<th align="center"><spring:message code="report.type.fullReport" /></th>
 						</c:if>
@@ -138,7 +140,8 @@
 						<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="4"/></td>
 						<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="5"/></td>
 						<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="6"/></td>
-						<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="7" checked="checked"/></td>
+						<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="7"/></td>
+						<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="8" checked="checked"/></td>
 						<c:if test="${myGroupCode ne 3}">
 							<td align="center"><input type="checkbox" name="reportList[${status.index}].inReport" value="1"/></td>
 						</c:if>
@@ -149,7 +152,7 @@
 		</c:forEach>
 		</form:form>
 		<c:if test="${reportList.size() <= 0}">
-			<tr><td align="center" colspan="10"><spring:message code="report.nodata" /></td></tr>
+			<tr><td align="center" colspan="20"><spring:message code="report.nodata" /></td></tr>
 		</c:if>
 	</table>
 </div>

src/main/webapp/dll/h2_common_code_data.sql

@@ -6,4 +6,5 @@ VALUES
 ('DC05', '04', '통보', '', NOW(), '', 4, 'Y'),
 ('DC05', '05', '기록', '', NOW(), '', 5, 'Y'),
 ('DC05', '06', '조사', '', NOW(), '', 6, 'Y'),
-('DC05', '07', '참고', '', NOW(), '', 7, 'Y');
+('DC05', '07', '참고', '', NOW(), '', 7, 'Y'),
+('DC05', '08', '무가치', '', NOW(), '', 8, 'Y');