feat:과거사건등록 -> 문서관리 리스트 완료

2022-11-03 13:59:57 +09:00 · 2022-11-03 13:59:57 +09:00 · 9c7138660c
commit 9c7138660c
parent 00330f6448
7 changed files with 151 additions and 144 deletions
--- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java
+++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java
@ -7,6 +7,7 @@ import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
@SuppressWarnings("serial")
 public class FileVO extends PgrCmmVO implements Serializable {
    private String adrSeq;
+    private String adrDocTy; /* 파일유형 */
    private String atchFileId; /* 첨부파일ID */
    private String fileSn; /* 파일순번 */
    private String fileStreCours; /* 파일저장경로 */
@ -31,7 +32,13 @@ public class FileVO extends PgrCmmVO implements Serializable {
    public void setAdrSeq(String adrSeq) {
        this.adrSeq = adrSeq;
    }
-    public String getAtchFileId() {
+    public String getAdrDocTy() {
+		return adrDocTy;
+	}
+	public void setAdrDocTy(String adrDocTy) {
+		this.adrDocTy = adrDocTy;
+	}
+	public String getAtchFileId() {
        return atchFileId;
    }
    public void setAtchFileId(String atchFileId) {
--- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java
+++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java
@ -6,6 +6,7 @@ import java.util.Map;
 import org.springframework.http.ResponseEntity;

 import egovframework.rte.fdl.cmmn.exception.FdlException;
+import kcc.kccadr.adjPgrMgr.apm.service.FileVO;
 import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
 import kcc.kccadr.cmm.RestResponse;

@ -50,5 +51,7 @@ public interface AdjReqMgrPastService {
 	Map<String, Object> selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO);

 	Map<String, Object> selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO);
+
+	List<FileVO> fileFindById(AdjReqMgrPastVO adjReqMgrPastVO);
 	
 }
--- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java
+++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java
@ -6,6 +6,7 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Repository;

 import egovframework.rte.psl.dataaccess.EgovAbstractDAO;
+import kcc.kccadr.adjPgrMgr.apm.service.FileVO;
 import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
 import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO;
@ -191,5 +192,9 @@ public class AdjReqMgrPastDAO  extends EgovAbstractDAO {
 		return (List<AdjReqMgrPastVO>) list("adjReqMgrPastDAO.selectHstryInfo", adjReqMgrPastVO);
 	}

+	public List<FileVO> fileFindById(AdjReqMgrPastVO adjReqMgrPastVO) {
+		return (List<FileVO>) list("adjReqMgrPastDAO.fileFindById", adjReqMgrPastVO);
+	}
+
 	
 }
--- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java
+++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java
@ -28,6 +28,7 @@ import kcc.com.cmm.util.DateUtil;
 import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.user.service.CheckAdrProcessUtil;
 import kcc.kccadr.accdnt.adr.service.AdjstDeputyReqVO;
+import kcc.kccadr.adjPgrMgr.apm.service.FileVO;
 import kcc.kccadr.adjReqMgrOff.service.AdjReqMgrOffLineVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjAssMgrPastVO;
 import kcc.kccadr.adjReqMgrPast.service.AdjReqMgrPastService;
@ -1069,6 +1070,13 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements
 		}
 		return reRpplNmTemp;
 	}
+
+
+	@Override
+	public List<FileVO> fileFindById(AdjReqMgrPastVO adjReqMgrPastVO) {
+		// TODO Auto-generated method stub
+		return adjReqMgrPastDAO.fileFindById(adjReqMgrPastVO);
+	}
 	
 	

--- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
+++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java
@ -31,6 +31,7 @@ import kcc.com.cmm.service.EgovFileMngUtil;
 import kcc.com.cmm.util.StringUtil;
 import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.kccadr.adjPgrMgr.apm.service.ApmService;
+import kcc.kccadr.adjPgrMgr.apm.service.FileVO;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService;
 import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmVO;
 import kcc.kccadr.adjPgrMgr.drt.service.AssVO;
