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

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

@ -348,6 +348,7 @@ public class ReportVO {
private String isJudge5;
private String isJudge6;
private String isJudge7;
private String isJudge8;
private String isReport1;
private String isReport2;
@ -615,6 +616,9 @@ public class ReportVO {
break;
case 7:
this.isJudge7 = STRCORRECT;
break;
case 8:
this.isJudge8 = STRCORRECT;
break;
default:
break;
@ -908,6 +912,9 @@ public class ReportVO {
}
public String getIsJudge7() {
return isJudge7;
}
public String getIsJudge8() {
return isJudge8;
}
public String getIsReport1() {
return isReport1;
@ -981,8 +988,8 @@ public class ReportVO {
+ ", isSection=" + isSection + ", isJudge2=" + isJudge2
+ ", isJudge3=" + isJudge3 + ", isJudge4=" + isJudge4
+ ", isJudge5=" + isJudge5 + ", isJudge6=" + isJudge6
+ ", isJudge7=" + isJudge7 + ", isReport1=" + isReport1
+ ", isReport2=" + isReport2 + ", reportList=" + reportList
+ ", isJudge7=" + isJudge7 + ", isJudge8=" + isJudge8
+ ", 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.
# 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
# 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)
# 6. Unix\uc5d0\uc11c\uc758 \ub514\ub809\ud1a0\ub9ac \ud45c\uc2dc : '/'
# 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
# 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
# 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)
# 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 : '/'
# 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
#-----------------------------------------------------------------------
#DBServiceServer
@ -62,18 +62,18 @@ Global.crypto.hased.password = U7Epd/1HVt76n5o0NAXS9f1ArmdigKFEJYgRfWeBjIA=
Global.crypto.password.algorithm = SHA-256
#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
#\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
#\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
#\uad6d\ubbfc\uc548\uc804\ucc98
#\uAD6D\uBBFC\uC548\uC804\uCC98
Url.MPSS = http://www.mpss.go.kr/
#\uc815\uc801 \uc18c\uc2a4 \ubc84\uc804
StaticFile.version=180102
#StaticFile.version=180102

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

@ -109,32 +109,30 @@
</select>
<select id="Report.select" parameterType="reportVO" resultMap="reportMap">
SELECT
(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = T.IN_CATEGORY1) AS inCategory1Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = T.IN_CATEGORY2) AS inCategory2Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = T.IN_CATEGORY3) AS inCategory3Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = T.IN_CATEGORY4) AS inCategory4Str,
(SELECT USE_YN FROM Rpt_Category WHERE TYPE = 1 AND CODE = T.IN_CATEGORY1) AS inUseCategory1,
(SELECT USE_YN FROM Rpt_Category WHERE TYPE = 2 AND CODE = T.IN_CATEGORY2) AS inUseCategory2,
(SELECT USE_YN FROM Rpt_Category WHERE TYPE = 3 AND CODE = T.IN_CATEGORY3) AS inUseCategory3,
(SELECT USE_YN FROM Rpt_Category WHERE TYPE = 4 AND CODE = T.IN_CATEGORY4) AS inUseCategory4,
SELECT rc1.name AS inCategory1Str,
rc2.name AS inCategory2Str,
rc3.name AS inCategory3Str,
rc4.name AS inCategory4Str,
rc1.use_yn AS inUseCategory1,
rc2.use_yn AS inUseCategory2,
rc3.use_yn AS inUseCategory3,
rc4.use_yn AS inUseCategory4,
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
(CASE WHEN IN_REPORT = 0
AND IN_REPORT1 = 0
AND IN_REPORT2 = 0
THEN '-'
WHEN IN_REPORT2 > 0
THEN '상보(' ||
(SELECT CODENM
(CASE
WHEN IN_REPORT = 0 AND IN_REPORT1 = 0 AND IN_REPORT2 = 0 THEN '-'
WHEN IN_REPORT2 > 0 THEN '상보(' || (SELECT CODENM
FROM TCODE
WHERE CODE1 = 'DC05'
AND cast(CODE2 as integer) = in_judge3)|| ')'
ELSE '상보' END) AS fullReportStr,T.*
FROM
RPT_INFO T
WHERE
in_seq = #{inSeq}
ELSE '상보'
END) AS fullReportStr,
ri.*
from rpt_info ri
left outer join Rpt_Category rc1 on rc1.type = 1 and rc1.code = ri.in_category1
left outer join Rpt_Category rc2 on rc2.type = 2 and rc2.code = ri.in_category2
left outer join Rpt_Category rc3 on rc3.type = 3 and rc3.code = ri.in_category3
left outer join Rpt_Category rc4 on rc4.type = 4 and rc4.code = ri.in_category4
WHERE in_seq = #{inSeq}
</select>
<select id="Report.selectSaveList" parameterType="reportSearchVO" resultMap="reportMap">
@ -812,26 +810,19 @@
<!-- 결재 대기 목록 -->
<select id="Report.selectWaitList" parameterType="reportSearchVO" resultMap="reportMap">
SELECT *
FROM (
SELECT
ALL_LIST.*,
ROWNUM RNUM,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = ALL_LIST.IN_CATEGORY1) AS inCategory1Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = ALL_LIST.IN_CATEGORY2) AS inCategory2Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = ALL_LIST.IN_CATEGORY3) AS inCategory3Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = ALL_LIST.IN_CATEGORY4) AS inCategory4Str,
(ALL_LIST.IN_PLACE_NAME || '외사-' || ALL_LIST.IN_PLACE_NUM) AS docNo
FROM
(
SELECT
select (ROW_NUMBER() OVER()) AS RNUM,
(ri.IN_PLACE_NAME || '외사-' || ri.IN_PLACE_NUM) AS docNo ,
rc1.name as inCategory1Str,
rc2.name as inCategory2Str,
rc3.name as inCategory3Str,
rc4.name as inCategory4Str,
*
FROM
RPT_INFO
WHERE
IN_STATE_CODE &lt;&gt; '99'
from rpt_info ri
left outer join Rpt_Category rc1 on rc1.type = 1 and rc1.code = ri.in_category1
left outer join Rpt_Category rc2 on rc2.type = 2 and rc2.code = ri.in_category2
left outer join Rpt_Category rc3 on rc3.type = 3 and rc3.code = ri.in_category3
left outer join Rpt_Category rc4 on rc4.type = 4 and rc4.code = ri.in_category4
where IN_STATE_CODE &lt;> '99'
<choose>
<when test="dutiesForApprove.equals(2)">
AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3')
@ -840,56 +831,41 @@
AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2')
</otherwise>
</choose>
<choose>
<when test="myGroupCode.equals(2)">
AND IN_AGENCY_CODE = #{userPlace}
</when>
<when test="myGroupCode.equals(1)">
AND IN_PLACE_CODE = #{userPlace}
</when>
<otherwise></otherwise>
</choose>
<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
ORDER BY ${orderCol} ${orderAsc}
</if>
) ALL_LIST
)
WHERE
RNUM &gt; #{firstIndex}
AND
RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
limit #{recordCountPerPage} offset #{firstIndex}
</select>
<select id="Report.selectWaitListAll" parameterType="reportSearchVO" resultMap="reportMap">
SELECT
ALL_LIST.*,
ROWNUM RNUM,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 1 AND CODE = ALL_LIST.IN_CATEGORY1) AS inCategory1Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 2 AND CODE = ALL_LIST.IN_CATEGORY2) AS inCategory2Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 3 AND CODE = ALL_LIST.IN_CATEGORY3) AS inCategory3Str,
(SELECT NAME FROM Rpt_Category WHERE TYPE = 4 AND CODE = ALL_LIST.IN_CATEGORY4) AS inCategory4Str,
(ALL_LIST.IN_PLACE_NAME || '외사-' || ALL_LIST.IN_PLACE_NUM) AS docNo
FROM
(
SELECT
<select id="Report.selectWaitListAll" parameterType="reportSearchVO" resultMap="reportMap">
select (ROW_NUMBER() OVER()) AS RNUM,
(ri.IN_PLACE_NAME || '외사-' || ri.IN_PLACE_NUM) AS docNo ,
rc1.name as inCategory1Str,
rc2.name as inCategory2Str,
rc3.name as inCategory3Str,
rc4.name as inCategory4Str,
*
FROM
RPT_INFO
WHERE
IN_STATE_CODE &lt;&gt; '99'
from rpt_info ri
left outer join Rpt_Category rc1 on rc1.type = 1 and rc1.code = ri.in_category1
left outer join Rpt_Category rc2 on rc2.type = 2 and rc2.code = ri.in_category2
left outer join Rpt_Category rc3 on rc3.type = 3 and rc3.code = ri.in_category3
left outer join Rpt_Category rc4 on rc4.type = 4 and rc4.code = ri.in_category4
where IN_STATE_CODE &lt;> '99'
AND (IN_STATE_CODE = #{myGroupCode}||'1'
OR IN_STATE_CODE =
(CASE WHEN #{duties} = '계장'
THEN #{myGroupCode}||'3'
ELSE #{myGroupCode}||'2' END))
(CASE
WHEN #{duties} = '계장' THEN #{myGroupCode}||'3'
ELSE #{myGroupCode}||'2'
END)
)
<choose>
<when test="dutiesForApprove.equals(2)">
AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'3')
@ -898,74 +874,51 @@
AND (IN_STATE_CODE = #{myGroupCode}||'1' OR IN_STATE_CODE = #{myGroupCode}||'2')
</otherwise>
</choose>
<choose>
<when test="myGroupCode.equals(3)"></when>
<when test="myGroupCode.equals(2)">
AND IN_AGENCY_CODE = #{userPlace}
</when>
<when test="myGroupCode.equals(1)">
AND IN_PLACE_CODE = #{userPlace}
</when>
</choose>
<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
ORDER BY ${orderCol} ${orderAsc}
</if>
) ALL_LIST
</select>
<select id="Report.selectWaitListCnt" parameterType="reportSearchVO" resultType="int">
SELECT
Count(*)
FROM
RPT_INFO
WHERE
IN_STATE_CODE &lt;&gt; '99'
select count(*)
from rpt_info ri
where IN_STATE_CODE &lt;> '99'
AND (IN_STATE_CODE = #{myGroupCode}||'1'
OR IN_STATE_CODE = (CASE WHEN #{duties} = '계장'
THEN #{myGroupCode}||'3'
ELSE #{myGroupCode}||'2' END))
<choose>
<when test="myGroupCode.equals(2)">
AND IN_AGENCY_CODE = #{userPlace}
</when>
<when test="myGroupCode.equals(1)">
AND IN_PLACE_CODE = #{userPlace}
</when>
</choose>
</select>
<!-- 견문 결재 처리 목록 -->
<select id="Report.selectAprList" parameterType="reportSearchVO" resultMap="reportMap">
SELECT *
FROM (
SELECT
(ROW_NUMBER() OVER()) AS RNUM, T.*
FROM
(SELECT
(ROW_NUMBER() OVER()) AS RNUM,
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
I.*
FROM
RPT_INFO I
INNER JOIN RPT_JUDGE_HISTORY J
ON I.IN_SEQ = J.JU_INSEQ
FROM RPT_INFO I
INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
WHERE
IN_STATE_CODE != '99'
AND IN_TYPE = #{type}
AND JU_USERID = #{userid}
<if test="dateStart != null and dateStart != ''">
AND IN_INFODATE &gt;= #{dateStart}::date
</if>
@ -975,30 +928,20 @@
<if test="subject != null and subject != ''">
AND IN_SUBJECT LIKE '%'||#{subject}||'%'
</if>
<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
ORDER BY ${orderCol} ${orderAsc}
</if>
) T
)
WHERE
RNUM &gt; #{firstIndex}
AND
RNUM &lt;= #{firstIndex} + #{recordCountPerPage}
limit #{recordCountPerPage} offset #{firstIndex}
</select>
<select id="Report.selectAprListCnt" parameterType="reportSearchVO" resultType="int">
SELECT
COUNT(*)
FROM
RPT_INFO I INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
WHERE
IN_STATE_CODE != '99'
SELECT COUNT(*)
FROM RPT_INFO I
INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
WHERE IN_STATE_CODE != '99'
AND IN_TYPE = #{type}
AND JU_USERID = #{userid}
<if test="dateStart != null and dateStart != ''">
AND IN_INFODATE &gt;= #{dateStart}::date
</if>
@ -1010,20 +953,15 @@
</if>
</select>
<select id="Report.selectAprListAll" parameterType="reportSearchVO" resultMap="reportMap">
SELECT
(ROW_NUMBER() OVER()) AS RNUM, T.*
FROM
(SELECT
(ROW_NUMBER() OVER()) AS RNUM,
(IN_PLACE_NAME || '외사-' || IN_PLACE_NUM) AS docNo,
I.*
FROM
RPT_INFO I INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
WHERE
IN_STATE_CODE != '99'
FROM RPT_INFO I
INNER JOIN RPT_JUDGE_HISTORY J ON I.IN_SEQ = J.JU_INSEQ
WHERE IN_STATE_CODE != '99'
AND IN_TYPE = #{type}
AND JU_USERID = #{userid}
<if test="dateStart != null and dateStart != ''">
AND IN_INFODATE &gt;= #{dateStart}::date
</if>
@ -1033,13 +971,9 @@
<if test="subject != null and subject != ''">
AND IN_SUBJECT LIKE '%'||#{subject}||'%'
</if>
<if test="orderCol != null and orderCol != '' and orderAsc != null and orderAsc != ''">
ORDER BY ${orderCol} ${orderAsc}
</if>
) T
</select>

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

@ -21,7 +21,7 @@
<insert id="ReportFile.insertFileSeq">
INSERT INTO RPT_FILE_STORAGE (FS_FILE_COUNT) VALUES (1)
<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>
</insert>

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

@ -94,7 +94,7 @@
#{juPosition}, #{juName}, #{juUserid}, #{juProxyId}, #{juDutiesCode}, #{juMessage})
]]>
<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>
</insert>

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

@ -34,16 +34,6 @@
<c:if test="${reportVO.inType eq '2'}"><spring:message code="member.type.nofa" var="userType"/></c:if>
<table class="tbl_add">
<colgroup>
<col width="100"/>
<col width="150"/>
<col width="100"/>
<col width="150"/>
<col width="100"/>
<col width="150"/>
<col width="100"/>
<col width=""/>
</colgroup>
<tr>
<th><spring:message code="report.list.num"/></th>
<td colspan="3">
@ -341,16 +331,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>
@ -359,6 +339,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>
@ -369,6 +350,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>
@ -377,17 +359,6 @@
<%-- 안전서 --%>
<c:if test="${(num1 > 1 || (num1 eq 1 and num2 >= 2)) and 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>
@ -397,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>
@ -415,6 +387,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>
<td align="center"><c:if test="${reportVO.inReport1 > 0}">○</c:if></td>
</tr>
<c:if test="${myDutiesCode eq '2' or myDutiesCode eq '3'}">
@ -427,13 +400,14 @@
<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>
<c:if test="${!empty ju1section}">
<tr>
<th><spring:message code="report.view.appraiser" /></th>
<td colspan="8">
<td colspan="9">
<c:out value="${ju1section.juPosition}"/>
<c:out value="${ju1section.juName}" />
<c:if test="${ju1section.juDutiesCode eq '2'}"><spring:message code="member.view.rptPermission.section" /></c:if>
@ -442,17 +416,17 @@
</tr>
<tr>
<th><spring:message code="report.view.opinion" /></th>
<td colspan="8"><c:out value="${ju1section.juMessage}" /></td>
<td colspan="9"><c:out value="${ju1section.juMessage}" /></td>
</tr>
<tr>
<th><spring:message code="report.view.reportDate" /></th>
<td colspan="8"><c:out value="${ju1section.juChkdate}" /></td>
<td colspan="9"><c:out value="${ju1section.juChkdate}" /></td>
</tr>
</c:if>
<c:if test="${!empty ju1head}">
<tr>
<th><spring:message code="report.view.appraiser" /></th>
<td colspan="8">
<td colspan="9">
<c:out value="${ju1head.juPosition }"/>
<c:out value="${ju1head.juName}" />
<c:if test="${ju1head.juDutiesCode eq '2'}"><spring:message code="member.view.rptPermission.section" /></c:if>
@ -461,11 +435,11 @@
</tr>
<tr>
<th><spring:message code="report.view.opinion" /></th>
<td colspan="8"><c:out value="${ju1head.juMessage}" /></td>
<td colspan="9"><c:out value="${ju1head.juMessage}" /></td>
</tr>
<tr>
<th><spring:message code="report.view.reportDate" /></th>
<td colspan="8"><c:out value="${ju1head.juChkdate}" /></td>
<td colspan="9"><c:out value="${ju1head.juChkdate}" /></td>
</tr>
</c:if>
</table>
@ -475,17 +449,6 @@
<%-- 지방청 --%>
<c:if test="${(num1 > 2 || (num1 eq 2 and num2 >= 2)) and 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 class="th-bg">
<th>지방해양경찰청</th>
<th style="text-align:center;"><spring:message code="report.type.newsflash"/></th>
@ -495,6 +458,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>
@ -513,6 +477,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>
<td align="center"><c:if test="${reportVO.inReport2 > 0}">○</c:if></td>
</tr>
<c:if test="${myDutiesCode eq '2' or myDutiesCode eq '3'}">
@ -525,13 +490,14 @@
<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>
<c:if test="${!empty ju2section}">
<tr>
<th><spring:message code="report.view.appraiser" /></th>
<td colspan="8">
<td colspan="9">
<c:out value="${ju2section.juPosition}"/>
<c:out value="${ju2section.juName}" />
<c:if test="${ju2section.juDutiesCode eq '2'}"><spring:message code="member.view.rptPermission.section" /></c:if>
@ -540,17 +506,17 @@
</tr>
<tr>
<th><spring:message code="report.view.opinion" /></th>
<td colspan="8"><c:out value="${ju2section.juMessage}" /></td>
<td colspan="9"><c:out value="${ju2section.juMessage}" /></td>
</tr>
<tr>
<th><spring:message code="report.view.reportDate" /></th>
<td colspan="8"><c:out value="${ju2section.juChkdate}" /></td>
<td colspan="9"><c:out value="${ju2section.juChkdate}" /></td>
</tr>
</c:if>
<c:if test="${!empty ju2head}">
<tr>
<th><spring:message code="report.view.appraiser" /></th>
<td colspan="8">
<td colspan="9">
<c:out value="${ju2head.juPosition}"/>
<c:out value="${ju2head.juName}" />
<c:if test="${ju2head.juDutiesCode eq '2'}"><spring:message code="member.view.rptPermission.section" /></c:if>
@ -559,11 +525,11 @@
</tr>
<tr>
<th><spring:message code="report.view.opinion" /></th>
<td colspan="8"><c:out value="${ju2head.juMessage}" /></td>
<td colspan="9"><c:out value="${ju2head.juMessage}" /></td>
</tr>
<tr>
<th><spring:message code="report.view.reportDate" /></th>
<td colspan="8"><c:out value="${ju2head.juChkdate}" /></td>
<td colspan="9"><c:out value="${ju2head.juChkdate}" /></td>
</tr>
</c:if>
</table>
@ -573,17 +539,6 @@
<%-- 본부 --%>
<c:if test="${num1 eq 3 and num2 >= 2 and docGroupCode <= 3}">
<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>
@ -593,6 +548,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>
@ -611,6 +567,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>
<td align="center"><c:if test="${reportVO.inReport3 > 0}">○</c:if></td>
</tr>
<c:if test="${myDutiesCode eq '2' or myDutiesCode eq '3'}">
@ -623,13 +580,14 @@
<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>
<c:if test="${!empty ju3section}">
<tr>
<th><spring:message code="report.view.appraiser" /></th>
<td colspan="8">
<td colspan="9">
<c:out value="${ju3section.juPosition}" />
<c:out value="${ju3section.juName}" />
<c:if test="${ju3section.juDutiesCode eq '2'}"><spring:message code="member.view.rptPermission.section" /></c:if>
@ -638,17 +596,17 @@
</tr>
<tr>
<th><spring:message code="report.view.opinion" /></th>
<td colspan="8"><c:out value="${ju3section.juMessage}" /></td>
<td colspan="9"><c:out value="${ju3section.juMessage}" /></td>
</tr>
<tr>
<th><spring:message code="report.view.reportDate" /></th>
<td colspan="8"><c:out value="${ju3section.juChkdate}" /></td>
<td colspan="9"><c:out value="${ju3section.juChkdate}" /></td>
</tr>
</c:if>
<c:if test="${!empty ju3head}">
<tr>
<th><spring:message code="report.view.appraiser" /></th>
<td colspan="8">
<td colspan="9">
<c:out value="${ju3head.juPosition}" />
<c:out value="${ju3head.juName}" />
<c:if test="${ju3head.juDutiesCode eq '2'}"><spring:message code="member.view.rptPermission.section" /></c:if>
@ -657,11 +615,11 @@
</tr>
<tr>
<th><spring:message code="report.view.opinion" /></th>
<td colspan="8"><c:out value="${ju3head.juMessage}" /></td>
<td colspan="9"><c:out value="${ju3head.juMessage}" /></td>
</tr>
<tr>
<th><spring:message code="report.view.reportDate" /></th>
<td colspan="8"><c:out value="${ju3head.juChkdate}" /></td>
<td colspan="9"><c:out value="${ju3head.juChkdate}" /></td>
</tr>
</c:if>
</table>
@ -681,30 +639,106 @@
<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>
<td><c:out value="${loginUserVO.place1Str}"/></td>
<c:choose>
<c:when test="${reportVO.inRegdate<='2022-04-30'}">
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="2"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="3"/></c:if></td>
<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}">
<c:choose>
<c:when test="${empty(reportVO.inJudge)||reportVO.inJudge eq '0'}">
<form:radiobutton path="inJudge" value="7" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge" value="7"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="8" disabled="true"/></c:if></td>
</c:when>
<c:otherwise>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="2" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 3}"><form:radiobutton path="inJudge" value="3"/></c:if></td>
<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" disabled="true"/></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" disabled="true"/></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 3}">
<c:choose>
<c:when test="${empty(reportVO.inJudge)||reportVO.inJudge eq '0'}">
<form:radiobutton path="inJudge" value="8" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge" value="8"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
<%----%>
</c:otherwise>
</c:choose>
<td align="center"><c:if test="${myDutiesCode eq 3 and myGroupCode < 3}"><input type="checkbox" name="inReport" value="1" /></c:if></td>
</tr>
<c:if test="${fn:endsWith(loginPlace1, '청') and myDutiesCode eq 2 and loginUserVO.place1Str ne '해양경찰청'}">
<tr>
<td>계장 결재란</td>
<c:choose>
<c:when test="${reportVO.inRegdate<='2022-04-30'}">
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="2"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="3"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="4"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="5"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="7" checked="checked" /></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 2}">
<c:choose>
<c:when test="${empty(reportVO.inJudge6)||reportVO.inJudge6 eq '0'}">
<form:radiobutton path="inJudge6" value="7" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge6" value="7"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="8" disabled="true"/></c:if></td>
</c:when>
<c:otherwise>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="2" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="3"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="4"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="5" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge6" value="7" disabled="true"/></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 2}">
<c:choose>
<c:when test="${empty(reportVO.inJudge6)||reportVO.inJudge6 eq '0'}">
<form:radiobutton path="inJudge6" value="8" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge6" value="8"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
</c:otherwise>
</c:choose>
<td align="center"><c:if test="${myDutiesCode eq 2}"><input type="checkbox" name="inReport6" value="1"/></c:if></td>
</tr>
</c:if>
@ -712,13 +746,50 @@
<c:if test="${(fn:endsWith(loginPlace1, '서') or fn:endsWith(loginPlace1, '단')) and myDutiesCode eq 2}">
<tr>
<td>계장 결재란</td>
<c:choose>
<c:when test="${reportVO.inRegdate<='2022-04-30'}">
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="2"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="3"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="4"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="5"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="7" checked="checked" /></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 2}">
<c:choose>
<c:when test="${empty(reportVO.inJudge5)||reportVO.inJudge5 eq '0'}">
<form:radiobutton path="inJudge5" value="7" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge5" value="7"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="8" disabled="true"/></c:if></td>
</c:when>
<c:otherwise>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="2" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="3"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="4"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="5" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge5" value="7" disabled="true"/></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 2}">
<c:choose>
<c:when test="${empty(reportVO.inJudge5)||reportVO.inJudge5 eq '0'}">
<form:radiobutton path="inJudge5" value="8" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge5" value="8"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
</c:otherwise>
</c:choose>
<td align="center"><c:if test="${myDutiesCode eq 2}"><input type="checkbox" name="inReport5" value="1"/></c:if></td>
</tr>
</c:if>
@ -726,20 +797,57 @@
<c:if test="${loginUserVO.place1Str eq '해양경찰청' and myDutiesCode eq 2}">
<tr>
<td>계장 결제란</td>
<c:choose>
<c:when test="${reportVO.inRegdate<='2022-04-30'}">
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="2"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="3"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="4"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="5"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="7" checked="checked" /></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 2}">
<c:choose>
<c:when test="${empty(reportVO.inJudge4)||reportVO.inJudge4 eq '0'}">
<form:radiobutton path="inJudge4" value="7" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge4" value="7"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="8" disabled="true"/></c:if></td>
</c:when>
<c:otherwise>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="1"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="2" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="3"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="4"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="5" disabled="true"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="6"/></c:if></td>
<td align="center"><c:if test="${myDutiesCode eq 2}"><form:radiobutton path="inJudge4" value="7" disabled="true"/></c:if></td>
<td align="center">
<c:if test="${myDutiesCode eq 2}">
<c:choose>
<c:when test="${empty(reportVO.inJudge4)||reportVO.inJudge4 eq '0'}">
<form:radiobutton path="inJudge4" value="8" checked="true" />
</c:when>
<c:otherwise>
<form:radiobutton path="inJudge4" value="8"/>
</c:otherwise>
</c:choose>
</c:if>
</td>
</c:otherwise>
</c:choose>
<td>&nbsp;</td>
</tr>
</c:if>
<tr>
<th>평가자</th>
<td colspan="8">
<td colspan="9">
<c:if test="${not empty approveInfo}">
<c:out value="${approveInfo.positionStr}" /> <c:out value="${approveInfo.name}" /> <c:out value="${approveInfo.dutiesStr}" />
</c:if>
@ -753,7 +861,7 @@
</tr>
<tr>
<th>검토의견</th>
<td colspan="8">
<td colspan="9">
<form:input path="juMsg"/>
</td>
</tr>
@ -779,7 +887,7 @@
<script type="text/javascript" src="<c:url value='/validator.do'/>"></script>
<validator:javascript formName="reportVO" staticJavascript="false" xhtml="true" cdata="false"/>
<script type="text/javaScript" defer="defer">
<!--
$(function(){
$('#strInfodate').datepicker({dateFormat: 'yy-mm-dd'});
@ -801,5 +909,4 @@
frm.submit();
}
}
-->
</script>

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

