diff --git a/README.md b/README.md index 9006a835..67ab602c 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ * 기간 : ’22.06.15~‘22.12.12 * 전자조정시스템 URL -> 외부 : http://219.240.88.15:8081/ +> 외부 : http://119.193.215.98:8081/ > 내부 : http://192.168.176:8081 * 투입인력 diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java b/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java index 0ef7e2c5..83a009df 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/AdjstIncidentService.java @@ -28,4 +28,8 @@ public interface AdjstIncidentService { AdjstIncidentVO selectApmChgDateInfo(AdjstIncidentVO adjstIncidentVO) throws Exception; + + List selectAdjstIncidentPopList(AdjstIncidentVO adjstIncidentVO) throws Exception; + + int selectAdjstIncidentPopCount(AdjstIncidentVO adjstIncidentVO) throws Exception; } diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java index eee6b5c2..b766e6aa 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentDAO.java @@ -50,4 +50,11 @@ public class AdjstIncidentDAO extends EgovAbstractDAO { return (AdjstIncidentVO) select("adjstIncidentDAO.selectApmChgDateInfo", adjstIncidentVO); } + public int selectAdjstIncidentPopCount(AdjstIncidentVO adjstIncidentVO) throws Exception { + return (Integer) select("adjstIncidentDAO.selectAdjstIncidentPopCount", adjstIncidentVO); + } + + public List selectAdjstIncidentPopList(AdjstIncidentVO adjstIncidentVO) throws Exception { + return (List) list("adjstIncidentDAO.selectAdjstIncidentPopList", adjstIncidentVO); + } } diff --git a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java index 469aaa51..96ae89f7 100644 --- a/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java +++ b/src/main/java/kcc/kccadr/accdnt/ai/service/impl/AdjstIncidentServiceImpl.java @@ -63,4 +63,13 @@ public class AdjstIncidentServiceImpl implements AdjstIncidentService { return adjstIncidentDAO.selectApmChgDateInfo(adjstIncidentVO); } + @Override + public List selectAdjstIncidentPopList(AdjstIncidentVO adjstIncidentVO) throws Exception { + return adjstIncidentDAO.selectAdjstIncidentPopList(adjstIncidentVO); + } + + @Override + public int selectAdjstIncidentPopCount(AdjstIncidentVO adjstIncidentVO) throws Exception { + return adjstIncidentDAO.selectAdjstIncidentPopCount(adjstIncidentVO); + } } diff --git a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java index 5bae1125..1abdd6ce 100644 --- a/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java +++ b/src/main/java/kcc/kccadr/accdnt/ars/web/AdjstReqStatusController.java @@ -21,6 +21,7 @@ import org.springframework.web.servlet.ModelAndView; import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo; +import kcc.com.cmm.EgovMessageSource; import kcc.com.cmm.LoginVO; import kcc.com.cmm.service.EgovFileMngService; import kcc.com.cmm.service.FileVO; @@ -30,6 +31,7 @@ import kcc.kccadr.accdnt.ai.service.AdjstIncidentService; import kcc.kccadr.accdnt.ai.service.AdjstIncidentVO; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusService; import kcc.kccadr.accdnt.ars.service.AdjstReqStatusVO; +import kcc.kccadr.adjPgrMgr.cmm.service.PgrCmmService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoService; import kcc.kccadr.adjPgrMgr.dlvinfo.service.DlvinfoVO; import kcc.kccadr.adjPgrMgr.exmp.app.service.ExmpAppManageService; @@ -40,6 +42,7 @@ import kcc.kccadr.adjclsmgr.service.AdjClsMgrService; import kcc.kccadr.adjclsmgr.service.AdjClsMgrVO; import kcc.kccadr.advc.service.AdrHstryMgrService; import kcc.kccadr.advc.service.AdrHstryMgrVO; +import kcc.kccadr.advcRecord.service.AdrRecordReadingService; import kcc.kccadr.cmm.KccadrConstants; import kcc.kccadr.kccadrCom.service.KccadrCommonSearchVO; import kcc.kccadr.kccadrCom.service.KccadrCommonService; @@ -100,9 +103,15 @@ public class AdjstReqStatusController { @Resource(name = "adjRpplService") private AdjRpplService adjRpplService; + @Resource(name = "pgrCmmService") + private PgrCmmService cmmService; + @Resource(name = "adrRecordReadingService") + private AdrRecordReadingService adrRecordReadingService; - + // eGov 공통 메세지 + @Resource(name = "egovMessageSource") + EgovMessageSource egovMessageSource; /** * 조정진행 상태 및 관리 목록 화면 */ 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 383eb683..f83d600a 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -654,7 +654,7 @@ public class ApmController { // List fileList = fileService.selectFileInfs(fileVO); // model.addAttribute("fileList", fileList); // } - model.addAttribute("exmp", exmp); + model.addAttribute("exmpList", exmp); model.addAttribute("ccTy", adjstReqVO.getCcTy()); model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java index 35bcc084..d5151503 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/exmp/cmm/ExmpManageVO.java @@ -23,11 +23,13 @@ import java.util.List; * - 기일통지서 "10"; * - 기일조서 "20"; * - 조정권고안 "30"; - * - 조정조서 "40"; - * - 취하종결통보서 "50"; - * - 직권조정결정서 "60"; + * - 조정조서 "40"; + * - 취하종결통보서 "50"; + * - 직권조정결정서 "60"; * - 불성립종결통보서 "70"; - * - 확정증명원 "80"; + * - 확정증명원 "80"; + * + * * =========================================================== * DATE AUTHOR NOTE * ----------------------------------------------------------- * diff --git a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java index 09d3194f..3ef5f901 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrDAO.java @@ -82,4 +82,9 @@ public class AdjClsMgrDAO extends EgovAbstractDAO { public int docIssReqUpdate(AdjClsMgrVO adjClsMgrVO) throws Exception { return update("adjClsMgrDAO.docIssReqUpdate", adjClsMgrVO); } + + // 대국민 조정사건 기록열람 신청 + public int insertDocAdjReq(AdjClsMgrVO adjClsMgrVO) throws Exception { + return update("adjClsMgrDAO.insertDocAdjReq", adjClsMgrVO); + } } diff --git a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java index 1e677194..4077613f 100644 --- a/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java +++ b/src/main/java/kcc/kccadr/adjclsmgr/service/impl/AdjClsMgrServiceImpl.java @@ -94,5 +94,6 @@ public class AdjClsMgrServiceImpl implements AdjClsMgrService { public void docIssReqUpdate(AdjClsMgrVO adjClsMgrVO) throws Exception { adjClsMgrDAO.docIssReqUpdate(adjClsMgrVO); } + } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java index 48f05644..53977bcf 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingService.java @@ -19,19 +19,19 @@ public interface AdrRecordReadingService { ) throws Exception; //C - void insert(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + void insertRecordReading(AdrRecordReadingVO adrRecordReadingVO) throws Exception; //R AdrRecordReadingVO selectDetail(AdrRecordReadingVO adrHstryMgrVO) throws Exception; //U - int update(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + int updateRecordReadingStatus(AdrRecordReadingVO adrHstryMgrVO) throws Exception; //D - int delete(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + int deletedocIssReq(AdrRecordReadingVO adrHstryMgrVO) throws Exception; //L - List selectList(AdrRecordReadingVO adrHstryMgrVO) throws Exception; + List selectDocReqList(AdrRecordReadingVO adrRecordReadingVO) throws Exception; //L page List selectPagingList(AdrRecordReadingVO adrHstryMgrVO) throws Exception; diff --git a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java index 3747f611..ad69b3fa 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/AdrRecordReadingVO.java @@ -18,14 +18,22 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { private String prcsnPnttm; //처리일시 private String frstRegistPnttm; //등록일시 private String frstRegisterId; //등록자 - private String lastUpdtPnttm; //수정일시 private String lastUpdusrId; //수정자 - + private String recordReadingFlag; + private String recordReadingHstrySeq; //기록열람이력 일련번호 private String cn; //내용-승인번호, 결재 정보 등등 + private String searchFrstRegisterId; + private String searchDocReqCd; + + + private String resPonDentNm; + private String adrNo; + private String appliCantNm; + public String getRecordReadingSeq() { @@ -112,4 +120,40 @@ public class AdrRecordReadingVO extends ComDefaultVO implements Serializable { public void setCn(String cn) { this.cn = cn; } + public String getSearchFrstRegisterId() { + return searchFrstRegisterId; + } + public void setSearchFrstRegisterId(String searchFrstRegisterId) { + this.searchFrstRegisterId = searchFrstRegisterId; + } + public String getResPonDentNm() { + return resPonDentNm; + } + public void setResPonDentNm(String resPonDentNm) { + this.resPonDentNm = resPonDentNm; + } + public String getAdrNo() { + return adrNo; + } + public void setAdrNo(String adrNo) { + this.adrNo = adrNo; + } + public String getSearchDocReqCd() { + return searchDocReqCd; + } + public void setSearchDocReqCd(String searchDocReqCd) { + this.searchDocReqCd = searchDocReqCd; + } + public String getAppliCantNm() { + return appliCantNm; + } + public void setAppliCantNm(String appliCantNm) { + this.appliCantNm = appliCantNm; + } + public String getRecordReadingFlag() { + return recordReadingFlag; + } + public void setRecordReadingFlag(String recordReadingFlag) { + this.recordReadingFlag = recordReadingFlag; + } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java index 466f82f3..804ba25f 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingDAO.java @@ -136,8 +136,8 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { * @param AdjstChangeDateVO * @throws Exception */ - public void insert(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - insert("AdrHstryMgrDAO.insert", adrHstryMgrVO); + public void insertRecordReading(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + insert("AdrRecordReadingDAO.insertRecordReading", adrRecordReadingVO); } /** @@ -156,23 +156,23 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { * @return * @throws Exception */ - public int update(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - return update("AdrRecordReadingDAO.update", adrHstryMgrVO); + public int updateRecordReadingStatus(AdrRecordReadingVO adrHstryMgrVO) throws Exception { + return update("AdrRecordReadingDAO.updateRecordReadingStatus", adrHstryMgrVO); } /** * 삭제 - D - * @param addrAgencyVO + * @param adrRecordReadingVO * @return * @throws Exception */ - public int delete(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - return delete("AdrRecordReadingDAO.delete", adrHstryMgrVO); + public int deletedocIssReq(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + return delete("AdrRecordReadingDAO.deletedocIssReq", adrRecordReadingVO); } //L - public List selectList(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - List tlist = (List) list("AdrHstryMgrDAO.selectList", adrHstryMgrVO); + public List selectDocReqList(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + List tlist = (List) list("AdrRecordReadingDAO.selectDocReqList", adrRecordReadingVO); return tlist; } @@ -183,7 +183,7 @@ public class AdrRecordReadingDAO extends EgovAbstractDAO { * @throws Exception */ public List selectPagingList(AdrRecordReadingVO adrHstryMgrVO) throws Exception { - List tlist = (List) list("AdrHstryMgrDAO.selectPagingList", adrHstryMgrVO); + List tlist = (List) list("AdrRecordReadingDAO.selectPagingList", adrHstryMgrVO); return tlist; } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java index 71e6bf04..ab604c51 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingHstryServiceImpl.java @@ -14,8 +14,8 @@ import kcc.kccadr.advcRecord.service.AdrRecordReadingVO; public class AdrRecordReadingHstryServiceImpl implements AdrRecordReadingHstryService { //이력 - @Resource(name="adrRecordReadingDAO") - private AdrRecordReadingDAO adrRecordReadingDAO; + @Resource(name="adrRecordReadingHstryDAO") + private AdrRecordReadingHstryDAO adrRecordReadingHstryDAO; //이력 상세 //@Resource(name="adrRecordReadingDetailDAO") @@ -48,7 +48,7 @@ public class AdrRecordReadingHstryServiceImpl implements AdrRecordReadingHstrySe , String p_tableName , String p_updateQuery ) throws Exception { - return adrRecordReadingDAO.insert4Func( + return adrRecordReadingHstryDAO.insert4Func( p_adrSeq , p_menuNm , p_menuId @@ -64,33 +64,33 @@ public class AdrRecordReadingHstryServiceImpl implements AdrRecordReadingHstrySe //C public void insert(AdrRecordReadingVO adrRecordReadingVO) throws Exception { - adrRecordReadingDAO.insert(adrRecordReadingVO); + adrRecordReadingHstryDAO.insert(adrRecordReadingVO); } //R public AdrRecordReadingVO selectDetail(AdrRecordReadingVO adrRecordReadingVO) throws Exception { - return adrRecordReadingDAO.selectDetail(adrRecordReadingVO); + return adrRecordReadingHstryDAO.selectDetail(adrRecordReadingVO); } //U public int update(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.update(adrRecordReadingVO); + return adrRecordReadingHstryDAO.update(adrRecordReadingVO); } //D public int delete(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.delete(adrRecordReadingVO); + return adrRecordReadingHstryDAO.delete(adrRecordReadingVO); } //List public List selectList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.selectList(adrRecordReadingVO); + return adrRecordReadingHstryDAO.selectList(adrRecordReadingVO); } //paging List public List selectPagingList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.selectPagingList(adrRecordReadingVO); + return adrRecordReadingHstryDAO.selectPagingList(adrRecordReadingVO); } } diff --git a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java index 9e893fa5..a87b67dc 100644 --- a/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java +++ b/src/main/java/kcc/kccadr/advcRecord/service/impl/AdrRecordReadingServiceImpl.java @@ -7,16 +7,19 @@ import javax.annotation.Resource; import org.springframework.stereotype.Service; +import egovframework.rte.fdl.idgnr.EgovIdGnrService; import kcc.kccadr.advcRecord.service.AdrRecordReadingService; import kcc.kccadr.advcRecord.service.AdrRecordReadingVO; @Service("adrRecordReadingService") public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { - //이력 @Resource(name="adrRecordReadingDAO") private AdrRecordReadingDAO adrRecordReadingDAO; + @Resource(name="recordReadingGnrService") + private EgovIdGnrService idgenService; + //이력 상세 //@Resource(name="adrRecordReadingDetailDAO") //private adrRecordReadingDetailDAO adrRecordReadingDetailDAO; @@ -63,8 +66,12 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { } //C - public void insert(AdrRecordReadingVO adrRecordReadingVO) throws Exception { - adrRecordReadingDAO.insert(adrRecordReadingVO); + public void insertRecordReading(AdrRecordReadingVO adrRecordReadingVO) throws Exception { + + String recordReadingSeq = idgenService.getNextStringId(); // 고유 번호 생성 + adrRecordReadingVO.setRecordReadingSeq(recordReadingSeq); + + adrRecordReadingDAO.insertRecordReading(adrRecordReadingVO); } //R @@ -73,19 +80,19 @@ public class AdrRecordReadingServiceImpl implements AdrRecordReadingService { } //U - public int update(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ + public int updateRecordReadingStatus(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.update(adrRecordReadingVO); + return adrRecordReadingDAO.updateRecordReadingStatus(adrRecordReadingVO); } //D - public int delete(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.delete(adrRecordReadingVO); + public int deletedocIssReq(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ + return adrRecordReadingDAO.deletedocIssReq(adrRecordReadingVO); } //List - public List selectList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ - return adrRecordReadingDAO.selectList(adrRecordReadingVO); + public List selectDocReqList(AdrRecordReadingVO adrRecordReadingVO) throws Exception{ + return adrRecordReadingDAO.selectDocReqList(adrRecordReadingVO); } //paging List diff --git a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java index 9958c023..90a69f15 100644 --- a/src/main/java/kcc/kccadr/cmm/KccadrConstants.java +++ b/src/main/java/kcc/kccadr/cmm/KccadrConstants.java @@ -294,6 +294,20 @@ public class KccadrConstants { public static final String ADR_RPPL_USR_TY2 = "02"; // 법인 public static final String ADR_RPPL_USR_TY3 = "03"; // 개인사업자 - + //ADR_RCD_RDNG : 조정사건기록열람 + //신청인구분 + public static final String ADR_RCD_RDNG_REQ_TY_01 = "01"; // 신청자 + public static final String ADR_RCD_RDNG_REQ_TY_02 = "02"; // 이용자 + //당사자여부 + public static final String ADR_RCD_RDNG_MYSF_IS_10 = "10"; // 신청인 + public static final String ADR_RCD_RDNG_MYSF_IS_30 = "30"; // 신청대리인 + //서류구분 + public static final String ADR_RCD_RDNG_DOCU_TY_10 = "10"; // 기일조서 + public static final String ADR_RCD_RDNG_DOCU_TY_20 = "20"; // 조정조서 + //처리상태 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_10 = "10"; // 신청완료 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_20 = "20"; // 결제완료 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_30 = "30"; // 출력완료 + public static final String ADR_RCD_RDNG_PRCSN_STAT_CD_90 = "90"; // 삭제 } \ No newline at end of file diff --git a/src/main/resources/egovframework/egovProps/globals.properties b/src/main/resources/egovframework/egovProps/globals.properties index 3ffcb1e0..bbe6d8ac 100644 --- a/src/main/resources/egovframework/egovProps/globals.properties +++ b/src/main/resources/egovframework/egovProps/globals.properties @@ -66,7 +66,7 @@ Globals.sso.ssoUri=https://devsso.copyright.or.kr/oauth2/token.do Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 Globals.sso.scope=http://sso.copyright.or.kr -Globals.sso.returnSiteUrl=http://219.240.88.15:8091/web/user/login/ssoUsrModifyResult.do +Globals.sso.returnSiteUrl=http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 @@ -146,10 +146,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##pdf\ubcc0\ud658 \ud30c\uc77c\uc758 \uc6f9\uc811\uadfc\uc744 \uc704\ud55c path - 4.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc744 \uc6f9\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud55c \uacbd\ub85c - \ubcc0\ud658\ub41c PDF \ud30c\uc77c\uc744 \uc6f9\ud398\uc774\uc9c0\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud574 \uc124\uc815\ub41c \uacbd\ub85c \uc815\ubcf4 #Globals.pdf.webpath=/pdf/out/ -##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://219.240.88.15:8091)============================================================= +##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://119.193.215.98:8091)============================================================= ## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. Globals.pdf.serverUrl=192.168.0.200 -Globals.pdf.apiUrl=http://219.240.88.15:8091 +Globals.pdf.apiUrl=http://119.193.215.98:8091 Globals.pdf.filepath.out=file:/z:/out/ Globals.pdf.makepath=/usr/local/tomcat/file/sht/ Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ diff --git a/src/main/resources/egovframework/egovProps/globals_dev.properties b/src/main/resources/egovframework/egovProps/globals_dev.properties index 8c683283..7611375c 100644 --- a/src/main/resources/egovframework/egovProps/globals_dev.properties +++ b/src/main/resources/egovframework/egovProps/globals_dev.properties @@ -33,7 +33,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -#Globals.Url=jdbc:cubrid:219.240.88.15:30000:cubdb:::?charset=utf8 +#Globals.Url=jdbc:cubrid:119.193.215.98:30000:cubdb:::?charset=utf8 Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adr_advc:::?charset=utf8 #\uc2e4\uc11c\ubc84 #Globals.Url=jdbc:cubrid:192.168.39.14:30000:kcc_adrs4:::?charset=utf8 @@ -66,7 +66,7 @@ Globals.sso.ssoUri=https://devsso.copyright.or.kr/oauth2/token.do Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 Globals.sso.scope=http://sso.copyright.or.kr -Globals.sso.returnSiteUrl=http://219.240.88.15:8091/web/user/login/ssoUsrModifyResult.do +Globals.sso.returnSiteUrl=http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 @@ -146,10 +146,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##pdf\ubcc0\ud658 \ud30c\uc77c\uc758 \uc6f9\uc811\uadfc\uc744 \uc704\ud55c path - 4.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc744 \uc6f9\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud55c \uacbd\ub85c - \ubcc0\ud658\ub41c PDF \ud30c\uc77c\uc744 \uc6f9\ud398\uc774\uc9c0\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud574 \uc124\uc815\ub41c \uacbd\ub85c \uc815\ubcf4 #Globals.pdf.webpath=/pdf/out/ -##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://219.240.88.15:8091)============================================================= +##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://119.193.215.98:8091)============================================================= ## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. Globals.pdf.serverUrl=192.168.0.200 -Globals.pdf.apiUrl=http://219.240.88.15:8091 +Globals.pdf.apiUrl=http://119.193.215.98:8091 Globals.pdf.filepath.out=file:/z:/out/ Globals.pdf.makepath=/usr/local/tomcat/file/sht/ Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ diff --git a/src/main/resources/egovframework/egovProps/globals_local.properties b/src/main/resources/egovframework/egovProps/globals_local.properties index 92cee3ba..d66b853b 100644 --- a/src/main/resources/egovframework/egovProps/globals_local.properties +++ b/src/main/resources/egovframework/egovProps/globals_local.properties @@ -65,7 +65,7 @@ Globals.sso.ssoUri=https://devsso.copyright.or.kr/oauth2/token.do Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 Globals.sso.scope=http://sso.copyright.or.kr -Globals.sso.returnSiteUrl=http://219.240.88.15:8091/web/user/login/ssoUsrModifyResult.do +Globals.sso.returnSiteUrl=http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 @@ -146,10 +146,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##pdf\ubcc0\ud658 \ud30c\uc77c\uc758 \uc6f9\uc811\uadfc\uc744 \uc704\ud55c path - 4.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc744 \uc6f9\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud55c \uacbd\ub85c - \ubcc0\ud658\ub41c PDF \ud30c\uc77c\uc744 \uc6f9\ud398\uc774\uc9c0\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud574 \uc124\uc815\ub41c \uacbd\ub85c \uc815\ubcf4 #Globals.pdf.webpath=/pdf/out/ -##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://219.240.88.15:8091)============================================================= +##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://119.193.215.98:8091)============================================================= ## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. Globals.pdf.serverUrl=192.168.0.200 -Globals.pdf.apiUrl=http://219.240.88.15:8091 +Globals.pdf.apiUrl=http://119.193.215.98:8091 Globals.pdf.filepath.out=file:/z:/out/ Globals.pdf.makepath=/usr/local/tomcat/file/sht/ Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ diff --git a/src/main/resources/egovframework/egovProps/globals_svr.properties b/src/main/resources/egovframework/egovProps/globals_svr.properties index f289b79c..cbdeb079 100644 --- a/src/main/resources/egovframework/egovProps/globals_svr.properties +++ b/src/main/resources/egovframework/egovProps/globals_svr.properties @@ -33,7 +33,7 @@ Globals.DriverClassName=cubrid.jdbc.driver.CUBRIDDriver #\ud074\ub77c\uc6b0\ub4dc \uc11c\ubc84 #Globals.Url=jdbc:cubrid:158.247.225.133:30000:kcc_adrs4:::?charset=utf8 #\uac1c\ubc1c\uc11c\ubc84 -#Globals.Url=jdbc:cubrid:219.240.88.15:30000:kcc_adrs4:::?charset=utf8 +#Globals.Url=jdbc:cubrid:119.193.215.98:30000:kcc_adrs4:::?charset=utf8 #\uc2e4\uc11c\ubc84 Globals.Url=jdbc:cubrid:192.168.39.146:30000:kcc_adrs:::?charset=utf8 @@ -65,7 +65,7 @@ Globals.KccMail.title=[\ud55c\uad6d\uc800\uc791\uad8c\uc704\uc6d0\ud68c] \ubd84\ #Globals.sso.clientId=30354835c3684ff79e7fb1bfd3a768f6 #Globals.sso.clientSecret=1ueil5ee05wr0t1gjy1ppt212 #Globals.sso.scope=http://sso.copyright.or.kr -#Globals.sso.returnSiteUrl=http://219.240.88.15:8091/web/user/login/ssoUsrModifyResult.do +#Globals.sso.returnSiteUrl=http://119.193.215.98:8091/web/user/login/ssoUsrModifyResult.do #Globals.sso.returnSiteCode=SITE011 #\uc2e4\uc11c\ubc84 Globals.sso.ssoUri=https://sso.copyright.or.kr/oauth2/token.do @@ -144,10 +144,10 @@ Globals.iniPg.signKey=UE9idGFmcGJEdU1HR04zbEdLdUM0QT09 ##pdf\ubcc0\ud658 \ud30c\uc77c\uc758 \uc6f9\uc811\uadfc\uc744 \uc704\ud55c path - 4.pdf\ubcc0\ud658\uc758 \uacb0\uacfc\ubb3c\uc744 \uc6f9\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud55c \uacbd\ub85c - \ubcc0\ud658\ub41c PDF \ud30c\uc77c\uc744 \uc6f9\ud398\uc774\uc9c0\uc5d0\uc11c \uc811\uadfc\ud558\uae30 \uc704\ud574 \uc124\uc815\ub41c \uacbd\ub85c \uc815\ubcf4 #Globals.pdf.webpath=/pdf/out/ -##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://219.240.88.15:8091)============================================================= +##=====================================2.\uac1c\ubc1c\uc11c\ubc84(http://119.193.215.98:8091)============================================================= ## \uc0c1\uc138 \ud56d\ubaa9\uc5d0 \ub300\ud55c \uc124\uba85\uc740 \uc0c1\ub2e8\uc5d0\uc11c \ud655\uc778 \ubc14\ub78d\ub2c8\ub2e4. #Globals.pdf.serverUrl=192.168.0.200 -#Globals.pdf.apiUrl=http://219.240.88.15:8091 +#Globals.pdf.apiUrl=http://119.193.215.98:8091 #Globals.pdf.filepath.out=file:/z:/out/ #Globals.pdf.makepath=/usr/local/tomcat/file/sht/ #Globals.pdf.makepath.out=/usr/local/tomcat/file/sht/out/ diff --git a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml index abf8f962..f0234d51 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/accdnt/ai/AdjustIncident_SQL_Mysql.xml @@ -878,5 +878,85 @@ ORDER BY A.adrSn DESC LIMIT 1 + + + + diff --git a/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml index 2fa1e52d..8aaa0351 100644 --- a/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/kccadr/adjClsMgr/AdjClsMgr_SQL_Mysql.xml @@ -3,7 +3,7 @@ - + - + UPDATE SET - - last_updt_pnttm = NOW() - , last_updusr_id = #lastUpdusrId# - - - , adr_seq = adrSeq - - - , req_ty = reqTy - - - , myself_is = myselfIs - - - , docu_ty = docuTy - - - , auth_qntty= authQntty - - - , prcsn_stat_cd = prcsnStatCd + last_updt_pnttm = NOW() + , last_updusr_id = #lastUpdusrId# + + , prcsn_stat_cd = #prcsnStatCd# , prcsn_pnttm = NOW() - - - WHERE record_reading_seq = #recordReadingSeq# - - - - + DELETE FROM WHERE @@ -155,38 +129,83 @@ - SELECT COUNT(1) OVER() AS totCnt , + ,( SELECT + CASE + WHEN COUNT(*) 1 + THEN GROUP_CONCAT(RPPL_NM SEPARATOR ',') + ELSE RPPL_NM + || '외' + || (COUNT(*)-1) + || '명' + END RPPL_NMS + FROM ADR_RPPL S1 + WHERE 1 =1 + AND S1.adr_seq = a.adr_seq + AND S1.RPPL_TY = '20' + GROUP BY S1.adr_seq + ORDER BY S1.FRST_REGIST_PNTTM + ) + AS resPonDentNm + , ( SELECT RPPL_NM + FROM ADR_RPPL s1 + WHERE 1=1 + AND S1.adr_seq = a.adr_seq + AND s1.RPPL_TY = '10' + ) + AS appliCantNm + ,c.adr_no AS adrNo FROM a + INNER JOIN + ( SELECT ADR_SEQ, + RPPL_ID, + RPPL_NM, + rppl_ty + FROM ADR_RPPL + WHERE RPPL_ID = #searchFrstRegisterId# + GROUP BY ADR_SEQ, + RPPL_ID + ) + AP + ON A.ADR_SEQ = AP.ADR_SEQ + LEFT OUTER JOIN + ADR_MGR_MASTER c + ON + a.adr_seq = c.adr_seq WHERE 1=1 - - - AND a.record_reading_seq = #recordReadingSeq# - - - - - $selectPagingListQuery$ + + + c.ADR_NO LIKE CONCAT('%' , #searchKeyword#, '%') + - - - - ORDER BY 1=1 - - - , a.record_reading_seq desc - - - , $orderByQuery$ - + + + TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') = ]]> REPLACE(#searchStartDt#, '-' , '') + + + TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') REPLACE(#searchEndDt#, '-' , '') + + + + A.prcsn_stat_cd LIKE CONCAT('%' , #searchSelStatus#, '%') + + + ORDER BY 1=1 + + ,$searchSortCnd$ + + + $searchSortOrd$ + LIMIT #recordCountPerPage# OFFSET #firstIndex# diff --git a/src/main/webapp/MagicLine4Web/ML4Web/js/ML4Web_Config.js b/src/main/webapp/MagicLine4Web/ML4Web/js/ML4Web_Config.js index 7199d2a3..7c985e2c 100644 --- a/src/main/webapp/MagicLine4Web/ML4Web/js/ML4Web_Config.js +++ b/src/main/webapp/MagicLine4Web/ML4Web/js/ML4Web_Config.js @@ -56,13 +56,13 @@ var ConfigObject = { /*[변경].2.*/ //AuthKey : "", //AuthKey : "jSpmzL8nBug+z17TmjRYKAYavmHzplcGPibnrJrmAjO/H2eyqfm+3bGYKlz+3aAU", - //localhost|219.240.88.15|222.231.43.189|127.0.0.1|129.168.0.34 + //localhost|119.193.215.98|222.231.43.189|127.0.0.1|129.168.0.34 //AuthKey : "woySwgzcPcGliP25pt1eqMa5bLpUqMY1frnGnnA9akN+dYxCYetZ59mfHll8TKth6gMj+Gt5rtiv+xiyqwsqwXC7TneH2M1SHJcfRBqxchU=", //192.168.0.34 //AuthKey : "2xfdu0++fipvVCD8jTexEqm0p33c7quI4mom067JtgY=", - //192.168.0.34|219.240.88.15 + //192.168.0.34|119.193.215.98 //AuthKey : "+lsJr4qtnpP0YnqbTMcghbWhewMLZzFjWa7IJl9gGERaNWZX46zRbT/rHDTuvs+B", - //localhost|192.168.0.34|219.240.88.15|adr.copyright.or.kr + //localhost|192.168.0.34|119.193.215.98|adr.copyright.or.kr AuthKey : "fkW02kPqdYlbct2wEBWRBXC+q8c7U0+IZVfIlJnVAVQDZ4xYDQ2MApu4vY9BUYzZ5Zm5IRxCLgDMhTbDyfxCl/1zKM/b2LaUcCuO5IuI8E8=", diff --git a/src/main/webapp/WEB-INF/decorators.xml b/src/main/webapp/WEB-INF/decorators.xml index f6df4ec0..3d17cd83 100644 --- a/src/main/webapp/WEB-INF/decorators.xml +++ b/src/main/webapp/WEB-INF/decorators.xml @@ -118,6 +118,8 @@ /kcc/mail/intSendMailForm.do /web/adminContent.do /web/kccadr/adjst/adjstReqRegistTutorial.do + /web/kccadr/accdnt/ai/docIssReqRegistPop.do + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp index bf83da35..4e39547a 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/arm/armDetail.jsp @@ -243,7 +243,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp index 63af5ba5..74e8a9d4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/cfrm/cfrmDetail.jsp @@ -223,7 +223,8 @@ $(document).ready(function() { success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp index 620d3963..dd688445 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/chd/chdDetail.jsp @@ -299,7 +299,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp index fac56eb3..ccdb9d43 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/crt/crtDetail.jsp @@ -231,7 +231,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + location.reload(false); + /* fncGoList("insert"); */ } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp index 9d99bae0..15e4dca5 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/dntDetail.jsp @@ -320,7 +320,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp index b6899166..a4ed63d7 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/dnt/report/adrAppSlctReport.jsp @@ -51,14 +51,14 @@ oz.sendToActionScript("toolbar.addmemo", "false"); //메모저장 아이콘 oz.sendToActionScript("toolbar.savedm", "false"); //데이터 저장 아이콘 oz.sendToActionScript("toolbar.etc", "false"); //다른메뉴 아이콘 + oz.sendToActionScript("viewer.pagedisplay" , "singlepagecontinuous"); //스크롤 추가_220921_이준호 //오즈리포트 pdf 다운로드 시 폰트포함 옵션 추가_220727_이준호 oz.sendToActionScript("font.fontnames", "font1"); // 폰트에 대한 이름 임의로 설정 // oz.sendToActionScript("font.font1.nae", "%uB9D1%uC740%20%uACE0%uB515"); // 맑은 고딕 유니코드 문자 oz.sendToActionScript("font.font1.name", "NanumGothic"); // 맑은 고딕 유니코드 문자 -// oz.sendToActionScript("font.font1.url", "/usr/font/NanumGothic.ttf "); // 폰트 경로 기입, url이나 시스템 절대경로 지정 가능 - oz.sendToActionScript("font.font1.url", "/home/oz80/fontTestDir/NanumGothic.ttf"); // 폰트 경로 기입, url이나 시스템 절대경로 지정 가능 + oz.sendToActionScript("font.font1.url", "${ozFontPath}${ozFont}"); // 폰트 경로 기입, url이나 시스템 절대경로 지정 가능 oz.sendToActionScript("pdf.fontembedding", "true"); oz.sendToActionScript("pdf.fontembedding_subset", "true"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp index 1a4996c5..59c59f39 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/drtDetail.jsp @@ -353,7 +353,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp index 34241de7..f30599c6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drtCtr/drtCtrDetail.jsp @@ -301,7 +301,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp index dac47ea1..584dfe9b 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetail.jsp @@ -238,7 +238,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp index a91762e4..bf840f42 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/ent/entDetailNotice.jsp @@ -111,8 +111,6 @@ } function fncPrint() { - alert('프린트'); - var form = document.listForm; window.open('',"entReport"); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp index f06e0db9..bee7bdd1 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/oad/oadDetail.jsp @@ -250,7 +250,8 @@ success : function(returnData, status) { if (returnData.result == 'success') { alert("송달정보 전달 URL 등록이 완료되었습니다."); - fncGoList("insert"); + /* fncGoList("insert"); */ + location.reload(false); } else { alert(returnData.message); } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp index f9f34f66..2cc4b070 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ai/adjstIncidentList.jsp @@ -29,6 +29,13 @@ - - -" /> -" /> -" /> + + +" /> +" /> +" /> + -
-

