새올요청자료 목록 조회 기능 추가

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

@@ -39,6 +39,8 @@ public class CrdnQuery extends CmmnQuery {
 	private String schRductYmdTo;
 	private String schCrdnYmdFrom;
 	private String schCrdnYmdTo;
+	private String schDmndYmdFrom;
+	private String schDmndYmdTo;
 
 	//from, to
 	private Integer schCrdnCntFrom;
@@ -211,6 +213,15 @@ public class CrdnQuery extends CmmnQuery {
 		return self();
 	}
 
+	public String getSchDmndYmdFrom() {
+		return ifEmpty(schDmndYmdFrom, () -> null);
+	}
+
+	public <T extends CrdnQuery> T setSchDmndYmdFrom(String schDmndYmdFrom) {
+		this.schDmndYmdFrom = schDmndYmdFrom;
+		return self();
+	}
+
 	public Integer getSchCrdnCntFrom() {
 		return ifEmpty(schCrdnCntFrom, () -> null);
 	}

src/main/java/cokr/xit/fims/cvlc/dao/SaCvlcptIndviDmndMapper.java

@@ -0,0 +1,23 @@
+package cokr.xit.fims.cvlc.dao;
+
+import java.util.List;
+
+import org.egovframe.rte.psl.dataaccess.mapper.Mapper;
+
+import cokr.xit.fims.crdn.CrdnQuery;
+import cokr.xit.foundation.component.AbstractMapper;
+import cokr.xit.foundation.data.DataObject;
+
+/**새올 민원 개별 요청 관리 DAO
+ * @author leebj
+ */
+@Mapper("saCvlcptIndviDmndMapper")
+public interface SaCvlcptIndviDmndMapper extends AbstractMapper {
+
+	/**지정한 조건에 따라 새올요청자료 목록을 조회한다.
+	 * @param crdnQuery 새올요청자료 목록 조회조건
+	 * @return 새올요청자료 목록
+	 */
+	List<DataObject> selectDmndDataList(CrdnQuery query);
+
+}

src/main/java/cokr/xit/fims/cvlc/service/CrdnCvlcptService.java

@@ -109,4 +109,10 @@ public interface CrdnCvlcptService {
 	 */
 	boolean saveWarningWordsInfo(CrdnCvlcpt crdnCvlcpt);
 
+	/** 새올 요청자료 목록을 조회한다.
+	 * @param query 조회 요청
+	 * @return 새올 요청자료 목록
+	 */
+	List<DataObject> getDmndDataList(CrdnQuery query);
+
 }

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptMainBean.java

@@ -20,6 +20,7 @@ import cokr.xit.fims.crdn.dao.GlobalStngMapper;
 import cokr.xit.fims.cvlc.CrdnCvlcpt;
 import cokr.xit.fims.cvlc.dao.AnswerWordsMapper;
 import cokr.xit.fims.cvlc.dao.CrdnCvlcptMapper;
+import cokr.xit.fims.cvlc.dao.SaCvlcptIndviDmndMapper;
 import cokr.xit.foundation.AbstractComponent;
 import cokr.xit.foundation.UserInfo;
 import cokr.xit.foundation.data.DataObject;
@@ -38,12 +39,21 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
 	@Resource(name = "codeMapper")
 	private CodeMapper codeMapper;
 
-	@Resource(name = "answerWordsMapper")
+	@Resource(name = "userMapper")
-	private AnswerWordsMapper answerWordsMapper;
+	private UserMapper userMapper;
+
+	@Resource(name="globalStngMapper")
+	protected GlobalStngMapper globalStngMapper;
 
 	@Resource(name = "crdnCvlcptMapper")
 	private CrdnCvlcptMapper crdnCvlcptMapper;
 
+	@Resource(name = "answerWordsMapper")
+	private AnswerWordsMapper answerWordsMapper;
+
+	@Resource(name = "saCvlcptIndviDmndMapper")
+	SaCvlcptIndviDmndMapper saCvlcptIndviDmndMapper;
+
 	@Resource(name = "crdnInfoMapper")
 	private CrdnInfoMapper crdnInfoMapper;
 
@@ -53,12 +63,6 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
 	@Resource(name = "crdnUpdtMapper")
 	private CrdnUpdtMapper crdnUpdtMapper;
 
-	@Resource(name = "userMapper")
-	private UserMapper userMapper;
-
-	@Resource(name="globalStngMapper")
-	protected GlobalStngMapper globalStngMapper;
-
 	/**민원 원본 정보를 조회한다.
 	 * @param query 조회 요청
 	 * @return 민원 원본 정보
@@ -317,4 +321,13 @@ public class CrdnCvlcptMainBean extends AbstractComponent {
 		}
 
 	}
+
+	/**새올 요청 자료 목록을 조회한다.
+	 * @param query 조회 요청
+	 * @return 새올 요청 자료 목록
+	 */
+	public List<DataObject> selectDmndDataList(CrdnQuery query) {
+		return saCvlcptIndviDmndMapper.selectDmndDataList(query);
+	}
+
 }

