Merge branch 'master' of https://dev.azure.com/DBNTech/ForeignAffairs/_git/ForeignAffairs

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/IntelligenceNetworkController.java

@@ -1,9 +1,11 @@
 package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork;
 
 import com.dbnt.faisp.main.authMgt.service.AuthMgtService;
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service.IntelligenceNetworkService;
+import com.dbnt.faisp.main.translator.model.TranslatorCrr;
 import com.dbnt.faisp.main.userInfo.model.UserInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.security.core.annotation.AuthenticationPrincipal;
@@ -150,6 +152,124 @@ public class IntelligenceNetworkController { // 첩보수집활동 > 해양외
     apprv.setSaveDt(LocalDateTime.now());
     return intelligenceNetworkService.operationPlanStateChange(apprv);
   }
+  
+  @GetMapping("/intelligenceAnalyzeList/{type}")
+  public ModelAndView intelligenceAnalyzeList(@AuthenticationPrincipal UserInfo loginUser,@PathVariable("type") String type, OperationPlan op){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeList");
+    
+  //메뉴권한 확인
+    String accessAuth = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getAccessAuth();
+    if(type.equals("all")) {
+	    switch (accessAuth){
+	      case "ACC001": // 조회
+	      case "ACC002": // 작성 // 자신이 작성한 문서만 열람가능
+	    	  op.setWrtUserSeq(loginUser.getUserSeq());
+	        break;
+	      case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+	    	  op.setDownOrganCdList(loginUser.getDownOrganCdList());
+	        mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+	        break;
+	    }
+    }else if(type.equals("stay") || type.equals("commit")) {
+    	switch (accessAuth){
+        case "ACC001": // 조회
+        case "ACC002": // 작성 // 자신의 관서 내에서 작성한 문서만 열람가능
+        	op.setWrtOrgan(loginUser.getOgCd());
+          break;
+        case "ACC003": // 관리 // 자신 외 하위 기관에서 작성한 문서 열람가능
+        	op.setDownOrganCdList(loginUser.getDownOrganCdList());
+          mav.addObject("mgtOrganList", loginUser.getDownOrganCdList());
+          break;
+      }
+    }
+    //결재권한 확인
+    String apprvAuth = authMgtService.selectApprovalConfigList(loginUser.getUserSeq(), "/intelligenceNetwork/intelligenceAnalyzeList/all").get(0).getApprovalAuth();
+    if(type.equals("stay")) {
+    	if(apprvAuth==null) {
+    	      if(!accessAuth.equals("ACC003")){
+    	        op.setWrtUserSeq(loginUser.getUserSeq());
+    	        op.setUserType("normalStayList");
+    	      }else{
+    	    	  op.setUserType("managerStayList");
+    	      }
+    	    }else{
+    	      mav.addObject("userNm", loginUser.getUserNm());
+    	      switch (apprvAuth){
+    	        case "APC004": // 계장대행
+    	        case "APC003": // 계장 // 결재대기 문서 조회
+    	        case "APC002": // 부장대행
+    	        case "APC001": // 부장 // 결재대기 문서 조회
+    	        	op.setOpState("DST002");
+    	          break;
+    	      }
+    	    }
+    }else if(type.equals("commit")){
+    	if(apprvAuth==null) {
+    	      if(!accessAuth.equals("ACC003")){
+    	        op.setWrtUserSeq(loginUser.getUserSeq());
+    	        op.setUserType("normalCommitList");
+    	      }else{
+    	        op.setUserType("managerCommitList");
+    	      }
+    	    }else{
+    	      switch (apprvAuth) {
+    	        case "APC004": // 계장대행
+    	        case "APC003": // 계장 // 
+    	        case "APC002": // 부장대행
+    	        case "APC001": // 부장 // 	
+    	          op.setUserType("sectionCommitList");
+    	          break;
+    	      }
+    	    }
+    }
+    mav.addObject("accessAuth", accessAuth);
+    mav.addObject("apprvAuth", apprvAuth);
+ 
+    op.setQueryInfo();
+    mav.addObject("opList", intelligenceNetworkService.selectOperationPlanList(op));
+    op.setContentCnt(intelligenceNetworkService.selectOperationPlanListCnt(op));
+    op.setPaginationInfo();  
+    mav.addObject("type", type);
+    
+    mav.addObject("searchUrl", "/intelligenceNetwork/intelligenceAnalyzeList/"+type);
+    mav.addObject("searchParams", op);
+	return mav;
+  }
+  
+  @GetMapping("/intelligenceAnalyzeEditModal")
+  public ModelAndView intelligenceAnalyzeEditModal(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyze ia){
+    ModelAndView mav = new ModelAndView("igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal");
+    if(ia.getIaKey()!=null){
+      
+    }
+    
+    mav.addObject("ia", ia);
+    return mav;
+  }
+  
+  @PostMapping("/getAffairCnt")
+  @ResponseBody
+  public IntelligenceAnalyze getAffairCnt(@RequestBody List<Integer> affairKey){
+	  IntelligenceAnalyze ia = new IntelligenceAnalyze();
+	  ia.setAffairList(affairKey);
+	  ia = intelligenceNetworkService.selectAffairCnt(ia);
+	  ia.setAffairList(affairKey);
+    return ia;
+  }
+  
+  @PostMapping("/saveIntelligenceAnalyze")
+  public Integer saveIntelligenceAnalyze(@AuthenticationPrincipal UserInfo loginUser,IntelligenceAnalyze ia){
+	  
+	  if(ia.getIaKey() == null) {
+		  ia.setWrtOrgan(loginUser.getOgCd());
+		  ia.setWrtPart(loginUser.getOfcCd());
+		  ia.setWrtUserGrd(loginUser.getTitleCd());
+		  ia.setWrtUserSeq(loginUser.getUserSeq());
+		  ia.setWrtUserNm(loginUser.getUserNm());
+		  ia.setWrtDt(LocalDateTime.now());
+	  }
+    return intelligenceNetworkService.saveIntelligenceAnalyze(ia);
+  }
 
 
 }

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/mapper/IntelligenceNetworkMapper.java

