diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/service/FileVO.java index 1080008d..4a56e375 100644 --- 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) { diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index 72f47cef..ae9b5ed6 100644 --- 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 selectAdjPastCloseTab0(AdjReqMgrPastVO adjReqMgrPastVO); Map selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO); + + List fileFindById(AdjReqMgrPastVO adjReqMgrPastVO); } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java index ed793dd9..c7e7ec04 100644 --- 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) list("adjReqMgrPastDAO.selectHstryInfo", adjReqMgrPastVO); } + public List fileFindById(AdjReqMgrPastVO adjReqMgrPastVO) { + return (List) list("adjReqMgrPastDAO.fileFindById", adjReqMgrPastVO); + } + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java index 51f80855..92ff900b 100644 --- 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 fileFindById(AdjReqMgrPastVO adjReqMgrPastVO) { + // TODO Auto-generated method stub + return adjReqMgrPastDAO.fileFindById(adjReqMgrPastVO); + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index 265587e2..5129e918 100644 --- 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 rpplList = new ArrayList(); + try { + List 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"; } diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjReqMgrPast/AdjReqMgrPast_SQL_Mysql.xml index 5e0c946c..99ae4b3c 100644 --- 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' + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp index 67c9d9b9..a3cdb58e 100644 --- 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', ''); -// $('#goPageForm').submit(); -// }); - -// $('#prevPage').on('click', function(){ -// $('#goPageForm').attr('action', ''); -// $('#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 = ""; - 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: "", + url: "", data: JSON.stringify(resultData), dataType:'json', async: false, @@ -143,129 +129,117 @@ window.onload = function() { 사건관련문서 등록 -
-
- -
-

사건관련문서 등록

-
    -
    • -
  • -

    오프라인 조정관리

    -
    • -
  • -

    과거사건등록

    -
    • -
  • 사건관련문서 등록
    • -
-
- +
+

사건관련문서 등록

+
    +
    • +
  • +

    오프라인 조정관리

    +
    • +
  • +

    과거사건등록

    +
    • +
  • 사건관련문서 등록
    • +
+
+ -

파일 등록

-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
일자유형문서삭제
-
- -
- - -
-
- 		- - -

-
-
- - -
-
- - -
-
- -
-
- -
- - -

신청 정보

-
+

파일 등록

+
+
- - + + + + - - - - - - - + + + + - - - - + + +
일자 - - 문건명일자유형문서삭제
-

2022-09-30

- 		조정신청서 -
-

2022-09-30

+
+ +
+ + +
+
- test.txt  + +

+
- + + +
+
+ + +
+
+ +
+
+
- - - + + +

신청 정보

+
+ + + + + + + + + + + + + + + + + + + + + + +
일자유형문건명
+

+ 		+ + + +

+ +
+
+