서류 발급 요청 목록

+

조정사건 기록열람 신청목록

- - <%--
- - - - -
--%>
- + + + -
- - -
- -
- - -
-
- +
- ~
- +
-
- + +
+
+ +
@@ -176,15 +142,10 @@ + - - + - <%-- - - - - --%> @@ -192,71 +153,60 @@ 신청일자 조정번호 신청인 + 피신청인 신청서류 처리상태 - - - + + - - + + 신청일자 -

+

조정번호 - +

신청인 - + + + + 피신청인 + 신청서류 -

+

처리상태 -

+

+ + + + + + + + + + 열람완료 + 발급완료 + + +

- <%-- - 신청 대상자 -

- --%> - <%-- - 신청내용 -

- --%> - <%-- - 신청유형 -

- --%> - <%-- - 종결상태 -

- - - - -

- --%> - <%-- - 진행상태 -

- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp index 0957b615..e1e66062 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegist.jsp @@ -16,11 +16,84 @@ 조정사건 상세 - <%-- --%> @@ -40,6 +113,9 @@ + +
+
@@ -55,7 +131,7 @@

대리인 정보

--> - + @@ -68,7 +144,7 @@ @@ -79,8 +155,8 @@ @@ -91,8 +167,8 @@ @@ -103,8 +179,19 @@ + + + + @@ -114,9 +201,7 @@