@@ -2,8 +2,8 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
 
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
-import com.dbnt.faisp.main.fpiMgt.monitoring.model.MonitoringDesignation;
 
 import java.util.List;
 
@@ -14,6 +14,8 @@ public interface IntelligenceNetworkMapper {
 
 	Integer selectOperationPlanListCnt(OperationPlan op);
 
+	IntelligenceAnalyze selectAffairCnt(IntelligenceAnalyze ia);
+
 
   
 }

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyze.java

@@ -0,0 +1,88 @@
+package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model;
+
+import com.dbnt.faisp.config.BaseModel;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.persistence.*;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "intelligence_analyze")
+public class IntelligenceAnalyze extends BaseModel {
+  @Id
+  @GeneratedValue(strategy = GenerationType.IDENTITY)
+  @Column(name = "ia_key")
+  private Integer iaKey;
+  @Column(name = "ia_sdate")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate iaSdate;
+  @Column(name = "ia_edate")
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate iaEdate;
+  @Column(name = "fi_cnt")
+  private Integer fiCnt;
+  @Column(name = "fa_cnt")
+  private Integer faCnt;
+  @Column(name = "work_cnt")
+  private Integer workCnt;
+  @Column(name = "arrest_cnt")
+  private Integer arrestCnt;
+  @Column(name = "foreign_affairs")
+  private String foreignAffairs;
+  @Column(name = "work")
+  private String work;
+  @Column(name = "arrest_offenders")
+  private String arrestOffenders;
+  @Column(name = "analysis_evaluation")
+  private String analysisEvaluation;
+  @Column(name = "measures")
+  private String measures;
+  @Column(name = "ia_state")
+  private String iaState;
+  @Column(name = "wrt_organ")
+  private String wrtOrgan;
+  @Column(name = "wrt_part")
+  private String wrtPart;
+  @Column(name = "wrt_user_seq")
+  private Integer wrtUserSeq;
+  @Column(name = "wrt_user_grd")
+  private String wrtUserGrd;
+  @Column(name = "wrt_user_nm")
+  private String wrtUserNm;
+  @Column(name = "wrt_dt")
+  @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+  private LocalDateTime wrtDt;
+  
+  
+  @Transient
+  private String userType;
+  @Transient
+  private List<Integer> affairList;
+  @Transient
+  private Integer totalCnt;
+  @Transient
+  private Integer specialCnt;
+  @Transient
+  private Integer middleCnt;
+  @Transient
+  private Integer tongCnt;
+  @Transient
+  private Integer joCnt;
+  @Transient
+  private Integer muCnt;
+
+}

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeToAffair.java

