과태료감경관리 패키지 경로 수정(단속 -> 부과)

src/main/java/cokr/xit/fims/crdn/dao/CrdnListMapper.java

@@ -56,11 +56,4 @@ public interface CrdnListMapper extends AbstractMapper {
 	 */
 	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery query);
 
-	/**과태료 감경 자료 목록을 조회한다.<br />
-	 * {@link cokr.xit.fims.crdn.service.bean.CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param query 과태료 감경 자료 목록 조회 조건
-	 * @return 과태료 감경 자료 목록
-	 */
-	List<DataObject> selectFineReductionDataList(CrdnQuery query);
-
 }

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

@@ -82,9 +82,6 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 	        case "tagInformationUndefinedData":
 	        	dataObjectList = crdnListMapper.selectTagInformationUndefinedDataList(query.setOrderBy("CRDN_ID"));
 	        	break;
-	        case "fineReductionData":
-	        	dataObjectList = crdnListMapper.selectFineReductionDataList(query.setOrderBy("CRDN_ID"));
-	        	break;
 	        case "photo":
 	        	dataObjectList = crdnListMapper.selectPhotoInspectionDataList(query.setOrderBy("VHRNO, CRDN_PLC, CRDN_ID"));
 	        	break;
@@ -108,8 +105,7 @@ public class CrdnServiceBean extends AbstractServiceBean implements CrdnService
 	        	break;
 	    }
 
