From 3c62256841c845b6d71f2652e06f72330dcba1d6 Mon Sep 17 00:00:00 2001
From: Hyung Geun <vndanwl@naver.com>
Date: Mon, 25 Apr 2022 10:01:29 +0900
Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=88=98=EC=82=AC=20=20?=
 =?UTF-8?q?=EC=99=B8=EC=82=AC=EB=B6=84=EC=8B=A4=EC=9A=B4=EC=98=81=ED=98=84?=
 =?UTF-8?q?=ED=99=A9=20=EC=9E=85=EB=A0=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../faics/board/service/impl/BoardMapper.java |   2 +-
 .../service/impl/ReportJudgeServiceImpl.java  |  28 +-
 .../kcg/faics/report/vo/ReportSearchVO.java   |  23 +-
 .../sqlmapper/mappers/report/reportJudge.xml  | 291 ++++++++++++------
 .../webapp/WEB-INF/jsp/inter/arrestAdd.jsp    |   3 +-
 .../webapp/WEB-INF/jsp/report/statsResult.jsp |  26 +-
 src/main/webapp/WEB-INF/jsp/tg/divMngAdd.jsp  |   2 +-
 src/main/webapp/WEB-INF/jsp/tg/divMngView.jsp |   2 +-
 8 files changed, 252 insertions(+), 125 deletions(-)

diff --git a/src/main/java/kcg/faics/board/service/impl/BoardMapper.java b/src/main/java/kcg/faics/board/service/impl/BoardMapper.java
index d7b4da1..4e2874c 100644
--- a/src/main/java/kcg/faics/board/service/impl/BoardMapper.java
+++ b/src/main/java/kcg/faics/board/service/impl/BoardMapper.java
@@ -115,7 +115,7 @@ public class BoardMapper extends EgovAbstractMapper {
 		return map;
 	};
 