@@ -0,0 +1,34 @@
+package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model;
+
+import lombok.*;
+import org.hibernate.annotations.DynamicInsert;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+import java.io.Serializable;
+
+@Getter
+@Setter
+@Entity
+@NoArgsConstructor
+@DynamicInsert
+@DynamicUpdate
+@Table(name = "intelligence_analyze_to_affair")
+@IdClass(IntelligenceAnalyzeToAffair.IntelligenceAnalyzeToAffairId.class)
+public class IntelligenceAnalyzeToAffair {
+  @Id
+  @Column(name = "ia_key")
+  private Integer iaKey;
+  @Id
+  @Column(name = "affair_key")
+  private Integer affairKey;
+
+  @Embeddable
+  @Data
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class IntelligenceAnalyzeToAffairId implements Serializable {
+    private Integer iaKey;
+    private Integer affairKey;
+  }
+}

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeRepository.java

@@ -0,0 +1,11 @@
+package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository;
+
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+
+public interface IntelligenceAnalyzeRepository extends JpaRepository<IntelligenceAnalyze, Integer> {
+ 
+}

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/repository/IntelligenceAnalyzeToAffairRepository.java

@@ -0,0 +1,12 @@
+package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository;
+
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeToAffair;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+
+
+public interface IntelligenceAnalyzeToAffairRepository extends JpaRepository<IntelligenceAnalyzeToAffair, IntelligenceAnalyzeToAffair.IntelligenceAnalyzeToAffairId> {
+
+
+}

src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/service/IntelligenceNetworkService.java

@@ -4,10 +4,14 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.service;
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.config.FileInfo;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.mapper.IntelligenceNetworkMapper;
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze;
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeToAffair;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlan;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanApprv;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.OperationPlanFile.OperationPlanFileId;
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.IntelligenceAnalyzeRepository;
+import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.IntelligenceAnalyzeToAffairRepository;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanApprvRepository;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanFileRepository;
 import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanRepository;
