Merge branch 'main' of http://xit.xit-git.com:3000/xit-app/fims

src/main/java/cokr/xit/fims/crdn/CrdnQuery.java

@@ -49,6 +49,7 @@ public class CrdnQuery extends CmmnQuery {
 	private String dtlAmtDcsnCd;
 	private String crdnInptSeCd;
 	private String cvlcptPrcsCd;
+	private String crdnSttsCd;
 
 	//포함, 제외, 특정 자료
 	private String schOnlySamePlace;
@@ -267,6 +268,15 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getCrdnSttsCd() {
+		return ifEmpty(crdnSttsCd, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setCrdnSttsCd(String crdnSttsCd) {
+		this.crdnSttsCd = crdnSttsCd;
+		return self();
+	}
+
 	public String getAplcnYmd() {
 		return ifEmpty(aplcnYmd, () -> null);
 	}

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

@@ -214,7 +214,9 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 		</otherwise>
 	</choose>
 </if>
-
+<if test="crdnSttsCd != null">
+AND C.CRDN_STTS_CD = #{crdnSttsCd}
+</if>
 <include refid="utility.orderBy" />
 <include refid="utility.paging-suffix"/>
 </select>
@@ -271,6 +273,9 @@ SELECT GROUP_CONCAT(C.CRDN_ID) AS CRDN_ID_LIST        <!-- 단속 ID -->
 		</otherwise>
 	</choose>
 </if>
+<if test="crdnSttsCd != null">
+AND C.CRDN_STTS_CD = #{crdnSttsCd}
+</if>
 GROUP BY C.VHRNO<if test="schOnlySamePlace == 'on'">, C.CRDN_STDG_NM </if>
 HAVING COUNT(*) <![CDATA[ >= ]]>
 <choose>

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

@@ -620,7 +620,9 @@ $(document).ready(function(){
 
 		var params = {
 			"crdnId" : info.data.CRDN_ID,
-			"levyExclSeCd" : levyExclSeCd
+			"levyExclSeCd" : levyExclSeCd,
+			"openerPageName" : "crdn06020-main",
+			"callbackFuncName" : "pageObject['crdn06020-main']['exclCallback']",
 		};
 
 		ajax.get({
@@ -639,15 +641,19 @@ $(document).ready(function(){
 					content : resp,
 					size : "lg",
 					init : () => {},
-					onClose : () => {
+					onClose : () => {}
-						$P.refreshInspectionList();
-					}
 				});
 				
 			}
 		});
 	};
 
+	$P.exclCallback = (saved) => {
+		if(saved){
+			$P.refreshInspectionList();
+		}
+	}
+	
 	$P.renderInspectionDataList = (total, renderDataType) => {
 
 	    switch (renderDataType) {

src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01010-main.jsp

@@ -505,6 +505,9 @@ $(document).ready(function(){
     	},
     	"holdRow" : function(currentKey){ 
     		$P.fnHold(currentKey);
+    	},
+    	"refreshList" : function(){ 
+    		$P.refreshCrdnList();
     	}
 	};
 	

src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01020-info.jsp

@@ -326,7 +326,8 @@ pageObject.childReq.push({
 	getNextKey : function(){ return ""; },
 	getPrevKey : function(){ return ""; },
 	selectRow : function(){},
-	holdRow : function(){}
+	holdRow : function(){},
+	refreshList : function(){}
 });
 
 $(document).ready(function(){
@@ -602,7 +603,9 @@ $(document).ready(function(){
 		
 		var params = {
 			"crdnId" : crdnId,
-			"levyExclSeCd" : levyExclSeCd
+			"levyExclSeCd" : levyExclSeCd,
+			"openerPageName" : "cvlc01020-info",
+			"callbackFuncName" : "pageObject['cvlc01020-info']['exclCallback']",
 		};
 		
 		ajax.get({
@@ -611,17 +614,44 @@ $(document).ready(function(){
 			success : resp => {
 				
 				dialog.open({
-					id : "levyExcldialog--${pageName}",
+					id : "levyExcldialog",
 					title : "부과제외 정보",
 					content : resp,
 					size : "lg",
 					init : () => {},
-					onClose : () => { $P.fnGo(crdnId); }		// callback
+					onClose : () => {}
 				});
 			}
 		});
 	};
 	
+	$P.exclCallback = function(saved){
+		if(saved){
+			
+			var crdnId = $("#crdnId--${pageName}").val();
+
+			var cursorKey = "";
+			
+			var nextKey = $P.provided.getNextKey(crdnId);
+	    	if(nextKey != ""){
+	    		cursorKey = nextKey;
+	    	} else {
+	    		var prevKey = $P.provided.getPrevKey(crdnId);
+				if(prevKey != ""){
+					cursorKey = prevKey;
+				}
+	    	}
+	    	
+			$P.provided.refreshList();
+			
+			if(cursorKey != ""){
+				$P.fnGo(cursorKey);
+			} else {
+				dialog.close("cvlcptInitialDataEditDialog--${openerPageName}");
+			}
+		}	
+	};
+	
 	$P.fnPrev = () => {
 		var prevKey = $P.provided.getPrevKey($("#crdnId--${pageName}").val());
 		if(prevKey != ""){

src/main/webapp/WEB-INF/jsp/fims/cvlc/cvlc01030-main.jsp

@@ -405,6 +405,9 @@ $(document).ready(function(){
     	},
     	"selectRow" : function(currentKey){ 
     		$P.clickCrdnList(currentKey);
+    	},
+    	"refreshList" : function(){ 
+    		$P.refreshCrdnList();
     	}
 	};