과태료 감경 자료 화면 수정

src/main/java/cokr/xit/fims/crdn/service/bean/Crdn06Bean.java

@@ -1,17 +1,12 @@
 package cokr.xit.fims.crdn.service.bean;
 
-import java.util.List;
-
 import javax.annotation.Resource;
 
-import org.egovframe.rte.fdl.string.EgovStringUtil;
 import org.springframework.stereotype.Component;
 
 import cokr.xit.fims.crdn.Crdn;
-import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.fims.crdn.dao.Crdn06Mapper;
 import cokr.xit.foundation.AbstractComponent;
-import cokr.xit.foundation.data.DataObject;
 
 /** 단속 관리 Bean
  * @author leebj
@@ -38,4 +33,37 @@ public class Crdn06Bean extends AbstractComponent {
 		}
 	}
 
+	/**잔액을 계산한다.
+	 * @param state 대장 자료 상태
+	 * @param advntceLevyAmt 사전통지부과금액
+	 * @param levyAmt 부과금액
+	 * @param minusAmt 감경금액
+	 * @param adtnAmt 가산금액
+	 * @param rcvmtAmt 수납금액
+	 * @return 잔액
+	 */
+	public int getBalance(String state, int advntceLevyAmt, int levyAmt, int minusAmt, int adtnAmt, int rcvmtAmt) {
+		int result = 0;
+		if(Integer.parseInt(state) < Integer.parseInt("51")) {
+			result = advntceLevyAmt - rcvmtAmt - minusAmt;
+		} else if(state.equals("71") ||
+				state.equals("72") ||
+				state.equals("73") ||
+				state.equals("74") ||
+				state.equals("75") ||
+				state.equals("76") ||
+				state.equals("80") ||
+				state.equals("81") ||
+				state.equals("82") ||
+				state.equals("83") ||
+				state.equals("84") ||
+				state.equals("85")) {
+
+		} else {
+			result = levyAmt - rcvmtAmt - minusAmt + adtnAmt;
+		}
+
+		return result;
+	}
+
 }

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.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 
@@ -34,14 +35,43 @@ public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Serv
 
 	@Override
 	public List<DataObject> getCrackdownList(CrdnQuery req) {
-
+		List<DataObject> dataObjectList = new ArrayList<DataObject>();
         switch (ifEmpty(req.getGrid(), () -> "")) {
 	        case "tagInformationUndefinedData":
-	            return crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID"));
+	        	dataObjectList = crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID"));
+	        	break;
 	        case "fineReductionData":
-	            return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID"));
+	        	dataObjectList = crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID"));
+	        	break;
 	        case "photo":
-	        	List<DataObject> dataObjectList = crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("VHRNO, CRDN_PLC"));
+	        	dataObjectList = crdn06Mapper.selectPhotoInspectionDataList(req.setOrderBy("VHRNO, CRDN_PLC"));
+	        	break;
+	        case "sameVehicleMain":
+	        	dataObjectList = crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO"));
+	        	break;
+	        case "sameVehicleSub":
+	        	dataObjectList = crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID"));
+	        	break;
+	        default:
+	        	dataObjectList = crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID"));
+	        	break;
+	    }
+
+        if(ifEmpty(req.getGrid(), () -> "").equals("tagInformationUndefinedData")
+        		|| ifEmpty(req.getGrid(), () -> "").equals("fineReductionData")) {
+        	Iterator<DataObject> iterator = dataObjectList.iterator();
+        	while(iterator.hasNext()) {
+        		DataObject dataObject = iterator.next();
+        		String state = dataObject.string("CRDN_STTS_CD");
+        		int advntceLevyAmt = dataObject.number("ADVNTCE_LEVY_AMT").intValue();
+        		int levyAmt = dataObject.number("LEVY_AMT").intValue();
+        		int minusAmt = dataObject.number("MINUS_AMT").intValue();
+        		int adtnAmt = dataObject.number("ADTN_AMT").intValue();
+        		int rcvmtAmt = dataObject.number("RCVMT_AMT").intValue();
+
+        		dataObject.set("BLNC", crdn06Bean.getBalance(state,advntceLevyAmt,levyAmt,minusAmt,adtnAmt,rcvmtAmt));
+            }
+        } else if(ifEmpty(req.getGrid(), () -> "").equals("photo")) {
         	Iterator<DataObject> iterator = dataObjectList.iterator();
         	while(iterator.hasNext()) {
         		DataObject dataObject = iterator.next();
@@ -61,15 +91,10 @@ public class Crdn06ServiceBean extends AbstractServiceBean implements Crdn06Serv
                 	dataObject.set("PRCS_MTHD", "정상자료");
                 }
             }