@@ -28,6 +32,8 @@ public class IntelligenceNetworkService extends BaseService {
   private final OperationPlanApprvRepository operationPlanApprvRepository;
   private final OperationPlanFileRepository operationPlanFileRepository;
   private final OperationPlanRepository operationPlanRepository;
+  private final IntelligenceAnalyzeRepository intelligenceAnalyzeRepository;
+  private final IntelligenceAnalyzeToAffairRepository intelligenceAnalyzeToAffairRepository;
   private final IntelligenceNetworkMapper intelligenceNetworkMapper;
   
   @Transactional
@@ -124,6 +130,29 @@ public class IntelligenceNetworkService extends BaseService {
   public OperationPlanFile selectOperationPlanFile(Integer parentKey, Integer fileSeq) {
 	  return operationPlanFileRepository.findById(new OperationPlanFileId(parentKey,fileSeq)).orElse(null);
   }
+
+  public IntelligenceAnalyze selectAffairCnt(IntelligenceAnalyze ia) {
+	  return intelligenceNetworkMapper.selectAffairCnt(ia);
+  }
+  
+  @Transactional
+  public Integer saveIntelligenceAnalyze(IntelligenceAnalyze ia) {
+	  Integer iaKey = intelligenceAnalyzeRepository.save(ia).getIaKey();
+	  IntelligenceAnalyzeToAffair iata = new IntelligenceAnalyzeToAffair();
+	  iata.setIaKey(iaKey);
+	  for(Integer affairKey : ia.getAffairList()) {
+		  iata.setAffairKey(affairKey);
+		  intelligenceAnalyzeToAffairRepository.save(iata);
+	  }
+	    if(ia.getIaState().equals("DST002")){
+	      //작성완료일 때 계장 결재 사용자에게 알림 발송.
+	      userAlarmService.sendAlarmToApprvUser(iaKey, ia.getWrtOrgan(), "APC001", 34, "외사첩보망 견문관리 운영실적에 결재대기 문서가 있습니다.");
+		  userAlarmService.sendAlarmToApprvUser(iaKey, ia.getWrtOrgan(), "APC002", 34, "외사첩보망 견문관리 운영실적에 결재대기 문서가 있습니다.");
+	      userAlarmService.sendAlarmToApprvUser(iaKey, ia.getWrtOrgan(), "APC003", 34, "외사첩보망 견문관리 운영실적에 결재대기 문서가 있습니다.");
+	      userAlarmService.sendAlarmToApprvUser(iaKey, ia.getWrtOrgan(), "APC004", 34, "외사첩보망 견문관리 운영실적에 결재대기 문서가 있습니다.");
+	    }
+	    return iaKey;
+  }
   
   
 

src/main/resources/mybatisMapper/IntelligenceNetworkMapper.xml

@@ -80,4 +80,47 @@
     from operation_plan op
     <include refid="selectOperationPlanListWhere"></include>
   </select>
+  
+  <select id="selectAffairCnt" resultType="IntelligenceAnalyze" parameterType="IntelligenceAnalyze">
+  	select sum("AAR001"+"AAR003"+"AAR004"+"AAR006"+"AAR008") as total_cnt,
+  	       sum("AAR001") as special_cnt,
+	       sum("AAR003") as middle_cnt,
+	       sum("AAR004") as tong_cnt,
+	       sum("AAR006") as jo_cnt,
+	       sum("AAR008") as mu_cnt
+	from(
+	select ab.affair_key,
+	       case 
+		     when ar.affair_rate = 'AAR001' then 1
+		     else 0
+		   end as "AAR001",
+		   case 
+		     when ar.affair_rate = 'AAR003' then 1
+		     else 0
+		   end as "AAR003",
+		   case 
+		     when ar.affair_rate = 'AAR004' then 1
+		     else 0
+		   end as "AAR004",
+		   case 
+		     when ar.affair_rate = 'AAR006' then 1
+		     else 0
+		   end as "AAR006",
+		   case 
+		     when ar.affair_rate = 'AAR008' then 1
+		     else 0
+		   end as "AAR008" 
+	from affair_board ab,
+	     affair_rating ar
+	where ab.affair_key = ar.affair_key 
+	and ab.affair_category = 'CAT216'
+	and ab.affair_key in
+    <foreach collection="affairList" item="affairKey" separator="," open="(" close=")">
+      #{affairKey}
+    </foreach>
+	and (ar.organ_up != 'T' or ar.organ_up is null)
+	) a
+    
+  </select>
+  
 </mapper>

src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js

@@ -0,0 +1,213 @@
+$(function(){
+  $("#dateSelectorDiv").datepicker({
+    format: "yyyy-mm-dd",
+    language: "ko",
+    autoclose: true
+  });
+})
+
+$(document).on('click', '#allTab', function (){
+  location.href = "/intelligenceNetwork/operationPlanList/all";
+})
+$(document).on('click', '#stayTab', function (){
+  location.href = "/intelligenceNetwork/operationPlanList/stay";
+})
+$(document).on('click', '#commitTab', function (){
+  location.href = "/intelligenceNetwork/operationPlanList/commit";
+})
+
+$(document).on('click', '#addBtn', function (){
+  getIntelligenceAnalyzeEditModal(null);
+})
+
+function getIntelligenceAnalyzeEditModal(opKey){
+  $.ajax({
+    url: '/intelligenceNetwork/intelligenceAnalyzeEditModal',
+    data: {opKey: opKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#intelligenceAnalyzeEditModalContent").empty().append(html)
+      $("#iaDateSelectorDiv").datepicker({
+        format: "yyyy-mm-dd",
+        language: "ko",
+        autoclose: true
+      });
+      setUploadDiv();
+      $("#intelligenceAnalyzeEditModal").modal('show');
+    },
+    error:function(){
+
+    }
+  });
+}
+
+$(document).on('click', '#affairModalBtn', function (){
+  const workStartDt = $("#iaSdate").val()
+  const workEndDt = $("#iaEdate").val()
+  if(!workStartDt||!workEndDt){
+    alert("실적기간을 입력해주세요.");
+  }else{
+    $.ajax({
+      url: '/affairResult/affairListModal',
+      data: {
+        startDate: workStartDt,
+        endDate: workEndDt,
+        affairCategory:"CAT216",
+        affairStatus:"DST006"
+      },
+      type: 'GET',
+      dataType:"html",
+      success: function(html){
+        $("#affairListModalContent").empty().append(html)
+        $("#affairListModal").modal('show');
+      },
+      error:function(e){
+        ajaxErrorAction(e);
+      }
+    });
+  }
+})
+$(document).on('keyup', '.cntInput', function (){
+  const cnt = Number($(this).val());
+  $("#totalCnt2").val(Number($("#totalCnt2").val())+cnt);
+  
+})
+
+$(document).on('click', '#getAffairBtn', function (){
+	const affairList=[];
+  $.each($(".rowChkBox:checked"), function (idx, chkBox){
+	const affairTr = $(chkBox).parents(".affairTr");
+	affairList.push(affairTr.find(".rowChkBox").val());
+  })
+  $.ajax({
+        type : 'POST',
+        data : JSON.stringify(affairList),
+        url : "/intelligenceNetwork/getAffairCnt",
+       contentType: 'application/json',
+	    beforeSend: function (xhr){
+	      xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+	    },
+	    success : function(data) {
+		$("#totalCnt").val(data.totalCnt);
+		$("#specialCnt").val(data.specialCnt);
+		$("#middleCnt").val(data.middleCnt);
+		$("#tongCnt").val(data.tongCnt);
+		$("#joCnt").val(data.joCnt);
+		$("#muCnt").val(data.muCnt);
+		$("#affairList").val(data.affairList);
+		//$.each(data.affairList, function(affair, idx){
+			//$("#ddd").val($("#ddd").val()+","+affair);			
+		//})
+		
+		 contentFade("out");
+	      //trCarrerList.length = 0;
+	    },
+	    error : function(xhr, status) {
+		  contentFade("out");
+	    }
+      })
+    $("#affairListModal").modal("hide");
+})
+
+$(document).on('click', '#editBtn', function (){
+	$("#operationPlanViewModal").modal('hide');
+	getoOerationPlanEditModal($(this).attr("data-opkey"));
+})
+
+$(document).on('click', '#saveBtn', function (){
+	/*
+	if(!$("#opName").val()){
+    	alert("성명을 입력해주세요.");
+    	$('#opName').focus();
+	    return  false;
+	}
+	*/
+	if(confirm("저장하시겠습니까?")){
+		saveIntelligenceAnalyze('DST002');
+	}
+})
+
+$(document).on('click', '#saveTempBtn', function (){
+	if(confirm("임시저장 하시겠습니까?")){
+		saveIntelligenceAnalyze('DST001');
+	}
+})
+
+function saveIntelligenceAnalyze(iaState){
+      contentFade("in");
+      const formData = new FormData($("#intelligenceAnalyzeEditForm")[0]);
+      for(const file of files) {
+        if(!file.isDelete)
+          formData.append('uploadFiles', file, file.name);
+      }
+      $(".text-decoration-line-through").each(function (idx, el){
+        formData.append('fileSeq', $(el).attr("data-fileseq"));
+      })
+      formData.append('iaState', iaState);
+      $.ajax({
+        type : 'POST',
+        data : formData,
+        url : "/intelligenceNetwork/saveIntelligenceAnalyze",
+        processData: false,
+        contentType: false,
+        success : function(result) {
+          alert("저장되었습니다.");
+          contentFade("out");
+          location.reload();
+        },
+        error : function(xhr, status) {
+          alert("저장에 실패하였습니다.")
+          contentFade("out");
+        }
+      })
+}
+
+$(document).on('click', '.operationPlanTr', function (){
+    getOperationPlanViewModal(Number($(this).find(".opKey").val()));
+})
+
+function getOperationPlanViewModal(opKey){
+  $.ajax({
+    url: '/intelligenceNetwork/operationPlanViewModal',
+    data: {opKey: opKey},
+    type: 'GET',
+    dataType:"html",
+    success: function(html){
+      $("#operationPlanViewModalBody").empty().append(html)
+      $("#operationPlanViewModal").modal('show');
+    },
+    error:function(){
+
+    }
+  });
+}
+
+$(document).on('click', '.apprvBtn', function (){
+  $("#viewModalApprvValue").val($(this).attr("data-planstate"));
+  const approval = $(this).val();
+  if(confirm(approval+"하시겠습니까?")){
+    const formData = new FormData($("#apprvForm")[0]);
+    contentFade("in")
+    $.ajax({
+      type : 'POST',
+      data : formData,
+      url : "/intelligenceNetwork/operationPlanStateChange",
+      processData: false,
+      contentType: false,
+      beforeSend: function (xhr){
+        xhr.setRequestHeader($("[name='_csrf_header']").val(), $("[name='_csrf']").val());
+      },
+      success : function(result) {
+        alert(approval+"되었습니다");
+        getOperationPlanViewModal(result);
+        contentFade("out");
+      },
+      error : function(xhr, status) {
+        alert(approval+"처리를 실패하였습니다.");
+        contentFade("out");
+      }
+    })
+  }
+})
+

src/main/resources/static/js/igActivities/fpiMgt/intelligenceNetwork/operationPlan.js

@@ -17,10 +17,10 @@ $(document).on('click', '#commitTab', function (){
 })
 
 $(document).on('click', '#addBtn', function (){
-  getoOerationPlanEditModal(null);
+  getOerationPlanEditModal(null);
 })
 
-function getoOerationPlanEditModal(opKey){
+function getOerationPlanEditModal(opKey){
   $.ajax({
     url: '/intelligenceNetwork/operationPlanEditModal',
     data: {opKey: opKey},
@@ -44,7 +44,7 @@ function getoOerationPlanEditModal(opKey){
 
 $(document).on('click', '#editBtn', function (){
 	$("#operationPlanViewModal").modal('hide');
-	getoOerationPlanEditModal($(this).attr("data-opkey"));
+	getOerationPlanEditModal($(this).attr("data-opkey"));
 })
 
 $(document).on('click', '#saveBtn', function (){

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/IntelligenceAnalyzeList.html

@@ -0,0 +1,180 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org"
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+      layout:decorate="~{layout/layout}">
+<th:block layout:fragment="script">
+  <script type="text/javascript" th:src="@{/js/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyze.js}"></script>
+</th:block>
+<div layout:fragment="content">
+  <main>
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <div class="row justify-content-between">
+      <div class="col-auto"><h4>운영 실적 분석 / 평가서</h4></div>
+      <div class="col-auto"><p class="mb-0 mt-2">첩보수집활동 > 외사첩보망 견문관리 > 운영 실적 분석 / 평가</p></div>
+    </div>
+    <div class="row mx-0">
+      <div class="col-12 card bg-light text-center">
+        <div class="card-body">
+          <ul class="nav nav-tabs" id="userTab" role="tablist">
+            <li class="nav-item" role="presentation">
+              <button class="nav-link" th:classappend="${type eq 'all'?' active':''}" id="allTab" data-bs-toggle="tab" type="button" role="tab">전체 목록</button>
+            </li>
+            <li class="nav-item" role="presentation">
+              <button class="nav-link" th:classappend="${type eq 'stay'?' active':''}" id="stayTab" data-bs-toggle="tab" type="button" role="tab">결재대기목록</button>
+            </li>
+            <li class="nav-item" role="presentation">
+              <button class="nav-link" th:classappend="${type eq 'commit'?' active':''}" id="commitTab" data-bs-toggle="tab" type="button" role="tab">결재처리목록</button>
+            </li>
+          </ul>
+          <div class="tab-content bg-white border border-top-0 p-2" id="planContent">
+            <!-- <form method="get" th:action="${searchUrl}">
+              <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
+              <div class="row justify-content-between py-1">
+                <div class="col-auto">
+                  <select class="form-select form-select-sm" name="rowCnt" id="rowCnt">
+                    <th:block th:each="num : ${#numbers.sequence(1,5)}">
+                      <option th:value="${num*10}" th:text="${num*10}" th:selected="${searchParams.rowCnt eq num*10}"></option>
+                    </th:block>
+                  </select>
+                </div>
+                <div class="col-8">
+                  <div class="row">
+                    <div class="col-11">
+                      <div class="row justify-content-end pb-1" th:if="${accessAuth eq 'ACC003'}">
+                        <div class="col-2">
+                          <select class="form-select form-select-sm" name="wrtOrgan">
+                            <option value="">관서 선택</option>
+                            <th:block th:each="commonCode:${session.commonCode.get('OG')}">
+                              <th:block th:if="${#lists.contains(mgtOrganList, commonCode.itemCd)}">
+                                <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.wrtOrgan}"></option>
+                              </th:block>
+                            </th:block>
+                          </select>
+                        </div>
+                        <div class="col-2">
+                          <input type="text" class="form-control form-control-sm" placeholder="협력자 성명" name="opName" th:value="${searchParams.opName}">
+                        </div>
+                        <div class="col-2">
+                          <select class="form-select form-select-sm" name="opState">
+                            <option value="">상태 선택</option>
+                            <th:block th:each="commonCode:${session.commonCode.get('DST')}">
+                              <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq searchParams.opState}"></option>
+                            </th:block>
+                          </select>
+                        </div>
+                        <div class="col-4">
+                          <div class="input-group input-daterange" id="dateSelectorDiv">
+                            등록일:
+                            <input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
+                            <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                    <div class="col-1 d-grid gap-2">
+                      <input type="submit" class="btn btn-sm btn-primary" id="searchBtn" value="검색">
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </form> -->
+            <div class="row justify-content-start">
+              <div class="col-12">
+                <table class="table table-sm table-bordered table-hover">
+                  <thead>
+                  <tr class="table-secondary">
+                    <th rowspan="2">문서번호</th>
+                    <th rowspan="2">실적기간</th>
+                    <th colspan="6">첩보수집실적</th>
+                    <th rowspan="2">허위<br>오보</th>
+                    <th colspan="4">활용실적</th>
+                    <th rowspan="2">등록일</th>
+                    <th rowspan="2">관리관<br>결제여부</th>
+                  </tr>
+                  <tr>
+                  	<th>계</th>
+                    <th>특보</th>
+                    <th>중보</th>
+                    <th>통보</th>
+                    <th>조사</th>
+                    <th>무가치</th>
+                    <th>계</th>
+                    <th>외사<br>활동</th>
+                    <th>공작</th>
+                    <th>검거<br>(건/명)</th>
+                  </tr>
+                  </thead>
+                  <tbody class="table-group-divider">
+                  <tr class="operationPlanTr">
+                  	
+                  	<th:block>
+                  		
+                  	</th:block>
+                  </tr>
+                  </tbody>
+                </table>
+              </div>
+            </div>
+            <div class="row justify-content-between">
+              <div class="col-auto"></div>
+              <div class="col-auto">
+                <nav aria-label="Page navigation">
+                  <ul class="pagination mb-0">
+                    <th:block th:if="${searchParams.pageIndex>3}">
+                      <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)-3}">
+                        <a class="page-link" href="#" aria-label="Previous">
+                          <span aria-hidden="true">&laquo;</span>
+                        </a>
+                      </li>
+                    </th:block>
+                    <th:block th:each="num : ${#numbers.sequence(searchParams.startNum, searchParams.endNum)}">
+                      <li class="page-item" th:data-pageindex="${num}" th:classappend="${searchParams.pageIndex eq num?'active':''}">
+                        <a class="page-link" href="#" th:text="${num}"></a>
+                      </li>
+                    </th:block>
+                    <th:block th:if="${searchParams.maxNum>searchParams.endNum+2}">
+                      <li class="page-item" th:data-pageindex="${(searchParams.pageIndex)+3}">
+                        <a class="page-link" href="#" aria-label="Next">
+                          <span aria-hidden="true">&raquo;</span>
+                        </a>
+                      </li>
+                    </th:block>
+                  </ul>
+                </nav>
+              </div>
+              <div class="col-auto">
+                <input type="button" class="btn btn-success" value="등록" id="addBtn" th:unless="${accessAuth eq 'ACC001'}">
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </main>
+
+  <div class="modal fade" id="intelligenceAnalyzeEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planEditModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="intelligenceAnalyzeEditModalContent">
+
+      </div>
+    </div>
+  </div>
+  
+  <div class="modal fade" id="affairListModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="affairListModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="affairListModalContent">
+
+      </div>
+    </div>
+  </div>
+  
+  <div class="modal fade" id="operationPlanViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="planViewModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+      <div class="modal-content" id="operationPlanViewModalBody">
+
+      </div>
+    </div>
+  </div>
+</div>
+</html>

src/main/resources/templates/igActivities/fpiMgt/intelligenceNetwork/intelligenceAnalyzeEditModal.html

@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<div class="modal-header bg-dark">
+  <h5 class="modal-title text-white" id="affairEditModalLabel" th:text="${ia.iaKey eq null?'운영 계획서 작성':'운영 계획서 수정'}"></h5>
+  <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
+</div>
+<div class="modal-body" id="affairEditBody">
+  <form action="#" method="post" id="intelligenceAnalyzeEditForm">
+    <input type="hidden" name="_csrf_header" th:value="${_csrf.headerName}"/>
+    <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
+    <input type="hidden" id="affairList" name="affairList" th:value="${ia.affairList}">
+    <!-- <input type="hidden" name="opKey" th:value="${op.opKey}">
+    <input type="hidden" name="wrtOrgan" th:value="${op.wrtOrgan}">
+    <input type="hidden" name="wrtPart" th:value="${op.wrtPart}">
+    <input type="hidden" name="wrtUserSeq" th:value="${op.wrtUserSeq}">
+    <input type="hidden" name="wrtUserGrd" th:value="${op.wrtUserGrd}">
+    <input type="hidden" name="wrtUserNm" th:value="${op.wrtUserNm}">
+    <input type="hidden" name="wrtDt" id="wrtDt" th:value="${#temporals.format(op.wrtDt, 'yyyy-MM-dd HH:mm')}"> -->
+    <div class="row mb-1">
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성자</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" placeholder="작성자 자동입력" readonly>
+      </div>
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">작성일</label>
+      <div class="col-sm-2">
+        <input type="text" class="form-control form-control-sm" placeholder="작성일 자동입력" readonly>
+      </div>
+    </div>
+    <hr>
+    <div class="row mb-1">
+    <label for="iaDateSelectorDiv" class="col-sm-1 col-form-label col-form-label-sm text-center">실적기간</label>
+    <div class="input-group w-auto input-daterange" id="iaDateSelectorDiv">
+        <input type="text" class="form-control form-control-sm" id="iaSdate" name="iaSdate" readonly>
+        <input type="text" class="form-control form-control-sm" id="iaEdate" name="iaEdate" readonly>
+	</div>
+	<div class="col-auto">
+        <input type="button" class="btn btn-sm btn-outline-primary" id="affairModalBtn" value="불러오기">
+    </div>
+	</div>
+    <div class="row mb-1">
+      <div class="row justify-content-start text-center">
+                <table class="table table-sm table-bordered table-hover">
+                  <thead>
+                  <tr class="table-secondary">
+                    <th colspan="6">첩보수집실적</th>
+                    <th rowspan="2">허위오보</th>
+                    <th colspan="4">활용실적</th>
+                  </tr>
+                  <tr>
+                  	<th>계</th>
+                    <th>특보</th>
+                    <th>중보</th>
+                    <th>통보</th>
+                    <th>조사</th>
+                    <th>무가치</th>
+                    <th>계</th>
+                    <th>외사<br>활동</th>
+                    <th>공작</th>
+                    <th>검거</th>
+                  </tr>
+                  </thead>
+                  <tbody class="table-group-divider text-center">
+                  <tr>
+                  <td><input class="form-control form-control-sm" id="totalCnt" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm" id="specialCnt" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm" id="middleCnt" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm" id="tongCnt" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm" id="joCnt" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm" id="muCnt" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm" name="fiCnt" type="number"></td>
+                  <td><input class="form-control form-control-sm" id="totalCnt2" type="number" disabled></td>
+                  <td><input class="form-control form-control-sm cntInput" name="faCnt" type="number"></td>
+                  <td><input class="form-control form-control-sm cntInput" name="workCnt" type="number"></td>
+                  <td><input class="form-control form-control-sm cntInput" name="arrestCnt" type="number"></td>
+                  	
+                  </tr>
+                  </tbody>
+                </table>
+            </div>
+    </div>
+    <hr>
+    <div class="row mb-1">
+      <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">외사활동</label>
+      <div class="col-sm-11">
+      	<textarea id="targetLocation" name="foreignAffairs" rows="5" cols="139" ></textarea>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">공작</label>
+      <div class="col-sm-11">
+      	<textarea id="vulnerabilityAnalyze" name="work" rows="5" cols="139" ></textarea>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">외사사범 검거</label>
+      <div class="col-sm-11">
+      	<textarea id="eligibilityAnalyze" name="arrestOffenders" rows="5" cols="139" ></textarea>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">분석 및 평가</label>
+      <div class="col-sm-11">
+      	<textarea id="focusCollection" name="analysisEvaluation" rows="5" cols="139"></textarea>
+      </div>
+    </div>
+    <div class="row mb-1">
+      <label for="hashTags" class="col-sm-1 col-form-label col-form-label-sm text-center">대책</label>
+      <div class="col-sm-11">
+      	<textarea id="focusCollection" name="measures" rows="5" cols="139"></textarea>
+      </div>
+    </div>
+
+  </form>
+</div>
+<div class="modal-footer justify-content-between bg-light">
+<div class="col-auto">
+  <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>
+</div>
+<div class="col-auto">
+  <button type="button" class="btn btn-warning" id="saveTempBtn">임시저장</button>
+  <button type="button" class="btn btn-primary" id="saveBtn">저장</button>
+</div>
+</div>