-	
+
 	/**
 	 * 선택한 게시물의 내용을 반환한다.
 	 * 
diff --git a/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java b/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
index e3a192a..ca96825 100644
--- a/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
+++ b/src/main/java/kcg/faics/report/service/impl/ReportJudgeServiceImpl.java
@@ -529,24 +529,24 @@ public class ReportJudgeServiceImpl extends EgovAbstractServiceImpl implements R
 				}
 				int total = 0;
 				for (HashMap<String, String> item : list) {
-					total = total + Integer.parseInt(item.get(key));
+					total += Integer.parseInt(item.get(key));
 				}
 				map.put(key, String.valueOf(total));
 			}
 		} else {
-			map.put("REPORT1", "0");
-			map.put("REPORT2", "0");
-			map.put("JU1", "0");
-			map.put("JU2", "0");
-			map.put("JU3", "0");
-			map.put("JU4", "0");
-			map.put("JU5", "0");
-			map.put("JU6", "0");
-			map.put("JU7", "0");
-			map.put("AG", "0");
-			map.put("BG", "0");
-			map.put("CG", "0");
-			map.put("DG", "0");
+			map.put("report1", "0");
+			map.put("report2", "0");
+			map.put("ju1", "0");
+			map.put("ju2", "0");
+			map.put("ju3", "0");
+			map.put("ju4", "0");
+			map.put("ju5", "0");
+			map.put("ju6", "0");
+			map.put("ju7", "0");
+			map.put("ag", "0");
+			map.put("bg", "0");
+			map.put("cg", "0");
+			map.put("dg", "0");
 		}
 		
 		list.add(list.size(), map);
diff --git a/src/main/java/kcg/faics/report/vo/ReportSearchVO.java b/src/main/java/kcg/faics/report/vo/ReportSearchVO.java
index 7e63c48..bf23c8e 100644
--- a/src/main/java/kcg/faics/report/vo/ReportSearchVO.java
+++ b/src/main/java/kcg/faics/report/vo/ReportSearchVO.java
@@ -9,7 +9,12 @@ import kcg.faics.cmmn.bbs.BaseSearchVO;
  * 견문 검색 VO
  */
 public class ReportSearchVO extends BaseSearchVO implements Cloneable {
-	
+	private int report1;
+
+	private int report2;
+
+
+
 	/**
 	 * 접속한 사용자 아이디
 	 */
@@ -149,6 +154,22 @@ public class ReportSearchVO extends BaseSearchVO implements Cloneable {
 	 * 월
 	 */
 	private String month;
+
+	public int getReport1() {
+		return report1;
+	}
+
+	public void setReport1(int report1) {
+		this.report1 = report1;
+	}
+
+	public int getReport2() {
+		return report2;
+	}
+
+	public void setReport2(int report2) {
+		this.report2 = report2;
+	}
 	
 	public String getUserid() {
 		return userid;
diff --git a/src/main/resources/sqlmapper/mappers/report/reportJudge.xml b/src/main/resources/sqlmapper/mappers/report/reportJudge.xml
index 66cfe24..6ef9938 100644
--- a/src/main/resources/sqlmapper/mappers/report/reportJudge.xml
+++ b/src/main/resources/sqlmapper/mappers/report/reportJudge.xml
@@ -271,7 +271,53 @@
 	<![CDATA[
 	/*ReportJudge.statsJudge*/
 		WITH RPT AS (
-			SELECT 	* 
+			SELECT
+			A.IN_PLACE_CODE ,
+			sum(REPORT1) REPORT1,
+			sum(REPORT2) REPORT2,
+			SUM(JU1) JU1,
+			SUM(JU2) JU2,
+			SUM(JU3) JU3,
+			SUM(JU4) JU4,
+			SUM(JU5) JU5,
+			SUM(JU6) JU6,
+			SUM(JU7) JU7,
+			sum(JU1 + JU2) as AG,
+			sum(JU3 + JU4) as BG,
+			sum(JU5 + JU6) as CG,
+			sum(JU7) as DG
+			from (select
+			IN_PLACE_CODE,
+			SUM(case when IN_REPORT1 = 1 then 1 else 0 end) as REPORT1,
+			SUM(case when IN_REPORT2 = 1 then 1 else 0 end) as REPORT2,
+			case IN_JUDGE
+				when 1 then COUNT(in_seq)
+				else 0
+			end JU1,
+			case IN_JUDGE
+				when 2 then COUNT(in_seq)
+				else 0
+			end JU2,
+			case IN_JUDGE
+				when 3 then COUNT(in_seq)
+				else 0
+			end JU3,
+			case IN_JUDGE
+				when 4 then COUNT(in_seq)
+				else 0
+			end JU4,
+			case IN_JUDGE
+				when 5 then COUNT(in_seq)
+				else 0
+			end JU5,
+			case IN_JUDGE
+				when 6 then COUNT(in_seq)
+				else 0
+			end JU6,
+			case IN_JUDGE
+				when 7 then COUNT(in_seq)
+				else 0
+			end JU7
 			FROM
 				RPT_INFO
 			WHERE
@@ -279,98 +325,159 @@
 				AND IN_STATE_CODE <> '99'
 				AND IN_INFODATE >= #{dateStart}::date
 				AND IN_INFODATE <= #{dateEnd}::date
-	]]>
-			<if test="policeType != null and policeType.length > 0">
-				AND IN_TYPE IN
-				<foreach collection="policeType" item="type" open="(" close=")" separator=",">
-					#{type}
+			  group by IN_PLACE_CODE, IN_JUDGE) A
+			where in_place_code <>''
+			group by IN_PLACE_CODE
+		    ]]>
+		<if test="policeType != null and policeType.length > 0">
+			AND IN_TYPE IN
+			<foreach collection="policeType" item="type" open="(" close=")" separator=",">
+				#{type}
+			</foreach>
+		</if>
+		<if test="judges != null and judges.length > 0">
+			AND IN_JUDGE IN
+			<foreach collection="judges" item="judge" open="(" close=")" separator=",">
+				#{judge}
+			</foreach>
+		</if>
+		<if test="category1 != null and category1.length > 0">
+			AND IN_CATEGORY1 IN
+			<foreach collection="category1" item="category" open="(" close=")" separator=",">
+				#{category}
+			</foreach>
+		</if>
+		<if test="category2 != null and category2.length > 0">
+			AND IN_CATEGORY2 IN
+			<foreach collection="category2" item="category" open="(" close=")" separator=",">
+				#{category}
+			</foreach>
+		</if>
+		<if test="category3 != null and category3.length > 0">
+			AND IN_CATEGORY3 IN
+			<foreach collection="category3" item="category" open="(" close=")" separator=",">
+				#{category}
+			</foreach>
+		</if>
+		<if test="category4 != null and category4.length > 0">
+			AND IN_CATEGORY4 IN
+			<foreach collection="category4" item="category" open="(" close=")" separator=",">
+				#{category}
+			</foreach>
+		</if>
+			)
+			select C.CODENM PLACENAME,
+					R.REPORT1, R.report2, r.ju1, r.ju2, r.ju3, r.ju4, r.ju5, r.ju6, r.ju7, r.ag, r.bg, r.cg, r.dg
+			from RPT R
+			inner join TCODE C
+			ON  C.CODE1 = 'C001' AND C.CODE2 = R.IN_PLACE_CODE
+			<if test="places != null and places.length > 0">
+				AND CODE2 IN
+				<foreach collection="places" item="place" open="(" close=")" separator=",">
+					#{place}
 				</foreach>
 			</if>
-			<if test="judges != null and judges.length > 0">
-				AND IN_JUDGE IN
-				<foreach collection="judges" item="judge" open="(" close=")" separator=",">
-					#{judge}
-				</foreach>
-			</if>
-			<if test="category1 != null and category1.length > 0">
-				AND IN_CATEGORY1 IN
-				<foreach collection="category1" item="category" open="(" close=")" separator=",">
-					#{category}
-				</foreach>
-			</if>
-			<if test="category2 != null and category2.length > 0">
-				AND IN_CATEGORY2 IN
-				<foreach collection="category2" item="category" open="(" close=")" separator=",">
-					#{category}
-				</foreach>
-			</if>
-			<if test="category3 != null and category3.length > 0">
-				AND IN_CATEGORY3 IN
-				<foreach collection="category3" item="category" open="(" close=")" separator=",">
-					#{category}
-				</foreach>
-			</if>
-			<if test="category4 != null and category4.length > 0">
-				AND IN_CATEGORY4 IN
-				<foreach collection="category4" item="category" open="(" close=")" separator=",">
-					#{category}
-				</foreach>
-			</if>
-	<![CDATA[
-		)
-		SELECT 
-			A.PLACENAME,
-			TO_CHAR(REPORT1) REPORT1, TO_CHAR(REPORT2) REPORT2,
-			TO_CHAR(JU1) JU1, TO_CHAR(JU2) JU2, TO_CHAR(JU3) JU3, TO_CHAR(JU4) JU4, TO_CHAR(JU5) JU5, TO_CHAR(JU6) JU6, TO_CHAR(JU7) JU7, 
-			TO_CHAR((JU1 + JU2)) AS AG, TO_CHAR((JU3 + JU4)) AS BG, TO_CHAR((JU5 + JU6)) AS CG, TO_CHAR(JU7) AS DG
-		FROM 
-			((
-				SELECT
-					PLACENAME, PLACECODE, IN_JUDGE, IN_SEQ
-				FROM
-					RPT R 
-				RIGHT OUTER JOIN 
-				(
-					SELECT CODE2 AS PLACECODE, CODENM AS PLACENAME 
-					FROM TCODE 
-					WHERE CODE1 = 'C001'
-	]]>
-					<if test="places != null and places.length > 0">
-						AND CODE2 IN
-						<foreach collection="places" item="place" open="(" close=")" separator=",">
-							#{place}
-						</foreach>
-					</if>
-	<![CDATA[
-				) C 
-				ON C.PLACECODE = R.IN_PLACE_CODE
-			) PIVOT (COUNT(IN_SEQ) FOR IN_JUDGE IN (1 JU1, 2 JU2, 3 JU3, 4 JU4, 5 JU5, 6 JU6, 7 JU7))) A,
-			( 
-				SELECT 
-					PLACENAME,
-					SUM(CASE WHEN IN_REPORT1 = 1 THEN 1 ELSE 0 END) AS REPORT1,
-					SUM(CASE WHEN IN_REPORT2 = 1 THEN 1 ELSE 0 END) AS REPORT2
-				FROM 
-					RPT R 
-				RIGHT OUTER JOIN 
-				(
-					SELECT CODE2 AS PLACECODE, CODENM AS PLACENAME 
-					FROM TCODE 
-					WHERE CODE1 = 'C001'
-	]]>
-				<if test="places != null and places.length > 0">
-						AND CODE2 IN
-					<foreach collection="places" item="place" open="(" close=")" separator=",">
-						#{place}
-					</foreach>
-				</if>
-	<![CDATA[
-					) C 
-					ON C.PLACECODE = R.IN_PLACE_CODE
-				GROUP BY 
-					PLACENAME, PLACECODE ) B
-		WHERE A.PLACENAME = B.PLACENAME
-		ORDER BY PLACECODE
-	]]>		
+
+<!--		WITH RPT AS (-->
+<!--		SELECT 	*-->
+<!--		FROM-->
+<!--		RPT_INFO-->
+<!--		WHERE-->
+<!--		IN_COMPLETE = '1'-->
+<!--		AND IN_STATE_CODE <> '99'-->
+<!--		AND IN_INFODATE >= #{dateStart}-->
+<!--		AND IN_INFODATE <= #{dateEnd}-->
+<!--		]]>-->
+<!--		<if test="policeType != null and policeType.length > 0">-->
+<!--			AND IN_TYPE IN-->
+<!--			<foreach collection="policeType" item="type" open="(" close=")" separator=",">-->
+<!--				#{type}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<if test="judges != null and judges.length > 0">-->
+<!--			AND IN_JUDGE IN-->
+<!--			<foreach collection="judges" item="judge" open="(" close=")" separator=",">-->
+<!--				#{judge}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<if test="category1 != null and category1.length > 0">-->
+<!--			AND IN_CATEGORY1 IN-->
+<!--			<foreach collection="category1" item="category" open="(" close=")" separator=",">-->
+<!--				#{category}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<if test="category2 != null and category2.length > 0">-->
+<!--			AND IN_CATEGORY2 IN-->
+<!--			<foreach collection="category2" item="category" open="(" close=")" separator=",">-->
+<!--				#{category}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<if test="category3 != null and category3.length > 0">-->
+<!--			AND IN_CATEGORY3 IN-->
+<!--			<foreach collection="category3" item="category" open="(" close=")" separator=",">-->
+<!--				#{category}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<if test="category4 != null and category4.length > 0">-->
+<!--			AND IN_CATEGORY4 IN-->
+<!--			<foreach collection="category4" item="category" open="(" close=")" separator=",">-->
+<!--				#{category}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<![CDATA[-->
+<!--		)-->
+<!--		SELECT-->
+<!--			A.PLACENAME,-->
+<!--			TO_CHAR(REPORT1) REPORT1, TO_CHAR(REPORT2) REPORT2,-->
+<!--			TO_CHAR(JU1) JU1, TO_CHAR(JU2) JU2, TO_CHAR(JU3) JU3, TO_CHAR(JU4) JU4, TO_CHAR(JU5) JU5, TO_CHAR(JU6) JU6, TO_CHAR(JU7) JU7,-->
+<!--			TO_CHAR((JU1 + JU2)) AS AG, TO_CHAR((JU3 + JU4)) AS BG, TO_CHAR((JU5 + JU6)) AS CG, TO_CHAR(JU7) AS DG-->
+<!--		FROM-->
+<!--			((-->
+<!--				SELECT-->
+<!--					PLACENAME, PLACECODE, IN_JUDGE, IN_SEQ-->
+<!--				FROM-->
+<!--					RPT R-->
+<!--				RIGHT OUTER JOIN-->
+<!--				(-->
+<!--					SELECT CODE2 AS PLACECODE, CODENM AS PLACENAME-->
+<!--					FROM TCODE-->
+<!--					WHERE CODE1 = 'C001'-->
+<!--	]]>-->
+<!--		<if test="places != null and places.length > 0">-->
+<!--			AND CODE2 IN-->
+<!--			<foreach collection="places" item="place" open="(" close=")" separator=",">-->
+<!--				#{place}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<![CDATA[-->
+<!--				) C-->
+<!--				ON C.PLACECODE = R.IN_PLACE_CODE-->
+<!--			) PIVOT (COUNT(IN_SEQ) FOR IN_JUDGE IN (1 JU1, 2 JU2, 3 JU3, 4 JU4, 5 JU5, 6 JU6, 7 JU7))) A,-->
+<!--			(-->
+<!--				SELECT-->
+<!--					PLACENAME,-->
+<!--					SUM(CASE WHEN IN_REPORT1 = 1 THEN 1 ELSE 0 END) AS REPORT1,-->
+<!--					SUM(CASE WHEN IN_REPORT2 = 1 THEN 1 ELSE 0 END) AS REPORT2-->
+<!--				FROM-->
+<!--					RPT R-->
+<!--				RIGHT OUTER JOIN-->
+<!--				(-->
+<!--					SELECT CODE2 AS PLACECODE, CODENM AS PLACENAME-->
+<!--					FROM TCODE-->
+<!--					WHERE CODE1 = 'C001'-->
+<!--	]]>-->
+<!--		<if test="places != null and places.length > 0">-->
+<!--			AND CODE2 IN-->
+<!--			<foreach collection="places" item="place" open="(" close=")" separator=",">-->
+<!--				#{place}-->
+<!--			</foreach>-->
+<!--		</if>-->
+<!--		<![CDATA[-->
+<!--					) C-->
+<!--					ON C.PLACECODE = R.IN_PLACE_CODE-->
+<!--				GROUP BY-->
+<!--					PLACENAME, PLACECODE ) B-->
+<!--		WHERE A.PLACENAME = B.PLACENAME-->
+<!--		ORDER BY PLACECODE-->
 	</select>
 </mapper>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/inter/arrestAdd.jsp b/src/main/webapp/WEB-INF/jsp/inter/arrestAdd.jsp
