외사첩보망 요청사항 반영

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<Integer> 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": // 부장대행

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<FireExtensionReportApprv> apprvList;

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();

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,

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();

src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportList.html

@@ -96,6 +96,7 @@
                     <th rowspan="2">문서번호</th>
                     <th colspan="4">목표 인적사항</th>
                     <th rowspan="2">운용기간</th>
+                    <th rowspan="2">운용상태</th>
                     <th rowspan="2">소요예산</th>
                     <th rowspan="2">조치</th>
                     <th rowspan="2">등록일</th>
@@ -115,6 +116,12 @@
                   	<td th:text="${list.opPosition}"></td>
                   	<td th:text="${list.opJob}"></td>
                   	<td th:text="|${list.opSdate}~${list.opEdate}"></td>
+                    <th:block th:if="${list.collaboratorStatus eq null}">
+                      <td></td>
+                    </th:block>
+                    <th:block th:if="${list.collaboratorStatus ne null}" th:each="code:${session.commonCode.get('CS')}">
+                      <td th:if="${list.collaboratorStatus eq code.itemCd}" th:text="${code.itemValue}"></td>
+                    </th:block>
                   	<td th:text="|${list.executionAmount}만원|"></td>
                   	<th:block th:each="commonCode:${session.commonCode.get('DST')}">
                   	<td th:if="${commonCode.itemCd eq list.ferState}" th:text="${commonCode.itemValue}"></td>

src/main/resources/templates/igActivities/intelligenceNetwork/fireExtensionReportViewModal.html

@@ -51,7 +51,7 @@
         <label class="col-sm-1 col-form-label col-form-label-sm text-center">운영상태</label>
         <label class="col-sm-2 col-form-label col-form-label-sm text-start">
           <th:block th:each="code:${session.commonCode.get('CS')}">
-            <th:block th:if="${code.itemCd eq fer.operationPlan.collaboratorStatus}" th:text="${code.itemValue}"></th:block>
+            <th:block th:if="${code.itemCd eq fer.collaboratorStatus}" th:text="${code.itemValue}"></th:block>
           </th:block>
         </label>
      </div>