DBNT
/
FAICS
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

결재 기능 수정중.

master
강석 최 2022-05-12 18:05:30 +09:00
parent 140357e136
commit 4c616bd1a0
11 changed files with 2271 additions and 2197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/kcg/faics/report/vo/ReportVO.java
View File

@ -348,6 +348,7 @@ public class ReportVO {
private String isJudge5; private String isJudge5;
private String isJudge6; private String isJudge6;
private String isJudge7; private String isJudge7;
private String isJudge8;
private String isReport1; private String isReport1;
private String isReport2; private String isReport2;
@ -613,9 +614,12 @@ public class ReportVO {
case 6: case 6:
this.isJudge6 = STRCORRECT; this.isJudge6 = STRCORRECT;
break; break;
case 7: case 7:
this.isJudge7 = STRCORRECT; this.isJudge7 = STRCORRECT;
break; break;
case 8:
this.isJudge8 = STRCORRECT;
break;
default: default:
break; break;
} }
@ -906,9 +910,12 @@ public class ReportVO {
public String getIsJudge6() { public String getIsJudge6() {
return isJudge6; return isJudge6;
} }
public String getIsJudge7() { public String getIsJudge7() {
return isJudge7; return isJudge7;
} }
public String getIsJudge8() {
return isJudge8;
}
public String getIsReport1() { public String getIsReport1() {
return isReport1; return isReport1;
} }
@ -981,8 +988,8 @@ public class ReportVO {
+ ", isSection=" + isSection + ", isJudge2=" + isJudge2 + ", isSection=" + isSection + ", isJudge2=" + isJudge2
+ ", isJudge3=" + isJudge3 + ", isJudge4=" + isJudge4 + ", isJudge3=" + isJudge3 + ", isJudge4=" + isJudge4
+ ", isJudge5=" + isJudge5 + ", isJudge6=" + isJudge6 + ", isJudge5=" + isJudge5 + ", isJudge6=" + isJudge6
+ ", isJudge7=" + isJudge7 + ", isReport1=" + isReport1 + ", isJudge7=" + isJudge7 + ", isJudge8=" + isJudge8
+ ", isReport2=" + isReport2 + ", reportList=" + reportList + ", isReport1=" + isReport1 + ", isReport2=" + isReport2 + ", reportList=" + reportList
+ "]"; + "]";
} }
} }

1681
src/main/resources/message/message-common_ko.properties
View File

File diff suppressed because it is too large Load Diff

28
src/main/resources/property/globals.properties
View File

