From 5be10e93d36619749541ff0c1dcb9e197c145bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Wed, 27 Mar 2024 17:31:02 +0900 Subject: [PATCH] =?UTF-8?q?=EC=99=B8=EC=82=AC=EC=B2=A9=EB=B3=B4=EB=A7=9D?= =?UTF-8?q?=20=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IntelligenceNetworkController.java | 26 +++++++++++++------ .../model/FireExtensionReport.java | 4 +-- .../service/IntelligenceNetworkService.java | 5 +++- .../IntelligenceNetworkMapper.xml | 1 + .../intelligenceNetwork/operationPlan.js | 1 + .../fireExtensionReportList.html | 7 +++++ .../fireExtensionReportViewModal.html | 2 +- 7 files changed, 34 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java index f33383ac..f34f9443 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java @@ -62,7 +62,7 @@ public class IntelligenceNetworkController { //결재권한 확인 String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/operationPlanList/all").get(0).getApprovalAuth(); if(type.equals("stay")) { - if(apprvAuth==null) { + if(apprvAuth==null || apprvAuth.isEmpty()) { if(!accessAuth.equals("ACC003")){ op.setWrtUserSeq(loginUser.getUserSeq()); op.setUserType("normalStayList"); @@ -81,7 +81,7 @@ public class IntelligenceNetworkController { } } }else if(type.equals("commit")){ - if(apprvAuth==null) { + if(apprvAuth==null || apprvAuth.isEmpty()) { if(!accessAuth.equals("ACC003")){ op.setWrtUserSeq(loginUser.getUserSeq()); op.setUserType("normalCommitList"); @@ -129,7 +129,7 @@ public class IntelligenceNetworkController { MultipartHttpServletRequest request, @RequestParam(value = "fileSeq", required = false) List deleteFileSeq){ op.setMultipartFileList(request.getMultiFileMap().get("uploadFiles")); if(op.getOpKey() == null) { - op.setCollaboratorStatus("CS001"); + op.setCollaboratorStatus("CS004"); op.setWrtOrgan(loginUser.getOgCd()); op.setWrtPart(loginUser.getOfcCd()); op.setWrtUserGrd(loginUser.getTitleCd()); @@ -203,7 +203,7 @@ public class IntelligenceNetworkController { //결재권한 확인 String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth(); if(type.equals("stay")) { - if(apprvAuth==null) { + if(apprvAuth==null || apprvAuth.isEmpty()) { if(!accessAuth.equals("ACC003")){ ia.setWrtUserSeq(loginUser.getUserSeq()); ia.setUserType("normalStayList"); @@ -222,7 +222,7 @@ public class IntelligenceNetworkController { } } }else if(type.equals("commit")){ - if(apprvAuth==null) { + if(apprvAuth==null || apprvAuth.isEmpty()) { if(!accessAuth.equals("ACC003")){ ia.setWrtUserSeq(loginUser.getUserSeq()); ia.setUserType("normalCommitList"); @@ -358,7 +358,7 @@ public class IntelligenceNetworkController { //결재권한 확인 String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/fireExtensionReportList/all").get(0).getApprovalAuth(); if(type.equals("stay")) { - if(apprvAuth==null) { + if(apprvAuth==null || apprvAuth.isEmpty()) { if(!accessAuth.equals("ACC003")){ fer.setWrtUserSeq(loginUser.getUserSeq()); fer.setUserType("normalStayList"); @@ -368,16 +368,21 @@ public class IntelligenceNetworkController { }else{ mav.addObject("userNm", loginUser.getUserNm()); switch (apprvAuth){ + case "APC004APC001": // 계장대행+부장 + case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 + fer.setUserType("normalStayList"); + break; case "APC004": // 계장대행 case "APC003": // 계장 // 결재대기 문서 조회 case "APC002": // 부장대행 case "APC001": // 부장 // 결재대기 문서 조회 - fer.setFerState("DST002"); + fer.setFerState("normalStayList"); break; } } }else if(type.equals("commit")){ - if(apprvAuth==null) { + if(apprvAuth==null || apprvAuth.isEmpty()) { if(!accessAuth.equals("ACC003")){ fer.setWrtUserSeq(loginUser.getUserSeq()); fer.setUserType("normalCommitList"); @@ -386,6 +391,11 @@ public class IntelligenceNetworkController { } }else{ switch (apprvAuth) { + case "APC004APC001": // 계장대행+부장 + case "APC003APC002": // 계장+부장대행 + case "APC004APC002": // 계장대행+부장대행 + fer.setUserType("normalCommitList"); + break; case "APC004": // 계장대행 case "APC003": // 계장 // case "APC002": // 부장대행 diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java index 9584936d..13dc65a9 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/FireExtensionReport.java @@ -63,6 +63,8 @@ public class FireExtensionReport extends BaseModel { @Column(name = "wrt_dt") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") private LocalDateTime wrtDt; + @Column(name = "collaborator_status") + private String collaboratorStatus; @Transient @@ -80,8 +82,6 @@ public class FireExtensionReport extends BaseModel { @Transient private String opSdate; @Transient - private String collaboratorStatus; - @Transient private OperationPlan operationPlan; @Transient List apprvList; diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java index 9f3d52d6..5c7d8b20 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java @@ -130,6 +130,8 @@ public class IntelligenceNetworkService extends BaseService { case "DST006": // 부장승인시 작성자에게 승인 알림 발송 userAlarmService.sendAlarmToWrtUser(saveOperationPlan.getOpKey(), saveOperationPlan.getWrtUserSeq(), 32,"외사첩보망 견문관리 운영계획에 문서가 승인되었습니다."); + // 정보협력자 운용상태값 변경. + saveOperationPlan.setCollaboratorStatus("CS001"); break; } return apprv.getOpKey(); @@ -214,7 +216,6 @@ public class IntelligenceNetworkService extends BaseService { @Transactional public Integer saveFireExtensionReport(FireExtensionReport fer) { Integer ferKey = fireExtensionReportRepository.save(fer).getFerKey(); - operationPlanRepository.findById(fer.getOpKey()).ifPresent(op -> op.setCollaboratorStatus(fer.getCollaboratorStatus())); if(fer.getFerState().equals("DST002")){ //작성완료일 때 부장 결재 사용자에게 알림 발송. userAlarmService.sendAlarmToApprvUser(ferKey, fer.getWrtOrgan(), "APC001", 35, "외사첩보망 견문관리 외사첩보망 해고(연장)보고에 결재대기 문서가 있습니다."); @@ -256,6 +257,8 @@ public class IntelligenceNetworkService extends BaseService { case "DST006": // 부장승인시 작성자에게 승인 알림 발송 userAlarmService.sendAlarmToWrtUser(saveFireExtensionReport.getFerKey(), saveFireExtensionReport.getWrtUserSeq(), 35,"외사첩보망 견문관리 외사첩보망 해고(연장)보고에 문서가 승인되었습니다."); + // 운영계획 정보협력자 상태 변경 + operationPlanRepository.findById(saveFireExtensionReport.getOpKey()).ifPresent(op -> op.setCollaboratorStatus(saveFireExtensionReport.getCollaboratorStatus())); break; } return apprv.getFerKey(); diff --git a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml index 4a0c6274..91290e4a 100644 --- a/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml +++ b/src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml @@ -490,6 +490,7 @@ op_job, op_sdate, op_edate, + fer.collaborator_status, execution_amount, fer_state, fer.wrt_user_seq, diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js index 5ac1192d..d7bdc54a 100644 --- a/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/operationPlan.js @@ -33,6 +33,7 @@ function getOperationPlanEditModal(opKey){ $("#opBirth,#opSdate").datepicker({ format: "yyyy-mm-dd", language: "ko", + startView:3, autoclose: true }); setUploadDiv(); diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html index 47fede4f..5d7a5732 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html @@ -96,6 +96,7 @@ 문서번호 목표 인적사항 운용기간 + 운용상태 소요예산 조치 등록일 @@ -115,6 +116,12 @@ + + + + + + diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html index 156ff104..2f03abe1 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html @@ -51,7 +51,7 @@