src/main/java/cokr/xit/fims/cvlc/service/bean/CrdnCvlcptServiceBean.java

@@ -727,4 +727,9 @@ public class CrdnCvlcptServiceBean extends AbstractServiceBean implements CrdnCv
 		return crdnCvlcptSubBean.saveWarningWordsInfo(crdnCvlcpt);
 	}
 
+	@Override
+	public List<DataObject> getDmndDataList(CrdnQuery query) {
+		return crdnCvlcptMainBean.selectDmndDataList(query);
+	}
+
 }

src/main/java/cokr/xit/fims/cvlc/web/Cvlc04Controller.java

@@ -9,6 +9,8 @@ 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.dao.GlobalStngMapper;
 import cokr.xit.fims.crdn.service.CrdnService;
 import cokr.xit.fims.cvlc.service.CrdnCvlcptService;
 
@@ -21,7 +23,8 @@ public class Cvlc04Controller extends ApplicationController {
 	public static final String CLASS_URL = "/cvlc/cvlc04";
 
 	public class METHOD_URL {
-
+		public static final String
+		getDmndDataList = "/010/list.do";
 	}
 
 	@Resource(name="crdnService")
@@ -30,6 +33,9 @@ public class Cvlc04Controller extends ApplicationController {
 	@Resource(name="crdnCvlcptService")
 	private CrdnCvlcptService crdnCvlcptService;
 
+	@Resource(name="globalStngMapper")
+	protected GlobalStngMapper globalStngMapper;
+
 	/** 민원 개별 등록 메인화면을 연다.
 	 * @return fims/cvlc/cvlc04010-main
 	 */
@@ -38,10 +44,25 @@ public class Cvlc04Controller extends ApplicationController {
 		mav.setViewName("fims/cvlc/cvlc04010-main");
 		mav.addObject("pageName", "cvlc04010-main");
 
-		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054");
+		Map<String, List<CommonCode>> commonCodes = getCodesOf("FIM054","FIM062","FIM063");
 		mav.addObject("FIM054List", commonCodes.get("FIM054"));
-
+		addCodes(commonCodes, mav, "FIM062");
+		addCodes(commonCodes, mav, "FIM063");
 		return mav;
 	}
 
+	/** 새올 요청자료 목록을 조회한다.
+	 * {@link CrdnCvlcService#getDmndDataList(CrdnQuery)} 참고
+	 * @param query 새올 요청자료 목록 조회 조건
+	 * @return jsonView
+	 */
+	public ModelAndView getDmndDataList(CrdnQuery query) {
+
+		query.setSggCd(globalStngMapper.selectSggCdForCurrentUser());
+
+		setFetchSize(query);
+		return setCollectionInfo(new ModelAndView("jsonView"), crdnCvlcptService.getDmndDataList(query),"");
+
+	}
+
 }

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

@@ -114,6 +114,18 @@ public class BpvController {
 
 	}
 
+	@Controller
+	@RequestMapping(name="전용차로과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL)
+	class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller {
+
+		@Override
+		@RequestMapping(name="전용차로과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList)
+		public ModelAndView getDmndDataList(CrdnQuery query) {
+			return super.getDmndDataList(query);
+		}
+
+	}
+
 	@Controller
 	@RequestMapping(name="전용차로과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL)
 	class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller {

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

@@ -116,6 +116,18 @@ public class DpvController {
 
 	}
 
+	@Controller
+	@RequestMapping(name="장애인과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL)
+	class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller {
+
+		@Override
+		@RequestMapping(name="장애인과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList)
+		public ModelAndView getDmndDataList(CrdnQuery query) {
+			return super.getDmndDataList(query);
+		}
+
+	}
+
 	@Controller
 	@RequestMapping(name="장애인과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL)
 	class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller {

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

@@ -114,6 +114,18 @@ public class EcaController {
 
 	}
 
+	@Controller
+	@RequestMapping(name="전기차과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL)
+	class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller {
+
+		@Override
+		@RequestMapping(name="전기차과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList)
+		public ModelAndView getDmndDataList(CrdnQuery query) {
+			return super.getDmndDataList(query);
+		}
+
+	}
+
 	@Controller
 	@RequestMapping(name="전기차과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL)
 	class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller {

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

@@ -119,6 +119,18 @@ public class PvsController {
 
 	}
 
+	@Controller
+	@RequestMapping(name="주정차과태료업무 민원개별등록 관리 업무", value=CLASS_URL+Cvlc04Controller.CLASS_URL)
+	class Cvlc04Controller extends cokr.xit.fims.cvlc.web.Cvlc04Controller {
+
+		@Override
+		@RequestMapping(name="주정차과태료업무 새올요청자료 목록 조회", value=METHOD_URL.getDmndDataList)
+		public ModelAndView getDmndDataList(CrdnQuery query) {
+			return super.getDmndDataList(query);
+		}
+
+	}
+
 	@Controller
 	@RequestMapping(name="주정차과태료업무 민원신고답변 문구 관리 업무", value=CLASS_URL+Cvlc05Controller.CLASS_URL)
 	class Cvlc05Controller extends cokr.xit.fims.cvlc.web.Cvlc05Controller {

src/main/resources/sql/mapper/fims/cvlc/saCvlcptIndviDmnd-mapper.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cokr.xit.fims.cvlc.dao.SaCvlcptIndviDmndMapper">
+
+<select id="selectDmndDataList" parameterType="cokr.xit.fims.crdn.CrdnQuery" resultType="dataobject">
+/* 새올요청자료 목록 조회(saCvlcptIndviDmndMapper.selectDmndDataList) */
+<include refid="utility.paging-prefix"/>
+SELECT SA.INDIV_ID
+     , SA.DMND_YMD
+     , SA.DMND_SE_CD
+     , SA.RCPT_YMD
+     , SA.PST_NO
+     , SA.CRDN_ID
+     , SA.STTS_CD
+     , SA.RSPNS_DT
+     , (SELECT USER_NM 
+          FROM TB_USER 
+         WHERE USER_ID = SA.RGTR
+       ) AS RGTR
+  FROM TB_SA_CVLCPT_INDIV_DMND SA
+ WHERE SA.SGG_CD = #{sggCd}
+<if test="schDmndYmdFrom != null or schDmndYmdTo != null">
+	<if test="schDmndYmdFrom != null">AND SA.DMND_YMD <![CDATA[ >= ]]> #{schDmndYmdFrom} </if>
+	<if test="schDmndYmdTo != null">AND SA.DMND_YMD <![CDATA[ <= ]]> #{schDmndYmdTo} </if>
+</if>
+<include refid="utility.sortBy" />
+<include refid="utility.paging-suffix"/>
+</select>
+
+</mapper>

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

@@ -33,12 +33,12 @@
 		                        <div class="col-6">
 		                        	<label class="form-label fw-bold form-search-title">요청일자</label>
 		                        	<span class="form-search-linebox">
-		                                <input type="text" id="schRequestYmdFrom--${pageName}" name="schRequestYmdFrom" 
+		                                <input type="text" id="schDmndYmdFrom--${pageName}" name="schDmndYmdFrom" 
 		                                	class="form-control form-date"
 		                                	data-fmt-type="day"   title="시작 날짜 선택" />
 		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
 		                                ~
-		                                <input type="text" id="schRequestYmdTo--${pageName}" name="schRequestYmdTo" 
+		                                <input type="text" id="schDmndYmdTo--${pageName}" name="schDmndYmdTo" 
 		                                	class="form-control form-date"
 		                                	data-fmt-type="day" title="종료 날짜 선택">
 		                                <button type="button" class="bx bx-sm bx-calendar bg-white"></button>
@@ -82,21 +82,21 @@
 											<th style="min-width: 80px;">접수일자</th>
 											<th style="min-width: 80px;">목록번호</th>
 											<th style="min-width: 80px;">요청자</th>
-											<th style="min-width: 80px;">등록일시</th>
+											<th style="min-width: 80px;">응답일시</th>
 											<th style="min-width: 80px;">상태</th>
 										</tr>
 									</thead>
 				                    <tbody id="requestTbody--${pageName}"></tbody>
 									<template id="requestRow--${pageName}">
-										<tr data-key="{REQUEST_ID}">
+										<tr data-key="{INDIV_ID}">
 											<td onclick="{onclick}" class="text-end">{ROW_NUM}</td>
-											<td onclick="{onclick}" class="text-center">{요청일시}</td>
+											<td onclick="{onclick}" class="text-center">{DMND_YMD}</td>
-				                    		<td onclick="{onclick}" class="text-center">{요청구분}</td>
+				                    		<td onclick="{onclick}" class="text-center">{DMND_SE_CD}</td>
-				                    		<td onclick="{onclick}" class="text-center">{접수일자}</td>
+				                    		<td onclick="{onclick}" class="text-center">{RCPT_YMD}</td>
-				                    		<td onclick="{onclick}" class="text-center">{목록번호}</td>
+				                    		<td onclick="{onclick}" class="text-center">{PST_NO}</td>
-				                    		<td onclick="{onclick}" class="text-center">{요청자}</td>
+				                    		<td onclick="{onclick}" class="text-center">{RGTR}</td>
-				                    		<td onclick="{onclick}" class="text-center">{등록일시}</td>
+				                    		<td onclick="{onclick}" class="text-center">{RSPNS_DT}</td>
-				                    		<td onclick="{onclick}" class="text-center">{상태}</td>
+				                    		<td onclick="{onclick}" class="text-center">{STTS_CD}</td>
 				                    	</tr>
 									</template>
 									<template id="requestNotFound--${pageName}">
@@ -159,7 +159,8 @@
 /**************************************************************************
  * Global Variable
  **************************************************************************/
-//var 상태 = new CommonCodes();
+ var FIM062 = new CommonCodes(${FIM062});
+ var FIM063 = new CommonCodes(${FIM063});
 pageObject["${pageName}"] = {};
 
 $(document).ready(function(){
@@ -178,11 +179,13 @@ $(document).ready(function(){
 	$P.requestControl = new DatasetControl({
 	    urls : { load : "", create : "", remove : "" },
 	    dataGetter : obj => obj["List"], appendData:true,
-	    keymapper : info => info ? info.REQUEST_ID : "", 
+	    keymapper : info => info ? info.INDIV_ID : "", 
 	    formats : {
-	    	//STTS 		: [],
+	    	DMND_SE_CD 	: FIM062,
-	    	REQUEST_DT 	: datetimeFormat,
+	    	STTS_CD 	: FIM063,
-	    	RCPT_YMD 	: dateFormat
+	    	DMND_YMD 	: dateFormat,
+	    	RCPT_YMD 	: dateFormat,
+	    	RSPNS_DT 	: datetimeFormat
 		}
 	});
 	$P.requestControl.defaultFetchSize = FETCH_XS;
@@ -233,7 +236,7 @@ $(document).ready(function(){
 					info = $P.requestControl.dataset.getDataset()[beforeCurrentIndex];
 				}
 				
-				$P.requestControl.dataset.setCurrent(info["REQUEST_ID"],true);
+				$P.requestControl.dataset.setCurrent(info["INDIV_ID"],true);
 				return;
 			}
 		}
@@ -242,7 +245,7 @@ $(document).ready(function(){
 		if(!item){
 			$P.clickRequestList("", true);
 		} else {
-			$P.clickRequestList($P.requestControl.getCurrent()["REQUEST_ID"], true);
+			$P.clickRequestList($P.requestControl.getCurrent()["INDIV_ID"], true);
 		}
 	}
 	
@@ -258,8 +261,8 @@ $(document).ready(function(){
 	 **************************************************************************/
 	$P.fnReset = () => {
     	
-		$('#schRequestYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
+		$('#schDmndYmdFrom--${pageName}').datepicker('setDate', DateUtil.getDateDay(-5475).date);
-	    $('#schRequestYmdTo--${pageName}').datepicker('setDate', new Date());
+	    $('#schDmndYmdTo--${pageName}').datepicker('setDate', new Date());
 		$P.requestControl.setData([]);
 	}
 
@@ -274,7 +277,7 @@ $(document).ready(function(){
 		$P.requestControl.untilPageNum = $P.requestControl.query.pageNum;
 		$P.requestControl.query.fetchSize = $P.requestControl.defaultFetchSize * $P.requestControl.query.pageNum;
 		$P.requestControl.beforeCurrent = {
-			key : $P.requestControl.getCurrent()["REQUEST_ID"],
+			key : $P.requestControl.getCurrent()["INDIV_ID"],
 			index : $P.requestControl.getCurrent()["ROW_NUM"] - 1
 		};
 	    $P.requestControl.load(1);
@@ -283,7 +286,8 @@ $(document).ready(function(){
 	$P.searchRequestList = () => {
 		
 		$P.requestControl.query = $P.getParams();
-	    // TODO : 요청자료 조회 서비스 // $P.requestControl.load(1);
+		
+	    $P.requestControl.load(1);
 	}
 
 	$P.scrollEnd = (obj) => {
@@ -330,7 +334,7 @@ $(document).ready(function(){
 		var notFound = [document.getElementById("requestNotFound--${pageName}").innerHTML];
 		var found = document.getElementById("requestRow--${pageName}").innerHTML;
 		var replacer = (str, dataItem) => str
-			.replace(/{onclick}/gi, "pageObject['${pageName}'].clickRequestList('" + dataItem.getValue("REQUEST_ID") + "');");
+			.replace(/{onclick}/gi, "pageObject['${pageName}'].clickRequestList('" + dataItem.getValue("INDIV_ID") + "');");
 		var trs = empty ? notFound : requestList.inStrings(found, replacer);
 		$("#requestTbody--${pageName}").html(trs.join());
 		
@@ -361,7 +365,7 @@ $(document).ready(function(){
 
 			var requestIds = ds.map(function(item){
 				if(item['STTS_CD'] == 'complete'){
-					return item["REQUEST_ID"];
+					return item["INDIV_ID"];
 				}
 			});
 			
@@ -372,7 +376,7 @@ $(document).ready(function(){
 				return;
 			}
 			
-			var curKey = cur["REQUEST_ID"];
+			var curKey = cur["INDIV_ID"];
 			$P.requestControl.select(curKey,true);
 		}