@ -1,17 +1,17 @@
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
# #
# globals.properties : \uc2dc\uc2a4\ud15c # globals.properties : \uC2DC\uC2A4\uD15C
# #
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
# 1. key = value \uad6c\uc870\uc785\ub2c8\ub2e4. # 1. key = value \uAD6C\uC870\uC785\uB2C8\uB2E4.
# 2. key\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \ud3ec\ud568\ubd88\uac00, value\uac12\uc740 \uacf5\ubc31\ubb38\uc790\ub97c \uac00\ub2a5 # 2. key\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uD3EC\uD568\uBD88\uAC00, value\uAC12\uC740 \uACF5\uBC31\uBB38\uC790\uB97C \uAC00\uB2A5
# 3. key\uac12\uc73c\ub85c \ud55c\uae00\uc744 \uc0ac\uc6a9\ubd88\uac00, value\uac12\uc740 \ud55c\uae00\uc0ac\uc6a9\uc774 \uac00\ub2a5 # 3. key\uAC12\uC73C\uB85C \uD55C\uAE00\uC744 \uC0AC\uC6A9\uBD88\uAC00, value\uAC12\uC740 \uD55C\uAE00\uC0AC\uC6A9\uC774 \uAC00\uB2A5
# 4. \uc904\uc744 \ubc14\uafc0 \ud544\uc694\uac00 \uc788\uc73c\uba74 '\'\ub97c \ub77c\uc778\uc758 \ub05d\uc5d0 \ucd94\uac00(\ub9cc\uc57d '\'\ubb38\uc790\ub97c \uc0ac\uc6a9\ud574\uc57c \ud558\ub294 \uacbd\uc6b0\ub294 '\\'\ub97c \uc0ac\uc6a9) # 4. \uC904\uC744 \uBC14\uAFC0 \uD544\uC694\uAC00 \uC788\uC73C\uBA74 '\'\uB97C \uB77C\uC778\uC758 \uB05D\uC5D0 \uCD94\uAC00(\uB9CC\uC57D '\'\uBB38\uC790\uB97C \uC0AC\uC6A9\uD574\uC57C \uD558\uB294 \uACBD\uC6B0\uB294 '\\'\uB97C \uC0AC\uC6A9)
# 5. Windows\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '\\' or '/' ('\' \uc0ac\uc6a9\ud558\uba74 \uc548\ub428) # 5. Windows\uC5D0\uC11C\uC758 \uB514\uB809\uD1A0\uB9AC \uD45C\uC2DC : '\\' or '/' ('\' \uC0AC\uC6A9\uD558\uBA74 \uC548\uB428)
# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/' # 6. Unix\uC5D0\uC11C\uC758 \uB514\uB809\uD1A0\uB9AC \uD45C\uC2DC : '/'
# 7. \uc8fc\uc11d\ubb38 \ucc98\ub9ac\ub294 #\uc0ac\uc6a9 # 7. \uC8FC\uC11D\uBB38 \uCC98\uB9AC\uB294 #\uC0AC\uC6A9
# 8. value\uac12 \ub4a4\uc5d0 \uc2a4\ud398\uc774\uc2a4\uac00 \uc874\uc7ac\ud558\ub294 \uacbd\uc6b0 \uc11c\ube14\ub9bf\uc5d0\uc11c \ucc38\uc870\ud560\ub54c\ub294 \uc5d0\ub7ec\ubc1c\uc0dd\ud560 \uc218 \uc788\uc73c\ubbc0\ub85c trim()\ud558\uac70\ub098 \ub9c8\uc9c0\ub9c9 \uacf5\ubc31\uc5c6\uc774 properties \uac12\uc744 \uc124\uc815\ud560\uac83 # 8. value\uAC12 \uB4A4\uC5D0 \uC2A4\uD398\uC774\uC2A4\uAC00 \uC874\uC7AC\uD558\uB294 \uACBD\uC6B0 \uC11C\uBE14\uB9BF\uC5D0\uC11C \uCC38\uC870\uD560\uB54C\uB294 \uC5D0\uB7EC\uBC1C\uC0DD\uD560 \uC218 \uC788\uC73C\uBBC0\uB85C trim()\uD558\uAC70\uB098 \uB9C8\uC9C0\uB9C9 \uACF5\uBC31\uC5C6\uC774 properties \uAC12\uC744 \uC124\uC815\uD560\uAC83
#----------------------------------------------------------------------- #-----------------------------------------------------------------------
#DBServiceServer #DBServiceServer
@ -62,18 +62,18 @@ Global.crypto.hased.password = U7Epd/1HVt76n5o0NAXS9f1ArmdigKFEJYgRfWeBjIA=
Global.crypto.password.algorithm = SHA-256 Global.crypto.password.algorithm = SHA-256
#System URL #System URL
#\uc0ac\uc774\ubc84\uc678\uc0ac\uc815\ubcf4\uc2dc\uc2a4\ud15c(\uad6c) #\uC0AC\uC774\uBC84\uC678\uC0AC\uC815\uBCF4\uC2DC\uC2A4\uD15C(\uAD6C)
Url.FAICS.preSystem = http://10.29.9.40:8500/login.aspx Url.FAICS.preSystem = http://10.29.9.40:8500/login.aspx
#\uad6d\uc81c\ud574\uc591\uc815\ubcf4\uc2dc\uc2a4\ud15c(\uc2e4\uc11c\ubc84) #\uAD6D\uC81C\uD574\uC591\uC815\uBCF4\uC2DC\uC2A4\uD15C(\uC2E4\uC11C\uBC84)
Url.IMIS.loginProc = http://10.29.16.122 Url.IMIS.loginProc = http://10.29.16.122
#\uad6d\uc81c\ud574\uc591\uc815\ubcf4\uc2dc\uc2a4\ud15c(\ud14c\uc2a4\ud2b8) #\uAD6D\uC81C\uD574\uC591\uC815\uBCF4\uC2DC\uC2A4\uD15C(\uD14C\uC2A4\uD2B8)
#Url.IMIS.loginProc = http://192.168.10.115:8888/logic_login.php #Url.IMIS.loginProc = http://192.168.10.115:8888/logic_login.php
#\uad6d\ubbfc\uc548\uc804\ucc98 #\uAD6D\uBBFC\uC548\uC804\uCC98
Url.MPSS = http://www.mpss.go.kr/ Url.MPSS = http://www.mpss.go.kr/
#\uc815\uc801 \uc18c\uc2a4 \ubc84\uc804 #\uc815\uc801 \uc18c\uc2a4 \ubc84\uc804
StaticFile.version=180102 #StaticFile.version=180102