-	        	return dataObjectList;
-	        case "sameVehicleMain":
-	            return crdn06Mapper.selectSameVehicleMainList(req.setOrderBy("VHRNO"));
-	        case "sameVehicleSub":
-	            return crdn06Mapper.selectSameVehicleSubList(req.setOrderBy("CRDN_ID"));
-	        default:
-	            return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID"));
         }
 
+
+        return dataObjectList;
 	}
 
 }

src/main/resources/sql/mapper/fims/crdn/crdn06-mapper.xml

@@ -363,7 +363,13 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 	   IF(TI.TEAMER_2 != '', TI.TEAMER_2,
 	   IF(TI.TEAMER_3 != '', TI.TEAMER_3,
 	   TI.TEAMER_4)))) AS APLCNT_CRDN_NM              <!-- 신고/단속자 -->
-     , C.FFNLG_AMT                                    <!-- 잔액 -->
+	 , C.CRDN_STTS_CD                                 <!-- 처리상태 -->  
+     , C.LEVY_AMT                     <!-- 부과금액 -->
+     , C.ADVNTCE_LEVY_AMT            <!-- 사전통지부과금액 -->
+     , C.MINUS_AMT                    <!-- 감경금액 -->
+     , C.ADTN_AMT                     <!-- 가산금액 -->
+     , C.RCVMT_AMT                    <!-- 수납금액 -->
+     , 0 AS BLNC                                      <!-- 잔액 -->
      , C.ATCH_FILE_CNT                                <!-- 사진건수 -->
      , C.CRDN_SN                                      <!-- 단속 일련번호 -->
   FROM TB_CRDN C