index dce7942..4c4b0e2 100644
--- a/src/main/webapp/WEB-INF/jsp/inter/arrestAdd.jsp
+++ b/src/main/webapp/WEB-INF/jsp/inter/arrestAdd.jsp
@@ -1098,8 +1098,7 @@
 	<ul class="right btn-style">
 
 	<c:if test="${regFlag eq 'create'}">
-	<li><a href="javascript:fnInsert('1')"><spring:message
-	code="arrest.submit" /></a></li>
+	<li><a href="javascript:fnInsert('1')"><spring:message code="arrest.submit" /></a></li>
 	<%-- <li><a href="javascript:fnInsert('0')"><spring:message code="arrest.temporary"/></a></li>	     --%>
 	</c:if>
 	<c:if test="${regFlag eq 'modify'}">
diff --git a/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp b/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
index 8d9016b..183d078 100644
--- a/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
+++ b/src/main/webapp/WEB-INF/jsp/report/statsResult.jsp
@@ -267,21 +267,21 @@
 						<c:if test="${status.last}"><td align="center"><c:out value="${stats.placename}"/></td></c:if>
 						<c:if test="${!status.last}"><td align="left"><c:out value="${stats.placename}"/></td></c:if>
 						
-						<td align="center"><c:out value="${stats.REPORT1}"/></td>
-						<td align="center"><c:out value="${stats.REPORT2}"/></td>
+						<td align="center"><c:out value="${stats.report1}"/></td>
+						<td align="center"><c:out value="${stats.report2}"/></td>
 						