652
src/main/resources/sqlmapper/mappers/report/report.xml
View File

File diff suppressed because it is too large Load Diff

4
src/main/resources/sqlmapper/mappers/report/reportFile.xml
View File

@ -21,8 +21,8 @@
<insert id="ReportFile.insertFileSeq"> <insert id="ReportFile.insertFileSeq">
INSERT INTO RPT_FILE_STORAGE (FS_FILE_COUNT) VALUES (1) INSERT INTO RPT_FILE_STORAGE (FS_FILE_COUNT) VALUES (1)
<selectKey resultType="int" keyProperty="fsSeq" order="AFTER"> <selectKey resultType="int" keyProperty="fsSeq" order="AFTER">
SELECT RPT_FILE_STORAGE_FS_SEQ_SEQ.CURRVAL FROM DUAL SELECT currval('rpt_file_seq') as fsSeq
</selectKey> </selectKey>
</insert> </insert>
<update id="ReportFile.updateFileSeq" parameterType="hashMap"> <update id="ReportFile.updateFileSeq" parameterType="hashMap">

4
src/main/resources/sqlmapper/mappers/report/reportJudge.xml
View File

@ -94,8 +94,8 @@
#{juPosition}, #{juName}, #{juUserid}, #{juProxyId}, #{juDutiesCode}, #{juMessage}) #{juPosition}, #{juName}, #{juUserid}, #{juProxyId}, #{juDutiesCode}, #{juMessage})
]]> ]]>
<selectKey resultType="int" keyProperty="juInseq" order="AFTER"> <selectKey resultType="int" keyProperty="juInseq" order="AFTER">
SELECT RPT_JUDGE_HISTORY_JU_SEQ_SEQ.CURRVAL FROM DUAL SELECT currval('rpt_ju_seq') as juInseq
</selectKey> </selectKey>
</insert> </insert>
<update id="ReportJudge.update" parameterType="reportJudgeVO"> <update id="ReportJudge.update" parameterType="reportJudgeVO">

1663
src/main/webapp/WEB-INF/jsp/report/approval.jsp
View File

File diff suppressed because it is too large Load Diff

359
src/main/webapp/WEB-INF/jsp/report/approveList.jsp
View File