@ -264,10 +265,10 @@ public class AdjReqMgrPastController {
 	}
 	
 	/** 
-	 * @methodName	: adjReqMgrPastProgRegist 
+	 * @methodName	: adjReqMgrPastFileRegist 
 	 * @author		: 이호영
-	 * @date		: 2022.09.15 
-	 * @description	: 사건진행정보 목록
+	 * @date		: 2022.11.03 
+	 * @description	: 과거사건등록 controll 
 	 * @param adjReqMgrPastVO
 	 * @param model
 	 * @return
@ -276,24 +277,18 @@ public class AdjReqMgrPastController {
 	@RequestMapping("/kccadr/adjReqMgOff/popup/adjReqMgrPastFileRegist.do")
 	public String adjReqMgrPastFileRegist(@ModelAttribute("adjReqMgrPastVO") AdjReqMgrPastVO adjReqMgrPastVO, ModelMap model) throws Exception {

-		logger.info(" ++ [{}]", adjReqMgrPastVO.getAdrSeq());
-		//TODO 테스트로 인한 seq 코딩
-//		adjReqMgrPastVO.setAdrSeq("ADR_0000000000002920");
-
-		model.addAttribute("adjReqMgrPastVO", adjReqMgrPastVO);
-//		PgrCmmVO cmmVO = new PgrCmmVO();
-//		cmmVO.setAdrSeq(adjReqMgrPastVO.getAdrSeq());
-		// 조정사건일반
-//		PgrCmmVO info = cmmService.selectPgrCmm(cmmVO);
-//		model.addAttribute("info", info);
-//		model.addAttribute("adjReqMgrPastListVO", adjReqMgrPastService.selectAdrPrtclMgrPastList(adjReqMgrPastVO));
-
-		List<AdjReqMgrPastVO> rpplList = new ArrayList<AdjReqMgrPastVO>();
+		try {
+			List<FileVO> fileListVO = adjReqMgrPastService.fileFindById(adjReqMgrPastVO);
+			logger.info("fileListVO :: [{}]", fileListVO.get(0).getFrstRegistPnttm());
+			
+			model.addAttribute("fileListVO", fileListVO);
+			
+		} catch (Exception e) {
+			e.printStackTrace();
+			// TODO: handle exception
+		}
+//		rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO);
 		
-		rpplList = adjReqMgrPastService.selectAdrRpplPastList(adjReqMgrPastVO);
-		
-		
-		model.addAttribute("rpplList", rpplList);
 		
 		return "kccadr/adjReqMgrPast/adjReqMgrPastFileRegist";
 	}
--- a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml
@ -1169,6 +1169,21 @@
 		AND ADR_SN = '1'
 	
 	</select>
+	
+	<select id="adjReqMgrPastDAO.fileFindById" parameterClass="AdjReqPastVO" resultClass="kcc.kccadr.adjPgrMgr.apm.service.FileVO">
+	
+		SELECT 
+			lfd.ATCH_FILE_ID as atchFileId
+			, lfd.FILE_SN as fileSn
+			, ard.ADR_DOC_TY as adrDocTy
+			, lfd.ORIGNL_FILE_NM  as orignlFileNm
+			,TO_CHAR(ard.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm 
+		FROM ADR_RPPL_DOC ard
+		LEFT JOIN LETTNFILEDETAIL lfd
+		ON ard.ATCH_FILE_ID = lfd.ATCH_FILE_ID 
+		WHERE ard.ADR_SEQ = #adrSeq#
+		
+	</select>

 	
 	
--- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp
+++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp
@ -35,33 +35,19 @@

 $(document).ready(function(){
 	
-// 	$('#goPage').on('click', function(){
-// 		$('#goPageForm').attr('action', '<c:url value="/kccadr/adjReqMgOff/adjReqMgrPastRecordRegist.do" />');
-// 		$('#goPageForm').submit();
-// 	});
-	
-// 	$('#prevPage').on('click', function(){
-// 		$('#goPageForm').attr('action', '<c:url value="/kccadr/adjReqMgOff/adjReqMgrPastProgRegist.do" />');
-// 		$('#goPageForm').submit();
-// 	});
-$('#allUploadBtn').click(function(){
+	$('#allUploadBtn').click(function(){

-	console.log($('.uploadBtn').length)
+		console.log($('.uploadBtn').length)
+		
+		$('.uploadBtn').leanth();
+		$('.uploadBtn').click();
 	
-	$('.uploadBtn').leanth();
-	$('.uploadBtn').click();
-	
-})
+	})


 });


-function fn_goListPage(){
-    var pageForm = document.pageForm ;
-    pageForm.action = "<c:url value='/kccadr/adjReqMgOff/adjReqMgrPastList.do'/>";
-    pageForm.submit();
-}

 function fn_insertFile(data){
 	
@ -70,11 +56,11 @@ function fn_insertFile(data){
 					, "adrDocTy": $('#adrDocTy').val()
 					, "frstRegistPnttm": $('#frstRegistPnttm').val()
 					, "innorixFileListVO": data
-					}
+	}

 	$.ajax({
 		type: "POST",
-        url: "<c:url value='/kccadr/common/insertInnorixFileAjax.do' />",
+		url: "<c:url value='/kccadr/common/insertInnorixFileAjax.do' />",
 		data: JSON.stringify(resultData),
 		dataType:'json',
 		async: false,
@ -143,129 +129,117 @@ window.onload = function() {
 <title>사건관련문서 등록</title>
 </head>
 <body>
-
 	<input type="hidden" id="adrSeq" name="adrSeq" value="${adjReqMgrPastVO.adrSeq }">
 	<div class="cont_wrap">
-		<div class="box">
-
 			<!-- cont_tit -->
-			<div class="cont_tit">
-				<h2>사건관련문서 등록</h2>
-				<ul class="cont_nav">
-					<li class="home"><a href="/"><i></i></a></li>
-					<li>
-						<p>오프라인 조정관리</p>
-					</li>
-					<li>
-						<p>과거사건등록</p>
-					</li>
-					<li><span class="cur_nav">사건관련문서 등록</span></li>
-				</ul>
-			</div>
-			<!-- //cont_tit -->
+		<div class="cont_tit">
+			<h2>사건관련문서 등록</h2>
+			<ul class="cont_nav">
+				<li class="home"><a href="/"><i></i></a></li>
+				<li>
+					<p>오프라인 조정관리</p>
+				</li>
+				<li>
+					<p>과거사건등록</p>
+				</li>
+				<li><span class="cur_nav">사건관련문서 등록</span></li>
+			</ul>
+		</div>
+		<!-- //cont_tit -->

-			<p class="tb_tit">파일 등록</p>
-			<div class="cont">
-				<div class="list tbType01">
-					<table>
-						<colgroup>
-							<col style="width:15%">
-							<col style="width:20%">
-							<col style="width:auto">
-							<col style="width:10%">
-						</colgroup>
-						<thead>
-							<tr>
-								<th>일자</th>
-								<th>유형</th>
-								<th>문서</th>
-								<th>삭제</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>
-									<div class="sel_date">
-										<input type="text" class="frstRegistPnttm inp" title="검색시작일" id="frstRegistPnttm" name="searchStartDt" value="${adjReqMgrOffLineVO.searchStartDt}" data-datecontrol="true">
-										<div class="calendar_in" id="calendarName_frstRegistPnttm" style="z-index: 9;">
-											<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('frstRegistPnttm-lry','',this)" class="btn_cal"></button>
-											<div id="frstRegistPnttm-lry" class="calendarPop" style="display: none;">
-												<iframe id="frstRegistPnttm-ifrm" name="frstRegistPnttm-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
-											</div>
-										</div>
-									</div>
-								</td>
-								<td>
-									<kc:select codeId="CC044" id="adrDocTy" name="adrDocTy" />
-								</td>
-								<td>
-									<div id="fileControl"></div><br/>
-								</td>
-								<td><button type="button" class="btnType04 btn_del reqPerDel">삭제</button></td>
-							</tr>
-							
-						</tbody>
-					</table>
-				</div>
-				<!-- //list -->
-				<!-- 하단 버튼 -->
-				<div class="btn_wrap btn_layout01">
-					<div class="area_left" style="width: 500px;">
-						<button class="btnType06" type="button" onclick="control.openFileDialog();">멀티 파일 추가</button>
-						<button class="btnType06" type="button" onclick="control.openFileDialogSingle();">단일 파일 추가</button>
-					</div>
-					<div class="area_right">
-						<button class="btnType06" type="button" onclick="control.upload();">등록</button>
-					</div>
-				</div>
-				<!-- //하단 버튼 -->
-			</div>
-
-			<!-- list_상세 -->
-			<p class="tb_tit">신청 정보</p>
-			<div class="tbType03">
+		<p class="tb_tit">파일 등록</p>
+		<div class="cont">
+			<div class="list tbType01">
 				<table>
 					<colgroup>
-						<col style="width: 15%;">
-						<col style="width: auto;">
+						<col style="width:15%">
+						<col style="width:20%">
+						<col style="width:auto">
+						<col style="width:10%">
 					</colgroup>
 					<thead>
 						<tr>
-<!-- 							<th> -->
-								<!-- 								<input type="checkbox" name="checkAll" id="checkAll" onclick="fncCheckAll(this, 'ckAdrList')"> -->
-<!-- 								<input type="checkbox" name="chkAll" value="All" title="모두체크"> -->
-<!-- 								<label for="checkAll"></label> -->
-<!-- 							</th> -->
-							<th>일자
-<!-- 								<button type="button" class="btn_sort">▲</button> -->
-							</th>
-							<th>문건명</th>
+							<th>일자</th>
+							<th>유형</th>
+							<th>문서</th>
+							<th>삭제</th>
 						</tr>
 					</thead>
 					<tbody>
 						<tr>
 							<td>
-								<p>2022-09-30</p>
-							</td>
-							<td><a href="#" onclick="fn_adjstReq_preview('ADR_0000000000003230'); return false;">조정신청서</a>
-							</td>
-						</tr>
-						<tr>
-							<td>
-								<p>2022-09-30</p>
+								<div class="sel_date">
+									<input type="text" class="frstRegistPnttm inp" title="검색시작일" id="frstRegistPnttm" name="searchStartDt" value="${adjReqMgrOffLineVO.searchStartDt}" data-datecontrol="true">
+									<div class="calendar_in" id="calendarName_frstRegistPnttm" style="z-index: 9;">
+										<button type="button" value="달력 팝업 열기" onclick="return calendarOpen('frstRegistPnttm-lry','',this)" class="btn_cal"></button>
+										<div id="frstRegistPnttm-lry" class="calendarPop" style="display: none;">
+											<iframe id="frstRegistPnttm-ifrm" name="frstRegistPnttm-ifrm" class="calendar-frame" src="/kccadrPb/adm/calendar.html" title=" 달력 팝업" frameborder="0" scrolling="no"></iframe>
+										</div>
+									</div>
+								</div>
 							</td>
 							<td>
-								<a href="/cmm/fms/FileDown.do?atchFileId=FILE_000000000015660&amp;&amp;fileSn=0" title="첨부파일 다운로드" targe="_blank"> test.txt&nbsp; </a>
+								<kc:select codeId="CC044" id="adrDocTy" name="adrDocTy" />
 							</td>
+							<td>
+								<div id="fileControl"></div><br/>
+							</td>
+							<td><button type="button" class="btnType04 btn_del reqPerDel">삭제</button></td>
 						</tr>
+						
 					</tbody>
 				</table>
 			</div>
-			<!-- //list_상세 -->
+			<!-- //list -->
+			<!-- 하단 버튼 -->
+			<div class="btn_wrap btn_layout01">
+				<div class="area_left" style="width: 500px;">
+					<button class="btnType06" type="button" onclick="control.openFileDialog();">멀티 파일 추가</button>
+					<button class="btnType06" type="button" onclick="control.openFileDialogSingle();">단일 파일 추가</button>
+				</div>
+				<div class="area_right">
+					<button class="btnType06" type="button" onclick="control.upload();">등록</button>
+				</div>
+			</div>
+			<!-- //하단 버튼 -->
 		</div>
-		
-		
-		
+
+		<!-- list_상세 -->
+		<p class="tb_tit">신청 정보</p>
+		<div class="tbType03">
+			<table>
+				<colgroup>
+					<col style="width: 15%;">
+					<col style="width: 15%;">
+					<col style="width: auto;">
+				</colgroup>
+				<thead>
+					<tr>
+						<th>일자</th>
+						<th>유형</th>
+						<th>문건명</th>
+					</tr>
+				</thead>
+				<tbody>
+					<c:forEach var="list" items="${fileListVO }">
+						<tr>
+							<td>
+								<p><c:out value="${list.frstRegistPnttm }" /></p>
+							</td>
+							<td>
+								<kc:code codeId="CC044" code="${list.adrDocTy }"/>
+							</td>
+							<td>
+								<a href="<c:url value='/cmm/fms/FileDown.do?atchFileId=${list.atchFileId}&&fileSn=${list.fileSn}'/>" title="첨부파일 다운로드" targe="_blank">
+									<p><c:out value="${list.orignlFileNm }" /></p>
+								</a>
+							</td>
+						</tr>
+					</c:forEach>
+				</tbody>
+			</table>
+		</div>
+		<!-- //list_상세 -->
 	</div>
 	<!-- //cont -->
 <!-- //cont -->