@ -63,6 +63,7 @@
<col width="34">
<col width="34">
<col width="34">
<col width="34">
</colgroup>
<thead>
<tr>
@ -71,7 +72,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>
<th align="center" colspan="2"><spring:message code="report.type.fullReport" /></th>
</tr>
<tr>
@ -84,6 +85,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>
@ -131,6 +133,9 @@
<td align="center">
<c:out value="${result.isJudge7}" />
</td>
<td align="center">
<c:out value="${result.isJudge8}" />
</td>
<td align="center">
<c:out value="${result.isReport1}" />
</td>
@ -151,7 +156,7 @@
</div>
<script type="text/javascript">
<!--
<!--
$(document).ready(function(){
//날짜 설정
$('input[id^="date"]').datepicker({dateFormat: 'yy-mm-dd'});
@ -203,5 +208,5 @@
document.searchForm.action = "<c:url value='/report/approveList.do'/>";
document.searchForm.submit();
}
-->
-->
</script>

8
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_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="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" 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>
@ -76,6 +76,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>
@ -122,6 +123,9 @@
</td>
<td align="center" class="bold">
<c:out value="${result.isJudge7}" />
</td>
<td align="center" class="bold">
<c:out value="${result.isJudge8}" />
</td>
<td align="center" class="bold">
<c:out value="${result.isReport1}" />
@ -144,7 +148,7 @@
</tr>
</c:forEach>
<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>
</table>
</div>

16
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.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>
@ -133,6 +134,8 @@
<c:if test="${dutiesCode == 3}">
<c:choose>
<c:when test="${result.inRegdate<='2022-04-30'}">
<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"/></td>
<td align="center"><input type="radio" name="reportList[${status.index}].inJudge" value="3"/></td>
@ -140,6 +143,19 @@
<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}">
<td align="center"><input type="checkbox" name="reportList[${status.index}].inReport" value="1"/></td>
</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>
<!-- 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/egov.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"/>--%>
<!-- 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 -->
<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='/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-ui.min.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>
<body style="text-align: center; margin: 0 auto; display: inline; padding-top: 100px;">
<!-- 전체 레이어 시작 -->