@ -10,198 +10,203 @@
<%@ taglib prefix="ct" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="ct" tagdir="/WEB-INF/tags" %>
<div class="search2"> <div class="search2">
<form:form commandName="reportSearchVO" name="searchForm" method="get"> <form:form commandName="reportSearchVO" name="searchForm" method="get">
<form:hidden path="orderCol"/> <form:hidden path="orderCol"/>
<form:hidden path="orderAsc"/> <form:hidden path="orderAsc"/>
<form:hidden path="pageIndex" /> <form:hidden path="pageIndex" />
<ul> <ul>
<li><b><spring:message code="report.search.period" /></b></li> <li><b><spring:message code="report.search.period" /></b></li>
<li class="margin-left"> <li class="margin-left">
<form:input path="dateStart" /> <form:input path="dateStart" />
~ ~
<form:input path="dateEnd"/> <form:input path="dateEnd"/>
</li> </li>
<li class="margin-left"><b><spring:message code="board.header.title" /></b> 　</li> <li class="margin-left"><b><spring:message code="board.header.title" /></b> 　</li>
<li class="w-300"> <li class="w-300">
<form:input path="subject"/> <form:input path="subject"/>
</li> </li>
<li> <li>
<span class="btn_blue"> <span class="btn_blue">
<a href="javascript:fn_search();"><spring:message code="button.goSearch" /></a> <a href="javascript:fn_search();"><spring:message code="button.goSearch" /></a>
</span> </span>
</li> </li>
</ul> </ul>
</form:form> </form:form>
</div> </div>
<!-- List --> <!-- List -->
<div id="table"> <div id="table">
<div class="pageinfo"> <div class="pageinfo">
<ct:pageInfo /> <ct:pageInfo />
<ul class="right btn-style"> <ul class="right btn-style">
<li><a href="javascript:fn_get_excel();" class="btn_excel"></a></li> <li><a href="javascript:fn_get_excel();" class="btn_excel"></a></li>
<li><a href="#" class="btn_reset" onclick="location.reload();"></a></li> <li><a href="#" class="btn_reset" onclick="location.reload();"></a></li>
</ul> </ul>
</div> </div>
<table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다."> <table class="tbl_list" width="100%" border="0" cellpadding="0" cellspacing="0" summary="게시판 목록을 확인 할 수 있습니다.">
<caption class="hidden">게시판 목록</caption> <caption class="hidden">게시판 목록</caption>
<colgroup> <colgroup>
<col width="110"> <col width="110">
<col width="100"> <col width="100">
<col width="?"> <col width="?">
<col width="75"> <col width="75">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
<col width="34"> <col width="34">
</colgroup> <col width="34">
<thead> </colgroup>
<tr> <thead>
<th align="center" rowspan="2"><span class="order" value="in_seq"><spring:message code="report.list.num" /><img src="/images/cmmn/blank_1x1.png" /></span></th> <tr>
<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_seq"><spring:message code="report.list.num" /><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" 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_infodate"><spring:message code="report.view.infodate" /><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="2"><spring:message code="report.view.approval" /></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="7"><spring:message code="report.type.judge" /></th> <th align="center" colspan="2"><spring:message code="report.view.approval" /></th>
<th align="center" colspan="2"><spring:message code="report.type.fullReport" /></th> <th align="center" colspan="8"><spring:message code="report.type.judge" /></th>
</tr> <th align="center" colspan="2"><spring:message code="report.type.fullReport" /></th>
<tr> </tr>
<th align="center"><spring:message code="member.view.rptPermission.section" /></th> <tr>
<th align="center"><spring:message code="member.view.rptPermission.head" /></th> <th align="center"><spring:message code="member.view.rptPermission.section" /></th>
<th align="center"><spring:message code="report.type.newsflash" /></th> <th align="center"><spring:message code="member.view.rptPermission.head" /></th>
<th align="center"><spring:message code="report.type.judge" /></th> <th align="center"><spring:message code="report.type.newsflash" /></th>
<th align="center"><spring:message code="report.type.middle" /></th> <th align="center"><spring:message code="report.type.judge" /></th>
<th align="center"><spring:message code="report.type.notice" /></th> <th align="center"><spring:message code="report.type.middle" /></th>
<th align="center"><spring:message code="report.type.record" /></th> <th align="center"><spring:message code="report.type.notice" /></th>
<th align="center"><spring:message code="report.type.survey" /></th> <th align="center"><spring:message code="report.type.record" /></th>
<th align="center"><spring:message code="report.type.reference" /></th> <th align="center"><spring:message code="report.type.survey" /></th>
<th align="center"><spring:message code="report.type.fullReport1" /></th> <th align="center"><spring:message code="report.type.reference" /></th>
<th align="center"><spring:message code="report.type.fullReport2" /></th> <th align="center"><spring:message code="report.type.worthless" /></th>
</tr> <th align="center"><spring:message code="report.type.fullReport1" /></th>
</thead> <th align="center"><spring:message code="report.type.fullReport2" /></th>
<c:forEach var="result" items="${reportList}" varStatus="status"> </tr>
<tr> </thead>
<td align="center"> <c:forEach var="result" items="${reportList}" varStatus="status">
<c:out value="${result.docNo}"/> <tr>
</td> <td align="center">
<td align="center"> <c:out value="${result.docNo}"/>
<c:out value="${result.reporter}" /> </td>
</td> <td align="center">
<td align="left"> <c:out value="${result.reporter}" />
<a href="<c:url value="/report/updateApprove.do"><c:param name="inSeq" value="${result.inSeq}" /></c:url>"> </td>
<c:out value="${result.inSubject}"/> <td align="left">
</a> <a href="<c:url value="/report/updateApprove.do"><c:param name="inSeq" value="${result.inSeq}" /></c:url>">
</td> <c:out value="${result.inSubject}"/>
<td align="center"> </a>
<c:out value="${result.inInfodate}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.inInfodate}" />
<c:out value="${result.isSection}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isSection}" />
<c:out value="${result.isHead}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isHead}" />
<c:out value="${result.isJudge1}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge1}" />
<c:out value="${result.isJudge2}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge2}" />
<c:out value="${result.isJudge3}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge3}" />
<c:out value="${result.isJudge4}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge4}" />
<c:out value="${result.isJudge5}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge5}" />
<c:out value="${result.isJudge6}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge6}" />
<c:out value="${result.isJudge7}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge7}" />
<c:out value="${result.isReport1}" /> </td>
</td> <td align="center">
<td align="center"> <c:out value="${result.isJudge8}" />
<c:out value="${result.isReport2}"/> </td>
</td> <td align="center">
</tr> <c:out value="${result.isReport1}" />
</c:forEach> </td>
<c:if test="${reportList.size() <= 0 }"> <td align="center">
<tr><td align="center" colspan="15"><spring:message code="report.nodata" /></td></tr> <c:out value="${result.isReport2}"/>
</c:if> </td>
</table> </tr>
</c:forEach>
<c:if test="${reportList.size() <= 0 }">
<tr><td align="center" colspan="15"><spring:message code="report.nodata" /></td></tr>
</c:if>
</table>
</div> </div>
<!-- /List --> <!-- /List -->
<div id="paging"> <div id="paging">
<ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" /> <ui:pagination paginationInfo="${paginationInfo}" type="image" jsFunction="fn_link_page" />
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
<!-- <!--
$(document).ready(function(){ $(document).ready(function(){
//날짜 설정 //날짜 설정
$('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'}); $('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'});
// 조건보기
$('#btnCondigion').click(function(){
$('#tbCondition').toggle();
});
// 정렬 // 조건보기
if (document.searchForm.orderCol && document.searchForm.orderCol.value.length > 0) { $('#btnCondigion').click(function(){
$('input[value=' + document.searchForm.orderCol.value + '] img') $('#tbCondition').toggle();
.attr('src', (document.searchForm.orderAsc.value == 'DESC') ? '/images/cmmn/order_desc.gif' : '/images/cmmn/order_asc.gif'); });
}
$('.order').click(function(){
var ordercode = $(this).attr('value');
if (document.searchForm.orderCol.value == ordercode) {
if (document.searchForm.orderAsc.value == 'ASC') {
document.searchForm.orderAsc.value = 'DESC';
} else {
document.searchForm.orderAsc.value = 'ASC';
}
} else {
document.searchForm.orderAsc.value = 'DESC';
}
document.searchForm.orderCol.value = ordercode;
document.searchForm.action = "<c:out value='/report/approveList.do' />";
document.searchForm.submit();
});
});
// 검색하기 // 정렬
function fn_search() { if (document.searchForm.orderCol && document.searchForm.orderCol.value.length > 0) {
document.searchForm.action = "<c:out value='/report/approveList.do' />"; $('input[value=' + document.searchForm.orderCol.value + '] img')
document.searchForm.submit(); .attr('src', (document.searchForm.orderAsc.value == 'DESC') ? '/images/cmmn/order_desc.gif' : '/images/cmmn/order_asc.gif');
} }
$('.order').click(function(){
var ordercode = $(this).attr('value');
if (document.searchForm.orderCol.value == ordercode) {
if (document.searchForm.orderAsc.value == 'ASC') {
document.searchForm.orderAsc.value = 'DESC';
} else {
document.searchForm.orderAsc.value = 'ASC';
}
} else {
document.searchForm.orderAsc.value = 'DESC';
}
document.searchForm.orderCol.value = ordercode;
//견문 엑셀받기 document.searchForm.action = "<c:out value='/report/approveList.do' />";
function fn_get_excel() { document.searchForm.submit();
alert('개발중'); });
document.searchForm.action = "<c:out value='/report/approveExcel.do' />"; });
document.searchForm.submit();
} // 검색하기
function fn_search() {
/* pagination 페이지 링크 function */ document.searchForm.action = "<c:out value='/report/approveList.do' />";
function fn_link_page(pageNo) { document.searchForm.submit();
document.searchForm.pageIndex.value = pageNo; }
document.searchForm.action = "<c:url value='/report/approveList.do'/>";
document.searchForm.submit(); //견문 엑셀받기
} function fn_get_excel() {
--> alert('개발중');
document.searchForm.action = "<c:out value='/report/approveExcel.do' />";
document.searchForm.submit();
}
/* pagination 페이지 링크 function */
function fn_link_page(pageNo) {
document.searchForm.pageIndex.value = pageNo;
document.searchForm.action = "<c:url value='/report/approveList.do'/>";
document.searchForm.submit();
}
-->
</script> </script>

