diff --git a/src/main/java/com/urpsys/itmsapi/pot/controller/PortletManageController.java b/src/main/java/com/urpsys/itmsapi/pot/controller/PortletManageController.java index db2aa9d8..1c477710 100644 --- a/src/main/java/com/urpsys/itmsapi/pot/controller/PortletManageController.java +++ b/src/main/java/com/urpsys/itmsapi/pot/controller/PortletManageController.java @@ -122,11 +122,15 @@ public class PortletManageController { LinkedHashMap resBody = new LinkedHashMap(); - String insPrnslIds = (String)requestMap.get("insPrnslIds"); - String userId = (String)requestMap.get("userId"); - LinkedHashMap inMap = (LinkedHashMap) requestMap.get("prsnlPortletCreateVO"); + // String insPrnslIds = (String)requestMap.get("insPrnslIds"); + // String userId = (String)requestMap.get("userId"); + // int insPrnslSeq = (int)requestMap.get("insPrnslSeq"); // 2025.11.12 나혁제 Seq 변수 추가 + + LinkedHashMap inMap = (LinkedHashMap) requestMap.get("prsnlPortletCreateVO"); - portletManageService.insertUserPortlet(insPrnslIds,userId,inMap); + // 2025.11.12 나혁제 불푤요한 변수 삭제 + portletManageService.insertUserPortlet(inMap); + // portletManageService.insertUserPortlet(insPrnslIds,userId,inMap); log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /potl/insertUserPortlet.do >>>>>>>>>>>>>>>>>>>>>>>>>"); diff --git a/src/main/java/com/urpsys/itmsapi/pot/service/PortletManageService.java b/src/main/java/com/urpsys/itmsapi/pot/service/PortletManageService.java index c157c0d2..46ceaff1 100644 --- a/src/main/java/com/urpsys/itmsapi/pot/service/PortletManageService.java +++ b/src/main/java/com/urpsys/itmsapi/pot/service/PortletManageService.java @@ -80,23 +80,26 @@ public class PortletManageService { } // 사용자 포틀릿 등록 - public void insertUserPortlet( String insPrnslIds + /* 2025.11.12 나혁제 불필요한 변수 조정 + public void insertUserPortlet( + , String insPrnslIds , String userId , LinkedHashMap inMap) throws Exception + */ + public void insertUserPortlet( LinkedHashMap inMap ) throws Exception { - int maxSeq = prsnlPortletCreateManageDAO.getMaxSeq(inMap); - - inMap.put("portletSeq" , maxSeq); - inMap.put("prsnlId" , insPrnslIds); - inMap.put("userId" , userId); + // 2025.11.12 나혁제 입력값으로 순서 + // int maxSeq = prsnlPortletCreateManageDAO.getMaxSeq(inMap); + + // inMap.put("portletSeq" , maxSeq); + // inMap.put("portletSeq" , insPrnslSeq); + // inMap.put("prsnlId" , insPrnslIds); + // inMap.put("userId" , userId); portletManageDao.insertUserPortlet(inMap); - } - - // 사용자 포틀릿 삭제 public void deleteUserPortlet( String prsnlIdForInsert , String userId ) throws Exception diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java index 9bd83425..475c1c2b 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportCheckController.java @@ -134,6 +134,12 @@ public class ReportCheckController // 보고서 정보 상세조회 LinkedHashMap resultReportCheck = reportCheckService.getReportWithBody(inReportSeq); + // 2025.11.20 나혁제 기본정보가 없는경우 리턴 처리 + if(resultReportCheck == null) + { + return ResultData.ok(resBody); + } + int inIncidentSeq = 0; if (resultReportCheck.get("inIncidentSeq") != null) { diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportErrorController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportErrorController.java index 013601fa..b70de58b 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportErrorController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportErrorController.java @@ -117,6 +117,12 @@ public class ReportErrorController // 보고서 정보 상세조회 LinkedHashMap resultReportError = reportErrorService.getReportWithBody(inReportSeq); + // 2025.11.20 나혁제 기본정보가 없는경우 리턴 처리 + if(resultReportError == null) + { + return ResultData.ok(resBody); + } + int inIncidentSeq = 0; if (resultReportError.get("inIncidentSeq") != null) { diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportIssueController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportIssueController.java index d305c1a1..6e1d4df1 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportIssueController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportIssueController.java @@ -117,6 +117,12 @@ public class ReportIssueController // 보고서 정보 상세조회 LinkedHashMap resultReportIssue = reportIssueService.getReportWithBody(inReportSeq); + // 2025.11.20 나혁제 기본정보가 없는경우 리턴 처리 + if(resultReportIssue == null) + { + return ResultData.ok(resBody); + } + int inIncidentSeq = 0; if (resultReportIssue.get("inIncidentSeq") != null) { diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportOtherController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportOtherController.java index 3b4f9279..88fad6c2 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/ReportOtherController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/ReportOtherController.java @@ -117,6 +117,12 @@ public class ReportOtherController // 보고서 정보 상세조회 LinkedHashMap resultReportOther = reportOtherService.getReportWithBody(inReportSeq); + // 2025.11.20 나혁제 기본정보가 없는경우 리턴 처리 + if(resultReportOther == null) + { + return ResultData.ok(resBody); + } + int inIncidentSeq = 0; if (resultReportOther.get("inIncidentSeq") != null) { @@ -582,6 +588,39 @@ public class ReportOtherController return ResultData.ok(resBody); } + /** + * 월별 보고서 현황 조회 + * @author urp 인프라본부 나혁제 + * 작성일 : 2025.11.14 + */ + @ResponseBody + @RequestMapping(value="/srm/getReportMonStatus.do") + public ResponseEntity getReportMonStatus( @RequestBody LinkedHashMap requestMap + , HttpServletRequest request + , HttpServletResponse response + ) throws Exception + { + log.info("\n\n\n\n\n"); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>> /srm/getReportMonStatus.do <<<<<<<<<<<<<<<<<<<<<<<<<"); + log.info("getRequestURI [{}]", request.getRequestURI() ); + log.info("입력값 확인 requestMap [{}]", requestMap.toString() ); + + LinkedHashMap resBody = new LinkedHashMap(); + + String strSearchMon = (String)requestMap.get("strSearchMon"); + + log.info("strSearchMon [{}]", strSearchMon ); + + // 월별 보고서 현황 조회 + List> resultList = reportOtherService.getReportMonStatus(strSearchMon); + + resBody.put("resultList", resultList ); + + log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /srm/getReportMonStatus.do >>>>>>>>>>>>>>>>>>>>>>>>>"); + + return ResultData.ok(resBody); + } + diff --git a/src/main/java/com/urpsys/itmsapi/srm/controller/SvcDeskController.java b/src/main/java/com/urpsys/itmsapi/srm/controller/SvcDeskController.java index 41552aa3..960a6644 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/controller/SvcDeskController.java +++ b/src/main/java/com/urpsys/itmsapi/srm/controller/SvcDeskController.java @@ -621,6 +621,40 @@ public class SvcDeskController return ResultData.ok(resBody); } + /** + * 월별 SR 현황 조회 + * @author urp 인프라본부 나혁제 + * 작성일 : 2025.11.13 + */ + @ResponseBody + @RequestMapping(value="/srm/getIncidentMonStatus.do") + public ResponseEntity getIncidentMonStatus( @RequestBody LinkedHashMap requestMap + , HttpServletRequest request + , HttpServletResponse response + ) throws Exception + { + log.info("\n\n\n\n\n"); + log.info(">>>>>>>>>>>>>>>>>>>>>>>>> /srm/getIncidentMonStatus.do <<<<<<<<<<<<<<<<<<<<<<<<<"); + log.info("getRequestURI [{}]", request.getRequestURI() ); + log.info("입력값 확인 requestMap [{}]", requestMap.toString() ); + + LinkedHashMap resBody = new LinkedHashMap(); + + String strSearchMon = (String)requestMap.get("strSearchMon"); + + log.info("strSearchMon [{}]", strSearchMon ); + + // 월별 SR 현황 조회 + List> resultList = svcDeskService.getIncidentMonStatus(strSearchMon); + + resBody.put("resultList", resultList ); + + log.info("<<<<<<<<<<<<<<<<<<<<<<<<< /srm/getIncidentMonStatus.do >>>>>>>>>>>>>>>>>>>>>>>>>"); + + return ResultData.ok(resBody); + } + + diff --git a/src/main/java/com/urpsys/itmsapi/srm/dao/ReportOtherDao.java b/src/main/java/com/urpsys/itmsapi/srm/dao/ReportOtherDao.java index e4408d29..733233bd 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/dao/ReportOtherDao.java +++ b/src/main/java/com/urpsys/itmsapi/srm/dao/ReportOtherDao.java @@ -111,5 +111,10 @@ public interface ReportOtherDao // 반려 public int rejectReport(LinkedHashMap inMap) throws Exception; + // 2025.11.14 나혁제 월별 보고서 현황 + public List> getReportMonStatus(String strSearchMon) throws Exception; + + + } diff --git a/src/main/java/com/urpsys/itmsapi/srm/dao/SvcDeskDao.java b/src/main/java/com/urpsys/itmsapi/srm/dao/SvcDeskDao.java index 67e70c1e..bee186a7 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/dao/SvcDeskDao.java +++ b/src/main/java/com/urpsys/itmsapi/srm/dao/SvcDeskDao.java @@ -109,8 +109,8 @@ public interface SvcDeskDao public int deleteSharing(int inInt) throws Exception; - - + // 2025.11.13 나혁제 월별 SR 현황 + public List> getIncidentMonStatus(String strSearchMon) throws Exception; diff --git a/src/main/java/com/urpsys/itmsapi/srm/service/ReportOtherService.java b/src/main/java/com/urpsys/itmsapi/srm/service/ReportOtherService.java index 79921377..32f88e7c 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/service/ReportOtherService.java +++ b/src/main/java/com/urpsys/itmsapi/srm/service/ReportOtherService.java @@ -309,6 +309,13 @@ public class ReportOtherService return strIncidentId; } + // 2025.11.14 나혁제 월별 보고서 현황 + public List> getReportMonStatus(String strSearchMon) throws Exception + { + return reportOtherDao.getReportMonStatus(strSearchMon); + } + + diff --git a/src/main/java/com/urpsys/itmsapi/srm/service/SvcDeskService.java b/src/main/java/com/urpsys/itmsapi/srm/service/SvcDeskService.java index 267ca1be..b893aec6 100644 --- a/src/main/java/com/urpsys/itmsapi/srm/service/SvcDeskService.java +++ b/src/main/java/com/urpsys/itmsapi/srm/service/SvcDeskService.java @@ -288,6 +288,13 @@ public class SvcDeskService return strIncidentId; } + + // 2025.11.13 나혁제 월별 SR 현황 + public List> getIncidentMonStatus(String strSearchMon) throws Exception + { + return svcDeskDao.getIncidentMonStatus(strSearchMon); + } + diff --git a/src/main/java/com/urpsys/itmsapi/sta/controller/ResourceStatController.java b/src/main/java/com/urpsys/itmsapi/sta/controller/ResourceStatController.java index e4536d4d..b4cd722f 100644 --- a/src/main/java/com/urpsys/itmsapi/sta/controller/ResourceStatController.java +++ b/src/main/java/com/urpsys/itmsapi/sta/controller/ResourceStatController.java @@ -53,7 +53,7 @@ public class ResourceStatController * 작성일 : 2025.11.10 */ @ResponseBody - @RequestMapping(value="/srm/getResouceTotalStat.do") + @RequestMapping(value="/sta/getResouceTotalStat.do") public ResponseEntity getMyIncidents( @RequestBody LinkedHashMap requestMap , HttpServletRequest request , HttpServletResponse response diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/pot/PortletManageMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/pot/PortletManageMapper.xml index 718e034c..5d51fcac 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/pot/PortletManageMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/pot/PortletManageMapper.xml @@ -27,7 +27,7 @@ + @@ -623,22 +629,26 @@ WHERE IN_REPORT_SEQ = #{inReportSeq} + { call PROC_APPROVAL( 1 , #{inReportSeq} , #{inUserSeq} ,"${txComment}" + , #{stsfdgCd} ) } + { call PROC_REJECT( 1 , #{inReportSeq} , #{inUserSeq} , "${txComment}" + , #{stsfdgCd} ) } diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml index d1a30ced..392e4de9 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportErrorMapper.xml @@ -51,6 +51,7 @@ + @@ -59,6 +60,7 @@ + @@ -492,7 +494,8 @@ AND A.IN_REPORT_SEQ=#{value} AND B.IN_DEL_FLAG=0 - + + @@ -581,22 +587,26 @@ } + { call PROC_APPROVAL( 1 , #{inReportSeq} , #{inUserSeq} ,"${txComment}" + , #{stsfdgCd} ) } + { call PROC_REJECT( 1 , #{inReportSeq} , #{inUserSeq} , "${txComment}" + , #{stsfdgCd} ) } diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml index 2126d058..9963844f 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportIssueMapper.xml @@ -51,6 +51,7 @@ + @@ -59,6 +60,7 @@ + @@ -494,6 +496,7 @@ AND B.IN_DEL_FLAG=0 + @@ -581,22 +587,26 @@ } + { call PROC_APPROVAL( 1 , #{inReportSeq} , #{inUserSeq} ,"${txComment}" + , #{stsfdgCd} ) } + { call PROC_REJECT( 1 , #{inReportSeq} , #{inUserSeq} , "${txComment}" + , #{stsfdgCd} ) } diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml index a6dd533f..605cc31c 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/ReportOtherMapper.xml @@ -50,6 +50,7 @@ + @@ -58,6 +59,7 @@ + @@ -483,6 +485,7 @@ AND B.IN_DEL_FLAG=0 + @@ -570,22 +576,26 @@ } + { call PROC_APPROVAL( 1 , #{inReportSeq} , #{inUserSeq} ,"${txComment}" + , #{stsfdgCd} ) } + { call PROC_REJECT( 1 , #{inReportSeq} , #{inUserSeq} , "${txComment}" + , #{stsfdgCd} ) } @@ -643,6 +653,42 @@ GROUP BY U.ESNTL_ID + + + diff --git a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml index f3d2f2d9..54b4b231 100644 --- a/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml +++ b/src/main/resources/mapper/primarydb/sqlmap/itms/srm/SvcDeskMapper.xml @@ -110,7 +110,8 @@ - + + @@ -119,11 +120,9 @@ + - - - + + + +