-        if(ifEmpty(query.getGridType(), () -> "").equals("tagInformationUndefinedData")
-        		|| ifEmpty(query.getGridType(), () -> "").equals("fineReductionData")) {
+        if(ifEmpty(query.getGridType(), () -> "").equals("tagInformationUndefinedData")) {
         	Iterator<DataObject> iterator = dataObjectList.iterator();
         	while(iterator.hasNext()) {
         		DataObject dataObject = iterator.next();

src/main/java/cokr/xit/fims/crdn/web/Crdn04Controller.java

@@ -1,61 +0,0 @@
-package cokr.xit.fims.crdn.web;
-
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Resource;
-
-import org.springframework.web.servlet.ModelAndView;
-
-import cokr.xit.base.code.CommonCode;
-import cokr.xit.base.web.ApplicationController;
-import cokr.xit.fims.crdn.CrdnQuery;
-import cokr.xit.fims.crdn.service.CrdnService;
-import cokr.xit.fims.crdn.service.CrdnStngService;
-
-/**과태료감경자료 관리 서비스 웹 컨트롤러.<br />
- * {웹 컨텍스트}/crdn/crdn04 로 접근할 수 있다.
- * @author leebj
- */
-public class Crdn04Controller extends ApplicationController {
-
-	public static final String CLASS_URL = "/crdn/crdn04";
-
-	public class METHOD_URL {
-		public static final String
-		fineReductionDataMain = "/010/main.do",
-		getFineReductionDataList = "/040/list.do"
-		;
-	}
-
-	@Resource(name="crdnService")
-	private CrdnService crdnService;
-
-	@Resource(name="crdnStngService")
-	private CrdnStngService crdnStngService;
-
-	/** 과태료 감경 자료 메인화면을 연다.
-	 * @return fims/crdn/crdn04010-main
-	 */
-	public ModelAndView fineReductionDataMain() {
-		ModelAndView mav = new ModelAndView();
-		mav.setViewName("fims/crdn/crdn04010-main");
-		mav.addObject("pageName","crdn04010-main");
-
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054");
-		mav.addObject("FIM054List", commonCodes.get("FIM054"));
-		addCodes(commonCodes, mav, "FIM010", "FIM019");
-		return mav;
-	}
-
-	/**감경자료 목록을 조회한다.<br />
-	 * {@link CrdnService#getCrackdownList(CrdnQuery)} 참고
-	 * @param query 감경자료 목록 조회 조건
-	 * @return jsonView
-	 */
-	public ModelAndView getFineReductionDataList(CrdnQuery query) {
-		query.setGridType("fineReductionData");
-		setFetchSize(query);
-		return setCollectionInfo(new ModelAndView("jsonView"), crdnService.getCrackdownList(query),"");
-	}
-}

src/main/java/cokr/xit/fims/levy/LevyQuery.java

@@ -1,6 +1,6 @@
 package cokr.xit.fims.levy;
 
-import cokr.xit.foundation.component.QueryRequest;
+import cokr.xit.fims.cmmn.CmmnQuery;
 
 /**과태료 부과 대장 정보 조회 요청
  *
@@ -12,13 +12,12 @@ import cokr.xit.foundation.component.QueryRequest;
  * ================================
  * </pre>
  */
-public class LevyQuery extends QueryRequest {
+public class LevyQuery extends CmmnQuery {
 
 	private static final long serialVersionUID = 1L;
 
 	// 필수 조건
 	private String sggCd;														// 시군구 코드
-	private String taskSeCd;													// 업무 구분 코드
 	private String delYn;														// 삭제 여부
 	// ID
 	private String crdnId;														// 단속 ID
@@ -26,10 +25,16 @@ public class LevyQuery extends QueryRequest {
 	private String levyId;														// 부과 ID
 	private String[] rductIDs;													// 감경 IDs
 	private String rductId;														// 감경 ID
+
+	//날짜
+	private String schRductYmdFrom;
+	private String schRductYmdTo;
+
 	// ETC
 	private String callPurpose;													// 호출용도 필요시 사용(select, create, update)
 	private String delRsn;														// 삭제 사유
 
+
 	public String getSggCd() {
 		return ifEmpty(sggCd, () -> null);
 	}
@@ -40,16 +45,6 @@ public class LevyQuery extends QueryRequest {
 		return self();
 	}
 
-	public String getTaskSeCd() {
-		return ifEmpty(taskSeCd, () -> null);
-	}
-
-	public <T extends LevyQuery> T setTaskSeCd(String taskSeCd) {
-		this.taskSeCd = taskSeCd;
-
-		return self();
-	}
-
 	public String getDelYn() {
 		return ifEmpty(delYn, () -> null);
 	}
@@ -110,6 +105,24 @@ public class LevyQuery extends QueryRequest {
 		return self();
 	}
 
+	public String getSchRductYmdFrom() {
+		return ifEmpty(schRductYmdFrom, () -> null);
+	}
+
+	public <T extends LevyQuery> T setSchRductYmdFrom(String schRductYmdFrom) {
+		this.schRductYmdFrom = schRductYmdFrom;
+		return self();
+	}
+
+	public String getSchRductYmdTo() {
+		return ifEmpty(schRductYmdTo, () -> null);
+	}
+
+	public <T extends LevyQuery> T setSchRductYmdTo(String schRductYmdTo) {
+		this.schRductYmdTo = schRductYmdTo;
+		return self();
+	}
+
 	// ETC /////////////////////////////////////////////////////////////////////
 	public String getCallPurpose() {
 		return ifEmpty(callPurpose, () -> null);

src/main/java/cokr/xit/fims/levy/service/bean/Levy02Bean.java

@@ -1,17 +1,18 @@
 package cokr.xit.fims.levy.service.bean;
 
+import java.util.Iterator;
 import java.util.List;
 
 import javax.annotation.Resource;
 
 import org.springframework.stereotype.Component;
 
-import cokr.xit.foundation.AbstractComponent;
-import cokr.xit.foundation.data.DataObject;
-
-import cokr.xit.fims.levy.Rduct;
+import cokr.xit.fims.crdn.service.bean.CrdnStngBean;
 import cokr.xit.fims.levy.LevyQuery;
+import cokr.xit.fims.levy.Rduct;
 import cokr.xit.fims.levy.dao.RductMapper;
+import cokr.xit.foundation.AbstractComponent;
+import cokr.xit.foundation.data.DataObject;
 
 /**과태료 감경 대장 정보 관리 Bean
  *
@@ -30,12 +31,31 @@ public class Levy02Bean extends AbstractComponent {
 	@Resource(name = "rductMapper")
 	private RductMapper rductMapper;
 
+	@Resource(name = "crdnStngBean")
+	private CrdnStngBean crdnStngBean;
+
 	/**지정한 조건에 따라 과태료 감경 대장 목록을 조회하여 반환한다.
 	 * @param req 과태료 감경 대장 조회 조건
 	 * @return 과태료 감경 대장 목록
 	 */
 	public List<DataObject> getRductList(LevyQuery req) {
-		return rductMapper.selectRductList(req);
+		List<DataObject> dataObjectList = rductMapper.selectRductList(req);
+
+		Iterator<DataObject> iterator = dataObjectList.iterator();
+    	while(iterator.hasNext()) {
+    		DataObject dataObject = iterator.next();
+    		String state = dataObject.string("CRDN_STTS_CD");
+    		int advntceAmt = dataObject.number("ADVNTCE_AMT").intValue();
+    		int ffnlgAmt = dataObject.number("FFNLG_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", crdnStngBean.getBalance(state,advntceAmt,ffnlgAmt,minusAmt,adtnAmt,rcvmtAmt));
+        }
+
+		return dataObjectList;
+
 	}
 
 	/**지정한 조건에 따라 과태료 감경 대장 객체들을 반환한다.

src/main/java/cokr/xit/fims/levy/web/Levy02Controller.java

@@ -1,6 +1,7 @@
 package cokr.xit.fims.levy.web;
 
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 
@@ -8,9 +9,10 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 
+import cokr.xit.base.code.CommonCode;
 import cokr.xit.base.web.ApplicationController;
-import cokr.xit.fims.levy.Rduct;
 import cokr.xit.fims.levy.LevyQuery;
+import cokr.xit.fims.levy.Rduct;
 import cokr.xit.fims.levy.service.Levy02Service;
 
 /**과태료 감경 대장 서비스의 웹 컨트롤러
@@ -29,7 +31,7 @@ public class Levy02Controller extends ApplicationController {
 	@Resource(name = "levy02Service")
 	private Levy02Service levy02Service;
 
-	/**과태료 감경 대장 관리 메인화면(rduct/rduct-main)을 연다.
+	/**과태료 감경 대장 관리 메인화면(levy/levy02010-main)을 연다.
 	 * 조건없는 {@link #getRductList(RductQuery) 과태료 감경 대장 조회 결과}를 포함시킨다.
 	 * @return /rduct/rduct-main
 	 */
@@ -37,7 +39,12 @@ public class Levy02Controller extends ApplicationController {
 	public ModelAndView main() {
 		ModelAndView mav = getRductList(new LevyQuery().setPageNum(1));
 
-		mav.setViewName("/rduct/rduct-main");
+		mav.setViewName("fims/levy/levy02010-main");
+		mav.addObject("pageName","levy02010-main");
+
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM010", "FIM019", "FIM054");
+		mav.addObject("FIM054List", commonCodes.get("FIM054"));
+		addCodes(commonCodes, mav, "FIM010", "FIM019");
 
 		return mav.addObject("rductList", toJson(mav.getModel().get("rductList")));
 	}
@@ -57,7 +64,7 @@ public class Levy02Controller extends ApplicationController {
 	public ModelAndView getRductList(LevyQuery req) {
 		List<?> result = levy02Service.getRductList(setFetchSize(req));
 
-		return setCollectionInfo(new ModelAndView("jsonView"), result, "rduct");
+		return setCollectionInfo(new ModelAndView("jsonView"), result, "");
 	}
 
 	/**과태료 감경 대장를 등록한다.

src/main/java/cokr/xit/fims/task/web/BpvController.java

@@ -192,18 +192,6 @@ public class BpvController {
 
 	}
 
-	@Controller
-	@RequestMapping(name="전용차로과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL)
-	class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {
-
-		@Override
-		@RequestMapping(name="전용차로과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList)
-		public ModelAndView getFineReductionDataList(CrdnQuery query) {
-			return super.getFineReductionDataList(query);
-		}
-
-	}
-
 	@Controller
 	@RequestMapping(name="전용차로과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL)
 	class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {

src/main/java/cokr/xit/fims/task/web/CmnController.java

@@ -114,19 +114,6 @@ public class CmnController {
 		}
 	}
 
-	@Controller
-	@RequestMapping(name="과태료 감경 자료", value=Crdn04Controller.CLASS_URL)
-	class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {
-		/** 과태료 감경 자료 메인화면을 연다.
-		 * @return fims/crdn/crdn04010-main
-		 */
-		@Override
-		@RequestMapping(name="과태료 감경 자료 메인", value=METHOD_URL.fineReductionDataMain)
-		public ModelAndView fineReductionDataMain() {
-			return super.fineReductionDataMain();
-		}
-	}
-
 	@Controller
 	@RequestMapping(name="단속 자료 등록", value=Crdn05Controller.CLASS_URL)
 	class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {
@@ -240,6 +227,19 @@ public class CmnController {
 		}
 	}
 
+	@Controller
+	@RequestMapping(name = "과태료 감경 관리", value = "/levy/levy02")
+	class Levy02Controller extends cokr.xit.fims.levy.web.Levy02Controller {
+		/** 과태료 감경 관리 메인화면을 연다.
+		 * @return fims/levy/levy02010-main
+		 */
+		@Override
+		@RequestMapping(name = "과태료 감경 대장 메인", value = "/010/main.do")
+		public ModelAndView main() {
+			return super.main();
+		}
+	}
+
 	@Controller
 	@RequestMapping(name = "발송 관리", value = "/sndb/sndb01")
 	class Sndb01Controller extends cokr.xit.fims.sndb.web.Sndb01Controller {

src/main/java/cokr/xit/fims/task/web/DpvController.java

@@ -215,18 +215,6 @@ public class DpvController {
 
 	}
 
-	@Controller
-	@RequestMapping(name="장애인과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL)
-	class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {
-
-		@Override
-		@RequestMapping(name="장애인과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList)
-		public ModelAndView getFineReductionDataList(CrdnQuery query) {
-			return super.getFineReductionDataList(query);
-		}
-
-	}
-
 	@Controller
 	@RequestMapping(name="장애인과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL)
 	class Crdn05Controller extends cokr.xit.fims.crdn.web.Crdn05Controller {

src/main/java/cokr/xit/fims/task/web/EcaController.java

@@ -192,17 +192,6 @@ public class EcaController {
 
 	}
 
-	@Controller
-	@RequestMapping(name="전기차과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL)
-	class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {
-
-		@Override
-		@RequestMapping(name="전기차과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList)
-		public ModelAndView getFineReductionDataList(CrdnQuery query) {
-			return super.getFineReductionDataList(query);
-		}
-
-	}
 
 	@Controller
 	@RequestMapping(name="전기차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL)

src/main/java/cokr/xit/fims/task/web/PvsController.java

@@ -204,17 +204,6 @@ public class PvsController {
 
 	}
 
-	@Controller
-	@RequestMapping(name="주정차과태료업무 과태료감경자료 업무", value=CLASS_URL+Crdn04Controller.CLASS_URL)
-	class Crdn04Controller extends cokr.xit.fims.crdn.web.Crdn04Controller {
-
-		@Override
-		@RequestMapping(name="주정차과태료업무 감경자료 목록 조회", value=METHOD_URL.getFineReductionDataList)
-		public ModelAndView getFineReductionDataList(CrdnQuery query) {
-			return super.getFineReductionDataList(query);
-		}
-
-	}
 
 	@Controller
 	@RequestMapping(name="주정차과태료업무 단속등록업무", value=CLASS_URL+Crdn05Controller.CLASS_URL)

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

@@ -404,54 +404,4 @@ SELECT C.CRDN_ID                                      <!-- 단속 ID -->
 </select>
 
 
-
-<select id="selectFineReductionDataList" parameterType="map" resultType="dataobject">
-/* 과태료 감경 자료 목록 조회(crdnListMapper.selectFineReductionDataList) */
-<include refid="utility.paging-prefix"/>
-SELECT C.CRDN_ID                                      <!-- 단속 ID -->
-     , SUBSTR(RD.REG_DT,1,8) AS RDUCT_YMD             <!-- 감액일자 -->
-     , RD.RDUCT_RSN_CD                                <!-- 감액사유 -->
-     , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 접수(위반)일시 -->
-     , C.VHRNO                                        <!-- 차량번호 -->
-     , RD.RDUCT_AMT                                <!-- 감액금액 -->
-     , C.FFNLG_AMT                     <!-- 과태료금액 -->
-     , C.ADVNTCE_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
- INNER JOIN TB_RDUCT RD ON (C.CRDN_ID = RD.CRDN_ID)
- WHERE C.DEL_YN = 'N'
-   AND C.TASK_SE_CD = #{taskSeCd}
-<if test="by != null and by != '' and term != null">
-	<choose>
-		<when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
-			<include refid="dynamicSearch.start" />
-			<choose>
-				<when test="by == 'rductYmd'">RD.REG_DT</when>
-				<when test="by == 'rductRsnCd'">RD.RDUCT_RSN_CD</when>
-				<when test="by == 'crdnYmd'">C.CRDN_YMD</when>
-				<when test="by == 'vhrno'">C.VHRNO</when>
-				<when test="by == 'rductAmt'">RD.RDUCT_AMT</when>
-				<when test="by == 'rductEtcCn'">RD.ETC_CN</when>
-				<when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
-			</choose>
-			<include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
-		</when>
-		<otherwise>
-		</otherwise>
-	</choose>
-</if>
-<if test="crdnId != null">AND C.CRDN_ID = #{crdnId}</if>
-<if test="schRductYmdFrom != null or schRductYmdTo != null">
-	<if test="schRductYmdFrom != null">AND SUBSTR(RD.REG_DT,1,8) <![CDATA[ >= ]]> #{schRductYmdFrom} </if>
-	<if test="schRductYmdTo != null">AND SUBSTR(RD.REG_DT,1,8) <![CDATA[ <= ]]> #{schRductYmdTo} </if>
-</if>
-<include refid="utility.sortBy" />
-<include refid="utility.paging-suffix"/>
-</select>
-
 </mapper>

src/main/resources/sql/mapper/fims/levy/rduct-mapper.xml

@@ -33,7 +33,7 @@
              , R.RDUCT_RSN_CD                                                                                   /* 감경 사유 코드 */
              , (SELECT FN_GET_CODE_NM('FIM019', R.RDUCT_RSN_CD) FROM DUAL)              AS RDUCT_RSN_NM         /* 감경 사유 명 */
              , R.RDUCT_AMT                                                                                      /* 감경 금액 */
-             , R.ETC_CN                                                                                         /* 기타 내용 */
+             , R.ETC_CN AS RDUCT_ETC_CN                                                                         /* 감액 기타 내용 */
              , R.DEL_YN                                                                                         /* 삭제 여부 */
              , R.REG_DT                                                                                         /* 등록 일시 */
              , R.RGTR                                                                                           /* 등록자 */
@@ -45,14 +45,50 @@
              , R.DLTR                                                                                           /* 삭제자 */
              , (SELECT USER_NM FROM TB_USER X WHERE X.USER_ID = R.DLTR)                 AS DLTR_NM              /* 삭제자 명 */
              , R.DEL_RSN                                                                                        /* 삭제 사유 */
-          FROM TB_RDUCT             R
+             , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM                                                   /* 단속 일시 */
+             , C.VHRNO                                                                                          /* 차량 번호 */
+             , C.FFNLG_AMT                                                                                      /* 과태료금액 */
+             , C.ADVNTCE_AMT                                                                                    /* 사전통지금액 */
+             , C.MINUS_AMT                                                                                      /* 감경금액 */
+             , C.ADTN_AMT                                                                                       /* 가산금액 */
+             , C.RCVMT_AMT                                                                                      /* 수납금액 */
+             , 0 AS BLNC                                                                                        /* 잔액 */
+             , C.CRDN_STTS_CD                                                                                   /* 처리상태 */
+          FROM TB_CRDN C
+          INNER JOIN TB_RDUCT R ON (C.CRDN_ID = R.CRDN_ID AND R.DEL_YN = 'N')
     </sql>
 
-    <select id="selectRductList" parameterType="map" resultType="dataobject">/* 과태료 감경 대장 목록 조회(rductMapper.selectRductList) */
+    <select id="selectRductList" parameterType="map" resultType="dataobject">
+    /* 과태료 감경 대장 목록 조회(rductMapper.selectRductList) */
         <include refid="utility.paging-prefix" />
         <include refid="select" />
-        <where></where>
-        <include refid="utility.orderBy" />
+        WHERE C.DEL_YN = 'N'
+          AND C.TASK_SE_CD = #{taskSeCd}
+        <if test="by != null and by != '' and term != null">
+            <choose>
+                <when test="mainOption == 'codeValue' or mainOption == 'match' or mainOption == 'ymd'">
+                    <include refid="dynamicSearch.start" />
+                    <choose>
+                        <when test="by == 'rductYmd'">R.RDUCT_YMD</when>
+                        <when test="by == 'rductRsnCd'">R.RDUCT_RSN_CD</when>
+                        <when test="by == 'crdnYmd'">C.CRDN_YMD</when>
+                        <when test="by == 'vhrno'">C.VHRNO</when>
+                        <when test="by == 'rductAmt'">R.RDUCT_AMT</when>
+                        <when test="by == 'rductEtcCn'">R.ETC_CN</when>
+                        <when test="by == 'crdnSttsCd'">C.CRDN_STTS_CD</when>
+                    </choose>
+                    <include refid="dynamicSearch.center" />#{term}<include refid="dynamicSearch.end" />
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+        </if>
+        <if test="crdnId != null">AND C.CRDN_ID = #{crdnId}</if>
+        <if test="schRductYmdFrom != null or schRductYmdTo != null">
+            <if test="schRductYmdFrom != null">AND R.RDUCT_YMD <![CDATA[ >= ]]> #{schRductYmdFrom} </if>
+            <if test="schRductYmdTo != null">AND R.RDUCT_YMD <![CDATA[ <= ]]> #{schRductYmdTo} </if>
+        </if>
+        <include refid="utility.sortBy" />
         <include refid="utility.paging-suffix" />
     </select>
 

src/main/webapp/WEB-INF/jsp/fims/levy/levy02010-main.jsp

@@ -56,9 +56,10 @@
 				    <div>
 				        <span class="container-page-btn">
 				        	<div class="d-flex flex-row justify-content-between">
-								<label id="crdnPaging--${pageName}PagingInfo" class="dataTables_info" role="status" aria-live="polite"></label>
-				                 <ul id="crdnPaging--${pageName}" class="pagination pagination-primary">
-				                 </ul>
+								<label id="rductPaging--${pageName}PagingInfo" class="dataTables_info" 
+								role="status" aria-live="polite"></label>
+				                <ul id="rductPaging--${pageName}" class="pagination pagination-primary">
+				                </ul>
 							</div>
 				            <span class="container-window-btn-right">
 
@@ -72,7 +73,7 @@
 								<table id="DataTables_Table_0--${pageName}"
 									class="datatables-ajax table table-bordered dataTable no-footer">
 									<thead>
-										<tr id="crdnTheadTr--${pageName}" 
+										<tr id="rductTheadTr--${pageName}" 
 											data-by="by--${pageName}" data-by-output="byOutput--${pageName}"
 											data-main-option="mainOption--${pageName}" data-sub-option="subOption--${pageName}">
 											<th style="min-width: 80px;">No.</th>
@@ -93,8 +94,8 @@
 											style="min-width: 80px;">처리상태</th>
 										</tr>
 				                    </thead>
-				                    <tbody id="crdnTbody--${pageName}"></tbody>
-									<template id="crdnRow--${pageName}">
+				                    <tbody id="rductTbody--${pageName}"></tbody>
+									<template id="rductRow--${pageName}">
 			                    		<tr data-key="{CRDN_ID}">
 			                    			<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-end">{ROW_NUM}</td>
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{RDUCT_YMD}</td>
@@ -107,7 +108,7 @@
 				                    		<td onclick="{onclick}" ondblclick="{ondblclick}" class="text-center">{CRDN_STTS_CD}</td>
 				                    	</tr>
 			                    	</template>
-			                    	<template id="crdnNotFound--${pageName}">
+			                    	<template id="rductNotFound--${pageName}">
 			                    		<tr>
 			                    			<td valign="top" colspan="9" class="dataTables_empty text-center">단속 정보를 찾지 못했습니다.</td>
 			                    		</tr>
@@ -145,7 +146,7 @@ $(document).ready(function(){
 	/**************************************************************************
 	 * DatasetControl
 	 **************************************************************************/
-	$P.crdnControl = new DatasetControl({
+	$P.rductControl = new DatasetControl({
 	    urls : { load : "", getInfo : "" },
 	    dataGetter : obj => obj["List"], appendData:true,
 	    keymapper : info => info ? info.CRDN_ID : "",
@@ -159,41 +160,41 @@ $(document).ready(function(){
 	    	BLNC 			: numberFormat
 		}
 	});
-	$P.crdnControl.defaultFetchSize = FETCH_XS;
-	$P.crdnControl.untilPageNum = 0;
-	$P.crdnControl.beforeCurrent = null;
-	$P.crdnControl.tableRenderComplete = false;
+	$P.rductControl.defaultFetchSize = FETCH_XS;
+	$P.rductControl.untilPageNum = 0;
+	$P.rductControl.beforeCurrent = null;
+	$P.rductControl.tableRenderComplete = false;
 	
 	/**************************************************************************
 	 * DatasetControl.on
 	 **************************************************************************/
-	$P.crdnControl.onDatasetChange = (obj) => {
+	$P.rductControl.onDatasetChange = (obj) => {
 		
-	    $P.renderCrdnList(obj["Total"]);
+	    $P.renderRductList(obj["Total"]);
 
-		$("#crdnPaging--${pageName}").setPagingInfo({
-	        list: $P.crdnControl.dataset,
-	        prefix: "crdnPaging--${pageName}",
+		$("#rductPaging--${pageName}").setPagingInfo({
+	        list: $P.rductControl.dataset,
+	        prefix: "rductPaging--${pageName}",
 	        start: obj["Start"],
 	        totalSize: obj["Total"],
 	        fetchSize: obj["Fetch"],
-	        func: "pageObject['${pageName}'].crdnControl.load({index})"
+	        func: "pageObject['${pageName}'].rductControl.load({index})"
 	    });
 		
-		$P.crdnControl.tableRenderComplete = true;
+		$P.rductControl.tableRenderComplete = true;
 	};
 
-	$P.crdnControl.onCurrentChange = (item) => {
+	$P.rductControl.onCurrentChange = (item) => {
 		
-		if(!$P.crdnControl.tableRenderComplete){
+		if(!$P.rductControl.tableRenderComplete){
 			return;
 		}
 		
-		$P.crdnControl.tableRenderComplete = false;
+		$P.rductControl.tableRenderComplete = false;
 		if(!item){
-			$P.clickCrdnList("", true);
+			$P.clickRductList("", true);
 		} else {
-			$P.clickCrdnList($P.crdnControl.getCurrent()["CRDN_ID"], true);
+			$P.clickRductList($P.rductControl.getCurrent()["CRDN_ID"], true);
 		}
 	}
 
@@ -203,24 +204,24 @@ $(document).ready(function(){
 	$P.fnReset = () => {
 		$('#schRductYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
 	    $('#schRductYmdTo--${pageName}').datepicker('setDate', new Date());
-		$P.crdnControl.setData([]);
+		$P.rductControl.setData([]);
 	}
 
 	$P.fnResetAndChangeBiz = taskSeCd => {
 		$P.fnReset();
-		$P.crdnControl.urls.load = wctx.url("/"+taskSeCd+"/crdn/crdn04/040/list.do");
-		$P.crdnControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt02/010/main.do");
+		$P.rductControl.urls.load = wctx.url("/"+taskSeCd+"/levy/levy02/010/list.do");
+		$P.rductControl.urls.getInfo = wctx.url("/"+taskSeCd+"/sprt/sprt02/010/main.do");
 	}
 
-	$P.refreshCrdnList = () => {
-		$P.crdnControl.untilPageNum = $P.crdnControl.query.pageNum;
-	    $P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize * $P.crdnControl.query.pageNum;
-	    $P.crdnControl.load(1);
+	$P.refreshRductList = () => {
+		$P.rductControl.untilPageNum = $P.rductControl.query.pageNum;
+	    $P.rductControl.query.fetchSize = $P.rductControl.defaultFetchSize * $P.rductControl.query.pageNum;
+	    $P.rductControl.load(1);
 	}
 	
-	$P.searchCrdnList = () => {
-		$P.crdnControl.query = $P.getParams();
-	    $P.crdnControl.load(1);
+	$P.searchRductList = () => {
+		$P.rductControl.query = $P.getParams();
+	    $P.rductControl.load(1);
 	}
 
 	$P.scrollEnd = (obj) => {
@@ -235,30 +236,30 @@ $(document).ready(function(){
 
     	if((el[0].scrollHeight - el.scrollTop() + VERTICAL_SCROLL_HEIGHT) <= el.outerHeight()){
     		obj.dataset.scrollStatus = "waiting";
-    		$P.scrollCrdnList();
+    		$P.scrollRductList();
     	}
 	}
 
-	$P.scrollCrdnList = () => {
-		$P.crdnControl.load($P.crdnControl.query.pageNum + 1);
+	$P.scrollRductList = () => {
+		$P.rductControl.load($P.rductControl.query.pageNum + 1);
 	}
 
-	$P.clickCrdnList = (dataKey, auto) => {
+	$P.clickRductList = (dataKey, auto) => {
 		if(dataKey == ""){
 			return;
 		}
 		
-		$("#crdnTbody--${pageName}").setCurrentRow(dataKey);
+		$("#rductTbody--${pageName}").setCurrentRow(dataKey);
 		
 		if(!auto){
-			$P.crdnControl.setCurrent(dataKey);
+			$P.rductControl.setCurrent(dataKey);
 		}
 	}
 
-	$P.dblclickCrdnList = (dataKey) => {
+	$P.dblclickRductList = (dataKey) => {
 		
 		ajax.get({
-			url : $P.crdnControl.urls.getInfo,
+			url : $P.rductControl.urls.getInfo,
 			data : { "crdnId" : dataKey },
 			success : resp => {
 				
@@ -273,40 +274,40 @@ $(document).ready(function(){
 		
 	}
 
-	$P.renderCrdnList = (total) => {
+	$P.renderRductList = (total) => {
 
-	    var crdnList = $P.crdnControl.dataset;
-		var empty = crdnList.empty;
-		var notFound = [document.getElementById("crdnNotFound--${pageName}").innerHTML];
-		var found = document.getElementById("crdnRow--${pageName}").innerHTML;
+	    var rductList = $P.rductControl.dataset;
+		var empty = rductList.empty;
+		var notFound = [document.getElementById("rductNotFound--${pageName}").innerHTML];
+		var found = document.getElementById("rductRow--${pageName}").innerHTML;
 		var replacer = (str, dataItem) => str
-        	.replace(/{onclick}/gi, "pageObject['${pageName}'].clickCrdnList('" + dataItem.getValue("CRDN_ID") + "');")
-        	.replace(/{ondblclick}/gi, "pageObject['${pageName}'].dblclickCrdnList('" + dataItem.getValue("CRDN_ID") + "');");
+        	.replace(/{onclick}/gi, "pageObject['${pageName}'].clickRductList('" + dataItem.getValue("CRDN_ID") + "');")
+        	.replace(/{ondblclick}/gi, "pageObject['${pageName}'].dblclickRductList('" + dataItem.getValue("CRDN_ID") + "');");
 
-		var trs = empty ? notFound : crdnList.inStrings(found,replacer);
+		var trs = empty ? notFound : rductList.inStrings(found,replacer);
 
-		$("#crdnTbody--${pageName}").html(trs.join());
+		$("#rductTbody--${pageName}").html(trs.join());
 
 		//보안모드
 	    fn_securityModeToggle($("#securityMode--top").is(":checked"));
 		
-	    if(total == crdnList.length){
+	    if(total == rductList.length){
 			$("#table-responsive--${pageName}").attr("data-scroll-status", "complete");
 		} else {
 			$("#table-responsive--${pageName}").removeAttr("data-scroll-status");
 		}
 	    
-	    if($P.crdnControl.untilPageNum != 0){
-			$P.crdnControl.query.fetchSize = $P.crdnControl.defaultFetchSize;
-			$P.crdnControl.query.pageNum = $P.crdnControl.untilPageNum;
-			$P.crdnControl.untilPageNum = 0;
+	    if($P.rductControl.untilPageNum != 0){
+			$P.rductControl.query.fetchSize = $P.rductControl.defaultFetchSize;
+			$P.rductControl.query.pageNum = $P.rductControl.untilPageNum;
+			$P.rductControl.untilPageNum = 0;
 		}
 	}
 
 	$P.getParams = () => {
 		var formFields = new FimsFormFields("#frmSearch--${pageName}");
 		var data = formFields.get();
-		data.fetchSize = $P.crdnControl.defaultFetchSize;
+		data.fetchSize = $P.rductControl.defaultFetchSize;
 		return data;
 	}
 
@@ -315,7 +316,7 @@ $(document).ready(function(){
 	 * element.on
 	 **************************************************************************/
     $('#btnReset--${pageName}').on('click', () => $P.fnReset());
-    $('#btnSearch--${pageName}').on('click', () => $P.searchCrdnList());
+    $('#btnSearch--${pageName}').on('click', () => $P.searchRductList());
     $("#table-responsive--${pageName}").scroll(function(){ $P.scrollEnd(this); });
 
     /**************************************************************************