14
src/main/webapp/WEB-INF/jsp/report/myList.jsp
View File

@ -59,7 +59,7 @@
<th align="center" rowspan="2"><span class="order" value="in_subject"><spring:message code="board.header.title" /></span></th> <th align="center" rowspan="2"><span class="order" value="in_subject"><spring:message code="board.header.title" /></span></th>
<th align="center" rowspan="2"><span class="order" value="in_infodate"><spring:message code="report.view.infodate" /></span></th> <th align="center" rowspan="2"><span class="order" value="in_infodate"><spring:message code="report.view.infodate" /></span></th>
<th align="center" colspan="2" class="tbl_list3_col"><spring:message code="report.view.approval" /></th> <th align="center" colspan="2" class="tbl_list3_col"><spring:message code="report.view.approval" /></th>
<th align="center" colspan="7" class="tbl_list3_col"><spring:message code="report.type.judge" /></th> <th align="center" colspan="8" class="tbl_list3_col"><spring:message code="report.type.judge" /></th>
<th align="center" colspan="2" class="tbl_list3_col"><spring:message code="report.type.fullReport" /></th> <th align="center" colspan="2" class="tbl_list3_col"><spring:message code="report.type.fullReport" /></th>
<th align="center" rowspan="2"><span class="order" value="in_category1"><spring:message code="report.view.category1" /></span></th> <th align="center" rowspan="2"><span class="order" value="in_category1"><spring:message code="report.view.category1" /></span></th>
<th align="center" rowspan="2"><span class="order" value="in_category2"><spring:message code="report.view.category2" /></span></th> <th align="center" rowspan="2"><span class="order" value="in_category2"><spring:message code="report.view.category2" /></span></th>
@ -76,6 +76,7 @@
<th align="center"><spring:message code="report.type.record" /></th> <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.survey" /></th>
<th align="center"><spring:message code="report.type.reference" /></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.fullReport1" /></th>
<th align="center"><spring:message code="report.type.fullReport2" /></th> <th align="center"><spring:message code="report.type.fullReport2" /></th>
</tr> </tr>
@ -120,9 +121,12 @@
<td align="center" class="bold"> <td align="center" class="bold">
<c:out value="${result.isJudge6}" /> <c:out value="${result.isJudge6}" />
</td> </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"> <td align="center" class="bold">
<c:out value="${result.isReport1}" /> <c:out value="${result.isReport1}" />
</td> </td>
@ -144,7 +148,7 @@
</tr> </tr>
</c:forEach> </c:forEach>
<c:if test="${reportList.size() <= 0 }"> <c:if test="${reportList.size() <= 0 }">
<tr><td align="center" colspan="19"><spring:message code="report.nodata" /></td></tr> <tr><td align="center" colspan="20"><spring:message code="report.nodata" /></td></tr>
</c:if> </c:if>
</table> </table>
</div> </div>

