diff --git a/.classpath b/.classpath index 36064bc1..a50c6c85 100644 --- a/.classpath +++ b/.classpath @@ -12,7 +12,11 @@ - + + + + + diff --git a/src/main/java/com/urpsys/basefront/controller/MainController.java b/src/main/java/com/urpsys/basefront/controller/MainController.java index 722536ee..527a7423 100644 --- a/src/main/java/com/urpsys/basefront/controller/MainController.java +++ b/src/main/java/com/urpsys/basefront/controller/MainController.java @@ -126,6 +126,10 @@ public class MainController { strErrorMsg = "아이디 혹은 비밀번호을 확인해주세요. 5회 로그인 오류인경우 아이디가 잠금처리가 됩니다."; } + else if(srError[0].equals("-4")) + { + strErrorMsg = "사용자 정보는 존재하나 권한정보가 존재하지 않습니다. 시스템 관리자에게 연락해 주세요."; + } else { strErrorMsg = ""; diff --git a/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java b/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java index 1597dc11..83c47d60 100644 --- a/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java +++ b/src/main/java/com/urpsys/itmsfront/rem/controller/ResourceManagerController.java @@ -1047,6 +1047,17 @@ public class ResourceManagerController model.addAttribute("resourceList" , resourceList); model.addAttribute("paginationInfo" , paginationInfo); + + // 2025.09.22 나혁제 추가 --------------------// + // 자산분류코드 추출 Start -------------------- // + // RestApi Call Start --------------------------------- + returnMap = restApiCallUtil.RestApiCall(bodyMap, "/rem/getCate1List.do"); + // RestApi Call End --------------------------------- + + List> resultCate1 = (List>)returnMap.get("resultCate1"); + model.addAttribute("resultCate1", resultCate1); // 자산대분류 + // 자산분류코드 추출 End -------------------- // + log.info("<<<<<<<<<<<<<<< /rem/SelectResourcePopup.do >>>>>>>>>>>>>>>"); diff --git a/src/main/java/com/urpsys/itmsfront/rem/domain/ReportVo.java b/src/main/java/com/urpsys/itmsfront/rem/domain/ReportVo.java index 16eaf96b..60a9851b 100644 --- a/src/main/java/com/urpsys/itmsfront/rem/domain/ReportVo.java +++ b/src/main/java/com/urpsys/itmsfront/rem/domain/ReportVo.java @@ -29,6 +29,7 @@ public class ReportVo private String txReportForm ; private String inTaskUser ; private String vcTaskUser ; + private String inSortSn ; // 2025.09.22 나혁제 정렬순서 추가 public String getInReportForm() { return inReportForm; @@ -78,6 +79,12 @@ public class ReportVo public void setVcTaskUser(String vcTaskUser) { this.vcTaskUser = vcTaskUser; } + public String getInSortSn() { + return inSortSn; + } + public void setInSortSn(String inSortSn) { + this.inSortSn = inSortSn; + } diff --git a/src/main/resources/validator/urp/ItsmValidator.xml b/src/main/resources/validator/urp/ItsmValidator.xml index c1d09823..349e7a7e 100644 --- a/src/main/resources/validator/urp/ItsmValidator.xml +++ b/src/main/resources/validator/urp/ItsmValidator.xml @@ -37,13 +37,18 @@ - + + - + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ReportDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ReportDetail.jsp index a3a14872..2203afb0 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ReportDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ReportDetail.jsp @@ -371,8 +371,17 @@ + <%-- 2025.09.22 나혁제 정렬순서 추가 --%> + <%-- 보고서 설명 + --%> + + 보고서설명 + + 정렬순서 + + diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ReportInsert.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ReportInsert.jsp index 663c21da..01d9a09e 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ReportInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ReportInsert.jsp @@ -314,9 +314,9 @@ 서비스 등록 - + - + @@ -332,10 +332,10 @@ 보고서명 - + 작업자 - + @@ -346,8 +346,15 @@ + <%-- 2025.09.22 나혁제 정렬순서 추가 --%> + <%-- 보고서 설명 + --%> + 보고서설명 + + 정렬순서 + @@ -358,10 +365,8 @@ --> - - diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ReportList.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ReportList.jsp index 6771ad80..e6068727 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ReportList.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ReportList.jsp @@ -133,6 +133,7 @@ + @@ -142,6 +143,7 @@ 보고서 유형 보고서 양식명 작업자명 + 정렬순위 설명 @@ -161,6 +163,7 @@ ${report.vcFormName} + diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp index b61e460b..2517535d 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceDetail.jsp @@ -733,7 +733,7 @@ - 점고보고서 등록 + 점검보고서 등록 diff --git a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceListPopup.jsp b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceListPopup.jsp index cfd55772..e58dc406 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceListPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/rem/ResourceListPopup.jsp @@ -31,6 +31,7 @@ 자산관리 + - + - + + @@ -119,7 +120,7 @@ window.showModalDialog("" , arrParam - ,"dialogWidth:900px;dialogHeight:750px;resizable:yes;center:yes"); + ,"dialogWidth:950px;dialogHeight:850px;resizable:yes;center:yes"); } //---------------------------------------- @@ -633,7 +634,7 @@ ${resultReport.vcReportId} 서비스 - + selected > ${result.label} @@ -651,7 +652,7 @@ ${incidentId} 작업분류 - + @@ -692,12 +693,12 @@ 제목 - - + + 보고서양식 - - + + ${result.vcFormName} diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorInsert.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorInsert.jsp index 310a9ba2..87310006 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorInsert.jsp @@ -130,7 +130,7 @@ window.showModalDialog("" , arrParam - ,"dialogWidth:900px;dialogHeight:750px;resizable:yes;center:yes"); + ,"dialogWidth:950px;dialogHeight:850px;resizable:yes;center:yes"); } //---------------------------------------- @@ -634,7 +634,7 @@ 서비스 - + ${result.label} @@ -689,12 +689,12 @@ 제목 - - + + 보고서양식 - - + + ${result.vcFormName} diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorUpdate.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorUpdate.jsp index fbf037e4..a6e7f260 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportErrorUpdate.jsp @@ -119,7 +119,7 @@ window.showModalDialog("" , arrParam - ,"dialogWidth:900px;dialogHeight:750px;resizable:yes;center:yes"); + ,"dialogWidth:950px;dialogHeight:850px;resizable:yes;center:yes"); } //---------------------------------------- @@ -627,7 +627,7 @@ ${resultReport.vcReportId} 서비스 - + selected > ${result.label} @@ -682,12 +682,12 @@ 제목 - - + + 보고서양식 - - + + ${result.vcFormName} diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueInsert.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueInsert.jsp index 05a3bb05..e2ad385f 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueInsert.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueInsert.jsp @@ -130,7 +130,7 @@ window.showModalDialog("" , arrParam - ,"dialogWidth:900px;dialogHeight:750px;resizable:yes;center:yes"); + ,"dialogWidth:950px;dialogHeight:850px;resizable:yes;center:yes"); } //---------------------------------------- @@ -636,7 +636,7 @@ 서비스 - + ${result.label} @@ -691,12 +691,12 @@ 제목 - - + + 보고서양식 - - + + ${result.vcFormName} diff --git a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueUpdate.jsp b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueUpdate.jsp index 1185fdf8..3f7ec237 100644 --- a/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/itms/srm/ReportIssueUpdate.jsp @@ -119,7 +119,7 @@ window.showModalDialog("" , arrParam - ,"dialogWidth:900px;dialogHeight:750px;resizable:yes;center:yes"); + ,"dialogWidth:950px;dialogHeight:850px;resizable:yes;center:yes"); } //---------------------------------------- @@ -624,7 +624,7 @@ ${resultReport.vcReportId} 서비스 - + selected > ${result.label} @@ -642,7 +642,7 @@ ${incidentId} 작업분류 - + @@ -679,12 +679,12 @@ 제목 - - + + 보고서양식 - - + + ${result.vcFormName}