과태료 감경 자료 목록 조회 쿼리 추가

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

@@ -16,6 +16,7 @@ public class CrdnQuery extends QueryRequest {
 	
 	private static final long serialVersionUID = 1L;
 	
+	private String grid;
 	private String crdnId;
 	private String taskSeCd;
 	private String schDateOpt;
@@ -23,6 +24,15 @@ public class CrdnQuery extends QueryRequest {
 	private String schDateTo;
 	private String vhrno;
 	
+	public String getGrid() {
+		return ifEmpty(grid, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setGrid(String grid) {
+		this.grid = grid;
+		return self();
+	}
+	
 	public String getCrdnId() {
 		return ifEmpty(crdnId, () -> null);
 	}

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

@@ -7,6 +7,7 @@ import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
 import cokr.xit.fims.crdn.Crdn;
 import cokr.xit.fims.crdn.CrdnQuery;
 import cokr.xit.foundation.component.AbstractMapper;
+import cokr.xit.foundation.component.QueryRequest;
 import cokr.xit.foundation.data.DataObject;
 
 /**단속 관리 DAO
@@ -22,8 +23,24 @@ public interface Crdn06Mapper extends AbstractMapper {
 	 */
 	List<DataObject> selectCrackdownList(CrdnQuery req);
 	
+	/**표지정보 미확인 자료 목록을 조회한다.<br />
+	 * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고
+	 * @param req 표지정보 미확인 자료 목록 조회 조건
+	 * @return 표지정보 미확인 자료 목록
+	 */
+	List<DataObject> selectTagInformationUndefinedDataList(CrdnQuery req);
+	
+	/**과태료 감경 자료 목록을 조회한다.<br />
+	 * {@link cokr.xit.fims.crdn.service.Crdn06Service#getCrackdownList(CrdnQuery)} 참고
+	 * @param req 과태료 감경 자료 목록 조회 조건
+	 * @return 과태료 감경 자료 목록
+	 */
+	List<DataObject> selectFineReductionDataList(QueryRequest setOrderBy);
+	
 	List<DataObject> selectCrackdowns(CrdnQuery req);
 
 	
 
+	
+	
 }

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

@@ -39,8 +39,14 @@ public class Crdn06Bean extends AbstractComponent {
 			}
 		}
 		
+		switch (ifEmpty(req.getGrid(), () -> "")) {
+			case "TagInformationUndefinedData": 
+				return crdn06Mapper.selectTagInformationUndefinedDataList(req.setOrderBy("CRDN_ID"));
+			case "FineReductionData": 
+				return crdn06Mapper.selectFineReductionDataList(req.setOrderBy("CRDN_ID"));
+			default:
 				return crdn06Mapper.selectCrackdownList(req.setOrderBy("CRDN_ID"));
 		}
-
+	}
 
 }

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

@@ -32,11 +32,23 @@ public class TaskCrdn06Controller extends Crdn06Controller {
 	
 	@RequestMapping(name="장애인과태료업무 표지정보미확인자료 목록", value="/030/DPV/list.do")
 	public ModelAndView getTagInformationUndefinedDataList(CrdnQuery req) {
-		
+		return getCrackdownList(req.setGrid("TagInformationUndefinedData"));
-		//TODO : 표지정보 관련 연계
-		
-		return getCrackdownList(req);
 	}
 	
-	
+	@RequestMapping(name="주정차과태료업무 과태료 감경 자료 목록", value="/040/PVS/list.do")
+	public ModelAndView getPvsFineReductionDataList(CrdnQuery req) {
+		return getCrackdownList(req.setGrid("FineReductionData"));
+	}
+	@RequestMapping(name="전용차로과태료업무 과태료 감경 자료 목록", value="/040/BPV/list.do")
+	public ModelAndView getBpvFineReductionDataList(CrdnQuery req) {
+		return getCrackdownList(req.setGrid("FineReductionData"));
+	}
+	@RequestMapping(name="장애인과태료업무 과태료 감경 자료 목록", value="/040/DPV/list.do")
+	public ModelAndView getDpvFineReductionDataList(CrdnQuery req) {
+		return getCrackdownList(req.setGrid("FineReductionData"));
+	}
+	@RequestMapping(name="전기차과태료업무 과태료 감경 자료 목록", value="/040/ECA/list.do")
+	public ModelAndView getEcaFineReductionDataList(CrdnQuery req) {
+		return getCrackdownList(req.setGrid("FineReductionData"));
+	}
 }

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