30
src/main/webapp/WEB-INF/jsp/report/waitList.jsp
View File

@ -77,6 +77,7 @@
<th align="center"><spring:message code="report.type.record" /></th> <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.survey" /></th>
<th align="center"><spring:message code="report.type.reference" /></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}"> <c:if test="${myGroupCode ne 3}">
<th align="center"><spring:message code="report.type.fullReport" /></th> <th align="center"><spring:message code="report.type.fullReport" /></th>
</c:if> </c:if>
@ -133,13 +134,28 @@
<c:if test="${dutiesCode == 3}"> <c:if test="${dutiesCode == 3}">
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="1"/></td> <c:choose>
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="2"/></td> <c:when test="${result.inRegdate<='2022-04-30'}">
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="3"/></td> <td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="1"/></td>
<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="2"/></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="3"/></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="4"/></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="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="8" disabled/></td>
</c:when>
<c:otherwise>
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="1"/></td>
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="2" disabled/></td>
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="3"/></td>
<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" disabled/></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" disabled/></td>
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="8" checked="checked"/></td>
</c:otherwise>
</c:choose>
<c:if test="${myGroupCode ne 3}"> <c:if test="${myGroupCode ne 3}">
<td align="center"><input type="checkbox" name="reportList[${status.index}].inReport" value="1"/></td> <td align="center"><input type="checkbox" name="reportList[${status.index}].inReport" value="1"/></td>
</c:if> </c:if>

