From 4e8021b03c66eae639731604454ffe840c056875 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 10 Jul 2023 13:01:22 +0900
Subject: [PATCH] =?UTF-8?q?=EB=8B=A8=EC=86=8D=EC=9E=90=EB=A3=8C=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=20=ED=99=94=EB=A9=B4=20=EC=88=98=EC=A0=95(=EA=B2=80?=
 =?UTF-8?q?=EC=82=AC=EA=B2=B0=EA=B3=BC,=20=EC=B2=98=EB=A6=AC=EB=B0=A9?=
 =?UTF-8?q?=EB=B2=95=20=ED=91=9C=EC=8B=9C)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crdn/service/bean/Crdn06ServiceBean.java  |  23 ++-
 .../sql/mapper/fims/crdn/crdn06-mapper.xml    |  12 +-
 .../WEB-INF/jsp/fims/crdn/crdn06020-main.jsp  |  13 +-
 .../webapp/WEB-INF/jsp/include/taglib.jsp     |   1 -
 src/main/webapp/WEB-INF/tlds/code.tld         | 145 ------------------
 5 files changed, 37 insertions(+), 157 deletions(-)
 delete mode 100644 src/main/webapp/WEB-INF/tlds/code.tld

diff --git a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java
index ed31287c..e671fbe2 100644
--- a/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java
+++ b/src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06ServiceBean.java
@@ -1,5 +1,6 @@
 package cokr.xit.fims.crdn.service.bean;
 
+import java.util.Iterator;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -40,7 +41,27 @@ public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Serv
 	        case "fineReductionData":
 	            return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID"));
 	        case "photo":
-	            return crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("CRDN_ID"));
+	        	List<DataObject> dataObjectList = crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("VHRNO, CRDN_PLC"));
+	        	Iterator<DataObject> iterator = dataObjectList.iterator();
+	        	while(iterator.hasNext()) {
+	        		DataObject dataObject = iterator.next();
+
+	        		if(dataObject.number("ATCH_FILE_CNT").intValue() < 1) {
+	        			dataObject.set("INSP_RSLT", "사진없음");
+	        			dataObject.set("PRCS_MTHD", "해당자료에 사진을 등록하시기 바랍니다.");
+	        		} else if(dataObject.number("CRDN_CNT").intValue() > 1) {
+	                	dataObject.set("INSP_RSLT", "중복자료");
+	                	if(req.getTaskSeCd().equals("PVS")) {
+	                		dataObject.set("PRCS_MTHD", "한건을 시간초과로 처리하십시요.");
+	                	} else {
+	                		dataObject.set("PRCS_MTHD", "한건을 서손으로 처리하십시요.");
+	                	}
+	                } else {
+	                	dataObject.set("INSP_RSLT", "정상자료");
+	                	dataObject.set("PRCS_MTHD", "정상자료");
+	                }
+	            }
+	        	return dataObjectList;
 	        case "sameVehicleMain":
 	            return crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO"));
 	        case "sameVehicleSub":
diff --git a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
index 17bf6b3c..a3b49a63 100644
--- a/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
+++ b/src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml
@@ -245,12 +245,16 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 
 <select id="selectPhotoInspectionDataList" parameterType="map" resultType="dataobject">
 /* 단속사진 검사 자료 목록 조회(crdn06Mapper.selectPhotoInspectionDataList) */
+SELECT ROW_NUMBER() OVER(<include refid="utility.sortBy" />) ROW_NUM, COUNT(*) OVER() TOT_CNT
+     , QBODY.*
+FROM (
+
 SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
      , C.VHRNO                                        <!-- 차량번호 -->
-     , C.VLTN_NMTM                                    <!-- 위반횟수 -->
-     <!-- 검사결과 -->
-     <!-- 처리방법 -->
+     , COUNT(*) OVER (PARTITION BY C.VHRNO, C.CRDN_PLC) AS CRDN_CNT <!-- 위반건수 -->
+     , '' AS INSP_RSLT
+     , '' AS PRCS_MTHD
      , C.CRDN_STDG_NM                                 <!-- 단속 법정동 명 -->
      , C.CRDN_PLC
      , C.ATCH_FILE_CNT                                <!-- 사진건수 -->
@@ -279,7 +283,9 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 <if test="by != null and by != '' and term != null">
 
 </if>
+
 <include refid="utility.orderBy" />
+) QBODY
 </select>
 
 <select id="selectSameVehicleMainList" parameterType="map" resultType="dataobject">
diff --git a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
index 912d59dd..7ea2a967 100644
--- a/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06020-main.jsp
@@ -159,9 +159,9 @@
 											<th width="80px">No.</th>
 											<th width="80px">단속일시</th>
 											<th width="80px">차량번호</th>
-											<th width="80px">위반횟수</th>
-											<th width="80px">검사결과</th>
-											<th width="80px">처리방법</th>
+											<th width="80px">위반건수</th>
+											<th width="80px" class="text-orange">검사결과</th>
+											<th width="80px" class="text-orange">처리방법</th>
 											<th width="80px">위반동</th>
 											<th width="80px">위반장소</th>
 											<th width="80px">사진매수</th>
@@ -177,9 +177,9 @@
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ROW_NUM}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_YMD_TM}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
-											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VLTN_NMTM}</td>
-											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{unknown}</td>
-											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{unknown}</td>
+											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_CNT}</td>
+											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{INSP_RSLT}</td>
+											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{PRCS_MTHD}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STDG_NM}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{CRDN_PLC}</td>
 											<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{ATCH_FILE_CNT}</td>
@@ -368,7 +368,6 @@ $(document).ready(function(){
 	    	CRDN_STTS_CD 	: FIM010,
 	    	FFNLG_AMT 		: numberFormat
 			//감경금액
-	    	//검사결과,처리방법
 		}
 	});
 
diff --git a/src/main/webapp/WEB-INF/jsp/include/taglib.jsp b/src/main/webapp/WEB-INF/jsp/include/taglib.jsp
index 19684f49..a8ded572 100644
--- a/src/main/webapp/WEB-INF/jsp/include/taglib.jsp
+++ b/src/main/webapp/WEB-INF/jsp/include/taglib.jsp
@@ -3,5 +3,4 @@
 %><%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"
 %><%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 
-<%@ taglib prefix="code"    uri="/WEB-INF/tlds/code.tld"%>
 <%@ taglib prefix="privacy"    uri="/WEB-INF/tlds/privacy.tld"%>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tlds/code.tld b/src/main/webapp/WEB-INF/tlds/code.tld
deleted file mode 100644
index 7dd02b5f..00000000
--- a/src/main/webapp/WEB-INF/tlds/code.tld
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-        version="2.0">
-    <description>Common Code tag library</description>
-    <display-name>Common Code tag library</display-name>
-    <tlib-version>1.0</tlib-version>
-    <short-name>code</short-name>
-
-    <tag>
-        <description>select box JSTL</description>
-        <name>select</name>
-        <tag-class>cokr.xit.fims.framework.support.tag.code.CodeSelectBoxTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>type</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>grpId</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>etc_1</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>etc_2</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>etc_3</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>name</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>title</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>defaultSelect</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>isEmptySelect</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>emptyMessageKey</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>cls</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>alt</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onchange</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>disabled</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>display</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    <tag>
-        <name>radio</name>
-        <tag-class>cokr.xit.fims.framework.support.tag.code.CodeRadioBoxTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <name>grpId</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>type</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>etc_1</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>etc_2</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>etc_3</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>defaultSelect</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>cls</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>alt</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onclick</name>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-</taglib>
-