발급부수

@@ -125,10 +210,12 @@
- + +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp index 2bcd35b2..e3a910cf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/docIssReqRegistPop.jsp @@ -15,29 +15,43 @@ @@ -48,54 +62,74 @@ $(document).ready(function(){ " />
-
-

종결 조정사건 목록

-
-
-
- - - -
+
+

종결 조정사건 목록

+
+
+
+ + + +
-
조정사건 기록열람 신청 정보 : 조정번호, 신청인 구분, 조정당사자 여부, 서류종류, 발급부수등의 정보제공조정사건 기록열람 신청 정보 : 조정번호, 신청인 구분, 조정당사자 여부, 서류종류, 열람발급여부 발급부수등의 정보제공
- +
- - + +
- - + +
- - + +
+
+

필수입력 항목*

+

열람/발급여부

+ 		+
+ +
- + 통
- - - - - - - - - - - - - - - - - - - - - - - -
피신청인 이전작성 목록 : 피신청인, 저작물 종류, 선택등의 정보제공
피신청인조정번호선택
-

김길동

- 		-

2021조050

-
- - <%--
- -
--%> - -
- -
-
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
피신청인 이전작성 목록 : 피신청인, 저작물 종류, 선택등의 정보제공
번호조정번호신청인피신청인선택
+ + + + + + + + + + + + + + +
+ +
+ +
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/report/adrDocReqReport.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/report/adrDocReqReport.jsp new file mode 100644 index 00000000..291bb028 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/ars/tab/report/adrDocReqReport.jsp @@ -0,0 +1,82 @@ +<%-- + 대국민 사용자 + Class Name : adrAppSlctReport.jsp + Description : 조정기일통지서 오즈리포팅 전송 화면(오즈리포트 정보 전송) + Modification Information + + 수정일 수정자 수정내용 + ------- -------- --------------------------- + 2021.11.09 우영두 최초생성 + + author : 우영두 + since : 2021.11.09 + +--%> +<%-- 공통 JS 함수 정의 : /jsp/web/com/webLayout.jsp --%> +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%> + + + + + + + + + + + + + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp index a354a5cf..0d0416cf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/popup/adjstReqOpenExamplePop.jsp @@ -35,7 +35,7 @@ $(document).ready(function(){ // 신청취지 텍스트에 추가 function addText(obj){ - $('#reqCn1').text($('#reqCn1').text()+obj.text); + $('#reqCn1').text($('#reqCn1').text().trim()+' '+obj.text); } diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp index 0e64dbd1..374fc0f8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/kccadrCom/kccadrConstantsJsp.jsp @@ -1223,6 +1223,25 @@ var AdjstReq = { , "adjstHostoryPop" ); }, + historyAdjstPopEndList : function(paramObj){ + if(paramObj == undefined || paramObj == ''){ + paramObj = { + pageIndex : 1, + searchKeyword : "", + searchCondition : "", + pageUnit : 5 + }; + } + // 이전신청데이터 팝업 호출.. + commonPopLayeropen( + "/web/kccadr/accdnt/ai/docIssReqRegistPop.do" + , 700 + , 600 + , paramObj + , "N" + , "adjstIncRegistPopEndList" + ); + }, opinionsAdjstPopList : function(paramObj){ if(paramObj == undefined || paramObj == ''){ paramObj = { @@ -1293,7 +1312,6 @@ var AdjstReq = { else if (exmpCd == '02') { uri = "adjstReqOpenExamplePop2.do"; - } commonPopLayeropen( @@ -1306,8 +1324,25 @@ var AdjstReq = { ); }, openExpExamplePop : function(exmpCd){ + /* + - 01 : 신청취지 + - 02 : 신청원인 + - 04 : 답변서 + - 05 : 사건진행도움말 + */ + var uri = ''; + if(exmpCd == '01') + { + uri = "adjstReqOpenExamplePop.do"; + } + else if (exmpCd == '02') + { + uri = "adjstReqOpenExamplePop2.do"; + } + commonPopLayeropen( - "/web/kccadr/adjstExp/popup/adjstReqOpenExamplePop.do" + "/web/kccadr/adjst/popup/"+uri +// "/web/kccadr/adjstExp/popup/"+uri , 1100 , 600 , {ccTy : $("#ccTy").val(), exmpCd : exmpCd} diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index 2e5451f6..769d0d33 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -18,7 +18,7 @@ var url = window.location.href; document.location.href="/web/main/mainPage.do"; // if(url == "http://adr.copyright.or.kr/web/main/mainPage.do" // || url == "https://adr.copyright.or.kr/web/main/mainPage.do" -// || url == "http://219.240.88.15:8091/" +// || url == "http://119.193.215.98:8091/" // || url == "http://localhost:8081/" // ){ // document.location.href="/web/main/mainPage.do";