@@ -227,6 +227,114 @@ AND C.${by} LIKE CONCAT('%', #{term}, '%')
 	<include refid="selectCrackdown"/>
 </select>
 
+<select id="selectTagInformationUndefinedDataList" parameterType="map" resultType="dataobject">
+/* 표지정보 미확인 자료 목록 조회(crdn06Mapper.selectTagInformationUndefinedDataList) */
+<include refid="utility.paging-prefix"/>
+SELECT C.CRDN_ID               <!-- 단속 ID -->
+     , C.CRDN_INPT_SE_CD       <!-- 단속 입력 구분 코드 -->
+     , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 단속 일시 -->
+     , C.VHRNO                 <!-- 차량번호 -->
+     , C.CRDN_STDG_NM          <!-- 단속 법정동 명 -->
+     <!-- 신고/단속자 -->
+     , CC.CVLCPT_APLCNT_NM      <!-- 민원 신청인 명 -->
+     , C.TEAM_ID               <!-- 조 ID -->
+     , C.VLTN_ID               <!-- 위반 ID -->
+     <!-- 잔액 -->
+     <!-- 영상매체 -->
+     , C.ATCH_FILE_CNT <!-- 사진건수 -->
+     , C.CRDN_SN               <!-- 단속 일련번호 -->
+     <!-- 표지확인 -->
+     , C.CRDN_STTS_CD          <!-- 단속 상태 코드 -->
+     , C.DEL_YN
+     , C.RGTR
+	 , C.REG_DT
+     , C.MDFR
+     , C.MDFCN_DT
+     , C.DLTR
+     , C.DEL_DT
+     , C.DEL_RSN
+FROM TB_CRDN C
+LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CRDN_ID = CC.CRDN_ID)
+WHERE C.DEL_YN = 'N'
+<if test="by != null and by != '' and term != null">
+	<choose>
+		<when test="by == 'advancedOption1'">
+AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<otherwise>
+AND C.${by} LIKE CONCAT('%', #{term}, '%')
+		</otherwise>
+	</choose>
+</if>
+<if test="crdnId != null">AND C.CRDN_ID = #{crdnId}</if>
+<if test="taskSeCd != null">AND C.TASK_SE_CD = #{taskSeCd}</if>
+<if test="vhrno != null">AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%')</if>
+<if test="schDateFrom != null or schDateTo != null">
+	<if test="schDateOpt == 'crdnYmd'">
+		<if test="schDateFrom != null">AND C.CRDN_YMD <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND C.CRDN_YMD <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+	<if test="schDateOpt == 'regDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+</if>
+
+<include refid="utility.orderBy" />
+<include refid="utility.paging-suffix"/>
+</select>
+
+<select id="selectFineReductionDataList" parameterType="map" resultType="dataobject">
+/* 과태료 감경 자료 목록 조회(crdn06Mapper.selectFineReductionDataList) */
+<include refid="utility.paging-prefix"/>
+SELECT C.CRDN_ID               <!-- 단속 ID -->
+     <!-- 감액일자 -->
+     <!-- 감액사유 -->
+     , CONCAT(C.CRDN_YMD,'',C.CRDN_TM) AS CRDN_YMD_TM <!-- 접수(위반)일시 -->
+     , C.VHRNO                 <!-- 차량번호 -->
+     <!-- 감액금액 -->
+     <!-- 잔액 -->
+     <!-- 감액특기사항 -->
+     , C.CRDN_STTS_CD          <!-- 처리상태 -->
+     , C.DEL_YN
+     , C.RGTR
+	 , C.REG_DT
+     , C.MDFR
+     , C.MDFCN_DT
+     , C.DLTR
+     , C.DEL_DT
+     , C.DEL_RSN
+FROM TB_CRDN C
+LEFT OUTER JOIN TB_CRDN_CVLCPT CC ON (C.LINK_ID = CC.CVLCPT_LINK_ID AND C.CRDN_ID = CC.CRDN_ID)
+WHERE C.DEL_YN = 'N'
+<if test="by != null and by != '' and term != null">
+	<choose>
+		<when test="by == 'advancedOption1'">
+AND FN_GET_CODE_NM('FIM003', C.CRDN_INPT_SE_CD) LIKE CONCAT('%', #{term}, '%')
+		</when>
+		<otherwise>
+AND C.${by} LIKE CONCAT('%', #{term}, '%')
+		</otherwise>
+	</choose>
+</if>
+<if test="crdnId != null">AND C.CRDN_ID = #{crdnId}</if>
+<if test="taskSeCd != null">AND C.TASK_SE_CD = #{taskSeCd}</if>
+<if test="vhrno != null">AND C.VHRNO LIKE CONCAT('%', #{vhrno}, '%')</if>
+<if test="schDateFrom != null or schDateTo != null">
+	<if test="schDateOpt == 'crdnYmd'">
+		<if test="schDateFrom != null">AND C.CRDN_YMD <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND C.CRDN_YMD <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+	<if test="schDateOpt == 'regDt'">
+		<if test="schDateFrom != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ >= ]]> #{schDateFrom} </if>
+		<if test="schDateTo != null">AND SUBSTR(C.REG_DT,1,8) <![CDATA[ <= ]]> #{schDateTo} </if>
+	</if>
+</if>
+
+<include refid="utility.orderBy" />
+<include refid="utility.paging-suffix"/>
+</select>
+
 <select id="selectCrackdowns" parameterType="map" resultMap="crdnRow">
 	/* 단속자료 가져오기 (crdn06Mapper.selectCrackdowns) */
 	<include refid="selectCrackdown"/>

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

@@ -246,7 +246,7 @@ $(document).ready(function(){
 	thisPO.gridColumns = [
 		{ header: '감액일자', 			name: 'uknown1', 					width: 80, 	className: 'text-center' },
 		{ header: '감액사유', 			name: 'uknown2', 					width: 80, 	className: 'text-start' },
-		{ header: '접수위반일시', 		name: 'uknown3', 					width: 80, 	className: 'text-center' },
+		{ header: '접수(위반)일시', 	name: 'CRDN_YMD_TM', 				width: 80, 	className: 'text-center' },
 	    { header: '차량번호', 			name: 'VHRNO', 						width: 80, 	className: 'text-center' },
 	    { header: '감액금액', 			name: 'uknown4', 					width: 80, 	className: 'text-end' },
 	    { header: '감액잔액', 			name: 'uknown5', 					width: 80, 	className: 'text-end' },