-						<td align="center"><c:out value="${stats.JU1}"/></td>
-						<td align="center"><c:out value="${stats.JU2}"/></td>
-						<td align="center"><c:out value="${stats.JU3}"/></td>
-						<td align="center"><c:out value="${stats.JU4}"/></td>
-						<td align="center"><c:out value="${stats.JU5}"/></td>
-						<td align="center"><c:out value="${stats.JU6}"/></td>
-						<td align="center"><c:out value="${stats.JU7}"/></td>
+						<td align="center"><c:out value="${stats.ju1}"/></td>
+						<td align="center"><c:out value="${stats.ju2}"/></td>
+						<td align="center"><c:out value="${stats.ju3}"/></td>
+						<td align="center"><c:out value="${stats.ju4}"/></td>
+						<td align="center"><c:out value="${stats.ju5}"/></td>
+						<td align="center"><c:out value="${stats.ju6}"/></td>
+						<td align="center"><c:out value="${stats.ju7}"/></td>
 						
-						<td align="center"><c:out value="${stats.AG}"/></td>
-						<td align="center"><c:out value="${stats.BG}"/></td>
-						<td align="center"><c:out value="${stats.CG}"/></td>
-						<td align="center"><c:out value="${stats.DG}"/></td>
+						<td align="center"><c:out value="${stats.ag}"/></td>
+						<td align="center"><c:out value="${stats.bg}"/></td>
+						<td align="center"><c:out value="${stats.cg}"/></td>
+						<td align="center"><c:out value="${stats.dg}"/></td>
 					</tr>
 				</c:forEach>
 			</c:if>