@@ -393,9 +399,6 @@ AND IF(CC.CVLCPT_APLCNT_NM != '', CC.CVLCPT_APLCNT_NM,
 	   IF(TI.TEAMER_2 != '', TI.TEAMER_2,
 	   IF(TI.TEAMER_3 != '', TI.TEAMER_3,
 	   TI.TEAMER_4)))) LIKE CONCAT('%', #{term}, '%')
-		</when>
-		<when test="by == 'ffnlgAmt'">
-AND C.FFNLG_AMT = REPLACE(#{term},',','')
 		</when>
 		<when test="by == 'atchFileCnt'">
 AND C.ATCH_FILE_CNT = #{term}
@@ -433,12 +436,16 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
      , RD.RDUCT_RSN_CD                                <!-- 감액사유 -->
      , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 접수(위반)일시 -->
      , C.VHRNO                                        <!-- 차량번호 -->
-     , L.RDCAMT_PCPTAX                                <!-- 감액금액 -->
+     , RD.RDUCT_AMT                                <!-- 감액금액 -->
-     , L.SUM_AMT                                      <!-- 잔액 -->
+     , C.LEVY_AMT                     <!-- 부과금액 -->
+     , C.ADVNTCE_LEVY_AMT            <!-- 사전통지부과금액 -->
+     , C.MINUS_AMT                    <!-- 감경금액 -->
+     , C.ADTN_AMT                     <!-- 가산금액 -->
+     , C.RCVMT_AMT                    <!-- 수납금액 -->
+     , 0 AS BLNC                                      <!-- 잔액 -->
      , RD.ETC_CN AS RDUCT_ETC_CN                      <!-- 감액특기사항 -->
      , C.CRDN_STTS_CD                                 <!-- 처리상태 -->
   FROM TB_CRDN C
-  LEFT OUTER JOIN TB_LEVY L ON (C.LEVY_ID = L.LEVY_ID)
  INNER JOIN TB_RDUCT RD ON (C.CRDN_ID = RD.CRDN_ID)
  WHERE C.DEL_YN = 'N'
    AND C.TASK_SE_CD = #{taskSeCd}
@@ -456,11 +463,8 @@ AND C.CRDN_YMD = REPLACE(#{term},'-','')
 		<when test="by == 'vhrno'">
 AND C.VHRNO = REPLACE(#{term},'-','')
 		</when>
-		<when test="by == 'rdcamtPcptax'">
+		<when test="by == 'rductAmt'">
-AND L.RDCAMT_PCPTAX = REPLACE(#{term},',','')
+AND RD.RDUCT_AMT = REPLACE(#{term},',','')
-		</when>
-		<when test="by == 'sumAmt'">
-AND L.SUM_AMT = REPLACE(#{term},',','')
 		</when>
 		<when test="by == 'rductEtcCn'">
 AND RD.ETC_CN LIKE CONCAT('%', #{term}, '%')

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06030-main.jsp

@@ -64,7 +64,7 @@
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','VHRNO',this.innerText);">차량번호</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_STDG_NM',this.innerText);">법정동</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','APLCNT_CRDN_NM',this.innerText);">신고/단속자</th>
-											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','FFNLG_AMT',this.innerText);">잔액</th>
+											<th width="80" class="text-orange">잔액</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','ATCH_FILE_CNT',this.innerText);">사진건수</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_SN',this.innerText);">발행번호</th>
 										</tr>
@@ -79,7 +79,7 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{VHRNO}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STDG_NM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{APLCNT_CRDN_NM}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{FFNLG_AMT}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{BLNC}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ATCH_FILE_CNT}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{CRDN_SN}</td>
 										</tr>
@@ -133,7 +133,8 @@ $(document).ready(function(){
 	    	CRDN_INPT_SE_CD : FIM003,
 	    	CRDN_YMD_TM 	: datetimeFormat,
 	    	FFNLG_AMT 		: numberFormat,
-	    	CRDN_STTS_CD 	: FIM010
+	    	CRDN_STTS_CD 	: FIM010,
+	    	BLNC 			: numberFormat
 		},
 	    keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true
 	});

src/main/webapp/WEB-INF/jsp/fims/crdn/crdn06040-main.jsp

@@ -76,8 +76,8 @@
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','RDUCT_RSN_CD',this.innerText);">감액사유</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_YMD','위반일자');">접수(위반)일시</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','VHRNO',this.innerText);">차량번호</th>
-											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','RDCAMT_PCPTAX',this.innerText);">감액금액</th>
+											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','RDUCT_AMT',this.innerText);">감액금액</th>
-											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','SUM_AMT',this.innerText);">잔액</th>
+											<th width="80" class="text-orange">잔액</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','RDUCT_ETC_CN',this.innerText);">감액특기사항</th>
 											<th width="80" onclick="searchFromGridTitle('by--${pageName}','byOutput--${pageName}','CRDN_STTS_CD',this.innerText);">처리상태</th>
 										</tr>
@@ -90,8 +90,8 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{RDUCT_RSN_CD}</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-end">{RDCAMT_PCPTAX}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{RDUCT_AMT}</td>
-				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{SUM_AMT}</td>
+				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{BLNC}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-start">{RDUCT_ETC_CN}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</td>
 				                    	</tr>
@@ -139,9 +139,10 @@ $(document).ready(function(){
 	    formats: {
 	    	RDUCT_YMD 		: dateFormat,
 	    	CRDN_YMD_TM 	: datetimeFormat,
-	    	RDCAMT_PCPTAX 	: numberFormat,
+	    	RDUCT_AMT 		: numberFormat,
 	    	SUM_AMT 		: numberFormat,
-	    	CRDN_STTS_CD 	: FIM010
+	    	CRDN_STTS_CD 	: FIM010,
+	    	BLNC 			: numberFormat
 		},
 	    keymapper:info => info ? info.CRDN_ID : "", dataGetter:obj => obj.crdnList, appendData:true
 	});