diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index f2dc65de..43fdcaf7 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -283,6 +283,9 @@ public class ApmController { paginationInfo.setTotalRecordCount(cmmService.selectPgrCmmListCnt(cmmVO)); model.addAttribute("paginationInfo", paginationInfo); + + // reqOlCdPst 값이 있으면 과거사건 조회하지 않음 + cmmVO.setReqOlCdPst("2"); model.addAttribute("list", cmmService.selectPgrCmmList(cmmVO)); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java index 0f6edfd7..28a78bab 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/cmm/service/PgrCmmVO.java @@ -161,6 +161,8 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { private String atchFileId; //첨부파일 아이디 + private String reqOlCdPst; //과거사건목록 조회 여부 + public String getAdrAdmId() { return adrAdmId; } @@ -1144,6 +1146,14 @@ public class PgrCmmVO extends ComDefaultVO implements Serializable { public void setAtchFileId(String atchFileId) { this.atchFileId = atchFileId; } + + public String getReqOlCdPst() { + return reqOlCdPst; + } + + public void setReqOlCdPst(String reqOlCdPst) { + this.reqOlCdPst = reqOlCdPst; + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java index 626ead67..9801dca4 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrOff/web/AdjReqMgrOffLineController.java @@ -158,6 +158,8 @@ public class AdjReqMgrOffLineController { Map fileFr = new LinkedHashMap<>(); Map fileOr = new LinkedHashMap<>(); + System.out.println("=========================================================="); + if (!files.isEmpty()) { Iterator> it = files.entrySet().iterator(); @@ -201,6 +203,7 @@ public class AdjReqMgrOffLineController { } } + System.out.println("=========================================================="); //사용자 유니크 아이디 받아오기 adjReqMgrOffLineVO.setFrstRegisterId(userId); diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java index ae9b5ed6..d4727f29 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/AdjReqMgrPastService.java @@ -53,5 +53,7 @@ public interface AdjReqMgrPastService { Map selectAdjPastCloseTab2(AdjReqMgrPastVO adjReqMgrPastVO); List fileFindById(AdjReqMgrPastVO adjReqMgrPastVO); + + void adjReqMgrPastDeleteAjax(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 c7e7ec04..147c4b30 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastDAO.java @@ -196,5 +196,9 @@ public class AdjReqMgrPastDAO extends EgovAbstractDAO { return (List) list("adjReqMgrPastDAO.fileFindById", adjReqMgrPastVO); } + public void deleteById(AdjReqMgrPastVO adjReqMgrPastVO) { + delete("adjReqMgrPastDAO.deleteById", 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 92ff900b..7a59968e 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/service/impl/AdjReqMgrPastServiceImpl.java @@ -1077,6 +1077,12 @@ public class AdjReqMgrPastServiceImpl extends EgovAbstractServiceImpl implements // TODO Auto-generated method stub return adjReqMgrPastDAO.fileFindById(adjReqMgrPastVO); } + + + @Override + public void adjReqMgrPastDeleteAjax(AdjReqMgrPastVO adjReqMgrPastVO) { + adjReqMgrPastDAO.deleteById(adjReqMgrPastVO); + } diff --git a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java index e76f60f7..9799ab81 100644 --- a/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java +++ b/src/main/java/kcc/kccadr/adjReqMgrPast/web/AdjReqMgrPastController.java @@ -21,11 +21,13 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; import kcc.com.cmm.LoginVO; +import kcc.com.cmm.service.AdrInnorixFileVO; import kcc.com.cmm.service.EgovCmmUseService; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.EgovFileMngUtil; @@ -647,6 +649,27 @@ public class AdjReqMgrPastController { + @RequestMapping(value = {"/kccadr/adjReqMgOff/adjReqMgrPastDeleteAjax.do"}, method = RequestMethod.POST) + public ResponseEntity adjReqMgrPastDeleteAjax(@RequestBody AdjReqMgrPastVO adjReqMgrPastVO) throws Exception { + + + //로그인 권한정보 불러오기 + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + if(userId.equals("")) { + return ResponseEntity.ok(new RestResponse(HttpStatus.UNAUTHORIZED, "로그인이 필요합니다.", LocalDateTime.now())); + } + + try { + adjReqMgrPastService.adjReqMgrPastDeleteAjax(adjReqMgrPastVO); + } catch (Exception e) { + return ResponseEntity.ok(new RestResponse(HttpStatus.BAD_REQUEST, "삭제 중 오류가 발생하였습니다.", LocalDateTime.now())); + } + + return ResponseEntity.ok(new RestResponse(HttpStatus.OK, "정상적으로 삭제하였습니다.", LocalDateTime.now())); + + } private PgrCmmVO getDntInfo(PgrCmmVO cmmVO) throws Exception { diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml index 4604642c..98606ca6 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjPgrMgr/cmm/Cmm_SQL_Mysql.xml @@ -39,6 +39,9 @@ WHERE TO_CHAR ( M.SBMT_DE, 'YYYYMMDD' ) BETWEEN #searchStartDt# AND #searchEndDt# + + AND M.req_ol_cd !='2' + 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 249d0c89..51bdae64 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 @@ -1191,8 +1191,14 @@ WHERE ard.ADR_SEQ = #adrSeq# - + + DELETE FROM + ADR_MGR_MASTER + WHERE + adr_seq = #adrSeq# + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp index 40f836f0..c623852a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab1.jsp @@ -71,7 +71,7 @@ function fncDocRegPopup(){ var pop = document.pop ; - commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/docRegPop.do" , "1000", "550", "docRegPop", $("#pop")); + commonPopWindowopenForm("/kccadr/adjPgrMgr/apm/popup/docRegPop.do" , "750", "550", "docRegPop", $("#pop")); } function fnc_is_prcs_finish(){ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp index 572f75af..8028f5f9 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/docRegPop.jsp @@ -229,6 +229,10 @@ if(control.getUploadFiles().length > 0){ + var postObj = new Object(); + postObj.innoDirPath = $('#innoDirPath').val(); + control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 + control.upload(); // 업로드 시작 }else{ @@ -348,6 +352,7 @@
+ " /> 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 1e3da859..9a8ace7a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastFileRegist.jsp @@ -161,6 +161,10 @@ function fn_upload() { if(control.getUploadFiles().length > 0){ + var postObj = new Object(); + postObj.innoDirPath = $('#innoDirPath').val(); + control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 + control.upload(); // 업로드 시작 }else{ @@ -188,7 +192,7 @@ function fn_upload() { - + " />
diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastList.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastList.jsp index 032ed699..65683b37 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastList.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/adjReqMgrPastList.jsp @@ -31,6 +31,42 @@ $(document).ready(function(){ //해당 페이지에 대한 권한 체크 _admin_fn_check_authority("adjReqMgrPastList", "div.cont", "ALL"); + + $('.delBtn').click(function(){ + + console.log($(this).data('info')); + + + var resultData = { + "adrSeq": $(this).data('info') + } + + $.ajax({ + type: "POST", + url: "", + data: JSON.stringify(resultData), + dataType:'json', + async: false, + processData: false, + contentType: "application/json", + cache: false, + success: function (returnData) { + console.log('returnData : ', returnData); + if(returnData.status == "OK"){ + alert(returnData.data); + location.reload(); + }else{ + alert(returnData.data); + return false; + } + }, + error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); } + }); + + + }); + + }); //권한 체크 결과값으로 후속처리 @@ -214,21 +250,31 @@ function fn_goDetail(adrSeq){ 저작물종류 조정결과 작성여부 + 삭제 - ')"> +<%-- ')"> --%> + - - - + + + - - - - + + + + ')"> + + + + + ')"> + + + @@ -254,6 +300,9 @@ function fn_goDetail(adrSeq){ + + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp index 7cf2eea1..6e22031e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab0.jsp @@ -133,7 +133,21 @@ function goToEntDetailNotice(){ 종결상태 -

+ + + 조정취하 + + + 조정조서종결(성립) + + + 불성립종결(불성립 / 조정권고 불성립 / 직권조정 불성립) + + + 직권조정성립 + + +<%--

--%> diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp index 123b2667..2bd5bdbe 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrPast/tab/adjCloseTab1.jsp @@ -14,9 +14,73 @@ + + + - + @@ -37,55 +101,6 @@ function fn_egov_downFile(atchFileId, fileSn){ - - -
-
-
-

진행 안내-최대 10분까지 소요될 수 있습니다.

-
-
-
-

문서보기 파일 생성 중 입니다.

-

STEP1/3 - PDF파일로 변환 중 입니다.

-
- -
- 로딩중 -

정보를 불러오고 있습니다.

-

잠시만 기다려주십시오

-
-
-
-
- - - -
-
-
-

진행 안내-최대 10분까지 소요될 수 있습니다.

-
-
-
-

선택다운로드 파일 생성 중 입니다.

-

STEP1/1 - PDF파일로 변환 중 입니다.

-
- -
- 로딩중 -

정보를 불러오고 있습니다.

-

잠시만 기다려주십시오

-
-
-
-
- - " /> @@ -95,72 +110,18 @@ function fn_egov_downFile(atchFileId, fileSn){
- - - - + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - +
- - 일자 - - 등록인문건명상대방공개여부
일자유형문서
-

- - - - - - - - -

- 		-

${list.frstRegistPnttm}

- 		${list.adrDocTy}

- - 공개 - 비공개 - ${list.adrDocCn1} - - -

@@ -168,8 +129,8 @@ function fn_egov_downFile(atchFileId, fileSn){
- - + +
@@ -178,553 +139,5 @@ function fn_egov_downFile(atchFileId, fileSn){
- diff --git a/src/main/webapp/innorix/exam/upload_test_220916.jsp b/src/main/webapp/innorix/exam/upload_test_220916.jsp index b4daa909..dd898bf4 100644 --- a/src/main/webapp/innorix/exam/upload_test_220916.jsp +++ b/src/main/webapp/innorix/exam/upload_test_220916.jsp @@ -11,6 +11,8 @@ if (request.getMethod().equals("POST")) directory = "/usr/local/tomcat/file/sht/"; int maxPostSize = 2147482624; // bytes + + InnorixUpload uploader = new InnorixUpload(request, response, maxPostSize, directory); /* @@ -33,6 +35,26 @@ if (request.getMethod().equals("POST")) String _type = uploader.getParameter("type"); // 커스텀 정의 POST Param 1 String _part = uploader.getParameter("part"); // 커스텀 정의 POST Param 2 String _transferId = uploader.getParameter("_transferId"); // TransferId + String _innoFilePath = uploader.getParameter("innoDirPath"); // 커스텀 정의 POST Param 2 + + /* + + 현재 페이지를 호출하는 jsp에서 + " /> + 위 코드를 작성하고 + + control.upload() 전에 + + + var postObj = new Object(); + postObj.innoDirPath = $('#innoDirPath').val(); + control.setPostData(postObj); // 업로드시 함께 전달될 POST Param 추가 + + 위 코드를 넣어 줘야 함 + + */ + uploader.setDirectory(_innoFilePath); + String _run_retval = uploader.run(); // 개별파일 업로드 완료