diff --git a/src/main/webapp/WEB-INF/jsp/tg/divMngAdd.jsp b/src/main/webapp/WEB-INF/jsp/tg/divMngAdd.jsp
index 024730f..6f15636 100644
--- a/src/main/webapp/WEB-INF/jsp/tg/divMngAdd.jsp
+++ b/src/main/webapp/WEB-INF/jsp/tg/divMngAdd.jsp
@@ -96,7 +96,7 @@
    		</tr>
    		<tr>
    			<th>
-   				<form:label path="tel"><spring:message code="target.divmng.equipStat" /></form:label>
+   				<form:label path="tel"><spring:message code="target.divmng.equipstat" /></form:label>
    			</th>
    			<td colspan="3">
    				<form:textarea path="equipStat" cssClass="ta" />
diff --git a/src/main/webapp/WEB-INF/jsp/tg/divMngView.jsp b/src/main/webapp/WEB-INF/jsp/tg/divMngView.jsp
index e072f71..d61eaa6 100644
--- a/src/main/webapp/WEB-INF/jsp/tg/divMngView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/tg/divMngView.jsp
@@ -36,7 +36,7 @@
 			<td><c:out value="${divMngVO.condition}" /></td>
 		</tr>
 		<tr>
-			<th><spring:message code="target.divmng.equipStat" /></th>
+			<th><spring:message code="target.divmng.equipstat" /></th>
 			<td colspan="3"><c:out value="${divMngVO.equipStat}" /></td>
 		</tr>
 		<tr>