10
src/main/webapp/WEB-INF/tiles/tiles-layout.jsp
View File

@ -14,12 +14,12 @@
<title><spring:message code="sys.name" /></title> <title><spring:message code="sys.name" /></title>
<!-- Fonts --> <!-- Fonts -->
<link type="text/css" rel="stylesheet" href="<c:url value='/css/nanumgothic.css'/>?v=<spring:message code="StaticFile.version"/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/nanumgothic.css'/>" ><%--?v=<spring:message code="StaticFile.version"/>--%>
<link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>?v=<spring:message code="StaticFile.version"/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/egov.css'/>?" ><%--v=<spring:message code="StaticFile.version"/>--%>
<!-- Common style --> <!-- Common style -->
<link type="text/css" rel="stylesheet" href="<c:url value='/css/common.css'/>?v=<spring:message code="StaticFile.version"/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/common.css'/>" ><%--?v=<spring:message code="StaticFile.version"/>--%>
<!-- Each style --> <!-- Each style -->
<link type="text/css" rel="stylesheet" href="<c:url value='/css/style.css'/>?v=<spring:message code="StaticFile.version"/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/style.css'/>" ><%--?v=<spring:message code="StaticFile.version"/>--%>
<link type="text/css" rel="stylesheet" href="<c:url value='/css/lib/jquery-ui.css'/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/css/lib/jquery-ui.css'/>" >
<link type="text/css" rel="stylesheet" href="<c:url value='/fancybox/jquery.fancybox.css'/>" > <link type="text/css" rel="stylesheet" href="<c:url value='/fancybox/jquery.fancybox.css'/>" >
@ -27,7 +27,7 @@
<script type="text/javascript" src="/js/lib/jquery.form.js"></script> <script type="text/javascript" src="/js/lib/jquery.form.js"></script>
<script type="text/javascript" src="/js/lib/jquery-ui.min.js"></script> <script type="text/javascript" src="/js/lib/jquery-ui.min.js"></script>
<script type="text/javascript" src="/fancybox/jquery.fancybox.pack.js"></script> <script type="text/javascript" src="/fancybox/jquery.fancybox.pack.js"></script>
<script type="text/javascript" src="/js/commons.js?v=<spring:message code="StaticFile.version"/>"></script> <script type="text/javascript" src="/js/commons.js"></script><%--?v=<spring:message code="StaticFile.version"/>--%>
</head> </head>
<body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;"> <body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;">
<!-- 전체 레이어 시작 --> <!-- 전체 레이어 시작 -->