외사첩보망 > 해고연장보고 인쇄기능 추가.

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

@@ -468,6 +468,8 @@ public class IntelligenceNetworkController {
   @PostMapping("/fireExtensionReportStateChange")
   public Integer fireExtensionReportStateChange(@AuthenticationPrincipal UserInfo loginUser, FireExtensionReportApprv apprv){
     apprv.setUserSeq(loginUser.getUserSeq());
+    apprv.setOgCd(loginUser.getOgCd());
+    apprv.setOfcCd(loginUser.getOfcCd());
     apprv.setUserGrd(loginUser.getTitleCd());
     apprv.setUserNm(loginUser.getUserNm());
     apprv.setSaveDt(LocalDateTime.now());
@@ -496,4 +498,11 @@ public class IntelligenceNetworkController {
     analyze = intelligenceNetworkService.getPrintTypeIntelligenceAnalyze(analyze, codeMap);
     return analyze;
   }
+  @GetMapping("/fireExtensionReportJson")
+  public FireExtensionReport fireExtensionReportJson(FireExtensionReport fer, HttpSession session){
+    Map<String, List<CodeMgt>> codeMap = (Map<String, List<CodeMgt>>) session.getAttribute("commonCode");
+    fer = intelligenceNetworkService.selectFireExtensionReportInfo(fer);
+    fer = intelligenceNetworkService.getPrintTypeFireExtensionReport(fer, codeMap);
+    return fer;
+  }
 }

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

@@ -27,6 +27,10 @@ public class FireExtensionReportApprv {
   private String state;
   @Column(name = "user_seq")
   private Integer userSeq;
+  @Column(name = "og_cd")
+  private String ogCd;
+  @Column(name = "ofc_cd")
+  private String ofcCd;
   @Column(name = "user_grd")
   private String userGrd;
   @Column(name = "user_nm")

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

@@ -286,4 +286,15 @@ public class IntelligenceNetworkService extends BaseService {
     apprv.setUserGrd(Utils.searchCodeValue(apprv.getUserGrd(), codeMap.get("JT")));
     return analyze;
   }
+
+  public FireExtensionReport getPrintTypeFireExtensionReport(FireExtensionReport fer, Map<String, List<CodeMgt>> codeMap) {
+    fer.setWrtPart(Utils.searchCodeValue(fer.getWrtPart(), codeMap.get(fer.getWrtOrgan())));
+    fer.setWrtOrgan(Utils.searchCodeValue(fer.getWrtOrgan(), codeMap.get("OG")));
+    fer.setWrtUserGrd(Utils.searchCodeValue(fer.getWrtUserGrd(), codeMap.get("JT")));
+    FireExtensionReportApprv apprv = fer.getApprvList().get(0);
+    apprv.setOfcCd(Utils.searchCodeValue(apprv.getOfcCd(), codeMap.get(apprv.getOgCd())));
+    apprv.setOgCd(Utils.searchCodeValue(apprv.getOgCd(), codeMap.get("OG")));
+    apprv.setUserGrd(Utils.searchCodeValue(apprv.getUserGrd(), codeMap.get("JT")));
+    return fer;
+  }
 }

src/main/resources/application-dev.properties

@@ -14,6 +14,7 @@ site.domain=http://localhost:8080
 clipReport.print.url=http://118.219.150.34:50570/ClipReport5
 search.engine.default=http://118.219.150.34:7577
 search.engine.suggest=http://118.219.150.34:7614
+
 #file
 file.dir.publicBoard=/publicBoard
 file.dir.faRpt=/faRpt

src/main/resources/application-was1.properties

@@ -19,6 +19,8 @@ spring.servlet.multipart.max-request-size=500MB
 
 site.domain=10.187.58.12
 clipReport.print.url=http://10.187.58.47:8085/ClipReport5
+search.engine.default=http://10.187.58.47:7577
+search.engine.suggest=http://10.187.58.47:7614
 
 #file
 file.dir.publicBoard=/publicBoard

src/main/resources/application-was2.properties

@@ -19,6 +19,8 @@ spring.servlet.multipart.max-request-size=500MB
 
 site.domain=10.187.58.12
 clipReport.print.url=http://10.187.58.48:8085/ClipReport5
+search.engine.default=http://10.187.58.48:7577
+search.engine.suggest=http://10.187.58.48:7614
 
 #file
 file.dir.publicBoard=/publicBoard

src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js

@@ -31,7 +31,7 @@ $(document).on('click', '#analyzePrintBtn', function (){
     data: {iaKey: $(this).attr('data-iakey')},
     dataType:"json",
     success: function(data){
-      const plan = makeAnalyzePrintData(data);
+      const analyze = makeAnalyzePrintData(data);
       var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp";
       var title = "분석평가서 인쇄";
       var status = "width=900px,height=800px,scrollbars=yes";
@@ -40,7 +40,33 @@ $(document).on('click', '#analyzePrintBtn', function (){
       form.target = title;
       form.action = url;
       form.crfName.value = "intelligenceAnalyze";
-      form.json.value = JSON.stringify(plan);
+      form.json.value = JSON.stringify(analyze);
+      form.method = "post";
+      form.submit();
+    },
+    error:function(e){
+      ajaxErrorAction(e);
+    }
+  });
+})
+
+$(document).on('click', '#ferPrintBtn', function (){
+  $.ajax({
+    url: '/intelligenceNetwork/fireExtensionReportJson',
+    type: 'GET',
+    data: {ferKey: $(this).attr('data-ferkey')},
+    dataType:"json",
+    success: function(data){
+      const fer = makeFerPrintData(data);
+      var url = $("#printUrl").attr("data-printurl")+"/singlePrint.jsp";
+      var title = "해고연장보고 인쇄";
+      var status = "width=900px,height=800px,scrollbars=yes";
+      window.open("", title, status);
+      const form = $("#printForm")[0];
+      form.target = title;
+      form.action = url;
+      form.crfName.value = "fireExtension";
+      form.json.value = JSON.stringify(fer);
       form.method = "post";
       form.submit();
     },
@@ -51,23 +77,101 @@ $(document).on('click', '#analyzePrintBtn', function (){
 })
 
 function makePlanPrintData(data){
-  data.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16);
-  data.wrtPart = data.wrtOrgan+" "+data.wrtPart;
+  const plan = {};
+  plan.opName = data.opName;
+  plan.opBirth = data.opBirth;
+  plan.opCareer = data.opCareer;
+  plan.opEtc = data.opEtc;
+  plan.opJob = data.opJob;
+  plan.opPhone = data.opPhone;
+  plan.opPosition = data.opPosition;
+  plan.opRank = data.opRank;
+  plan.opAddress = data.opAddress;
+  plan.opSdate = data.opSdate;
+  plan.targetLocation = data.targetLocation;
+  plan.vulnerabilityAnalyze = data.vulnerabilityAnalyze;
+  plan.eligibilityAnalyze = data.vulnerabilityAnalyze;
+  plan.focusCollection = data.focusCollection;
+
+  plan.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16);
+  plan.wrtPart = data.wrtOrgan+" "+data.wrtPart;
+  plan.wrtUserGrd = data.wrtUserGrd;
+  plan.wrtUserNm = data.wrtUserNm;
+
   const apprv = data.apprvList[0];
-  data.headPart = apprv.ogCd+" "+apprv.ofcCd;
-  data.headGrd = apprv.userGrd;
-  data.headNm = apprv.userNm;
-  return data;
+  plan.headPart = apprv.ogCd+" "+apprv.ofcCd;
+  plan.headGrd = apprv.userGrd;
+  plan.headNm = apprv.userNm;
+  return plan;
 }
 
 function makeAnalyzePrintData(data){
-  data.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16);
-  data.wrtPart = data.wrtOrgan+" "+data.wrtPart;
+  const analyze = {};
+  analyze.iaSdate = data.iaSdate;
+  analyze.iaEdate = data.iaEdate;
+  analyze.fiCnt = data.fiCnt;
+  analyze.faCnt = data.faCnt;
+  analyze.workCnt = data.workCnt;
+  analyze.arrestCnt = data.arrestCnt;
+  analyze.totalCnt = data.totalCnt
+  analyze.specialCnt = data.specialCnt;
+  analyze.middleCnt = data.middleCnt;
+  analyze.tongCnt = data.tongCnt;
+  analyze.joCnt = data.joCnt;
+  analyze.muCnt = data.muCnt;
+  analyze.iaTotal = data.iaTotal;
+  analyze.foreignAffairs = data.foreignAffairs;
+  analyze.work = data.work;
+  analyze.arrestOffenders = data.arrestOffenders;
+  analyze.analysisEvaluation = data.analysisEvaluation;
+  analyze.measures = data.measures;
+
+  analyze.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16);
+  analyze.wrtPart = data.wrtOrgan+" "+data.wrtPart;
+  analyze.wrtUserGrd = data.wrtUserGrd;
+  analyze.wrtUserNm = data.wrtUserNm;
+
   const apprv = data.apprvList[0];
-  data.opinion = apprv.opinion;
-  data.instruction = apprv.instruction;
-  data.headPart = apprv.ogCd+" "+apprv.ofcCd;
-  data.headGrd = apprv.userGrd;
-  data.headNm = apprv.userNm;
-  return data;
+  analyze.opinion = apprv.opinion;
+  analyze.instruction = apprv.instruction;
+  analyze.headPart = apprv.ogCd+" "+apprv.ofcCd;
+  analyze.headGrd = apprv.userGrd;
+  analyze.headNm = apprv.userNm;
+  return analyze;
+}
+
+function makeFerPrintData(data){
+  const fer = {
+    opEdate : data.opEdate,
+    allocationAmount : data.allocationAmount,
+    executionAmount: data.executionAmount,
+    note: data.note,
+    fireExtensionReason: data.fireExtensionReason,
+    performanceEvaluation: data.performanceEvaluation,
+    actionOpinion: data.actionOpinion,
+
+    wrtDt : data.wrtDt.replace("T", " ").substring(0, 16),
+    wrtPart : data.wrtOrgan+" "+data.wrtPart,
+    wrtUserGrd : data.wrtUserGrd,
+    wrtUserNm : data.wrtUserNm
+  };
+
+
+  const apprv = data.apprvList[0];
+  fer.headPart = apprv.ogCd+" "+apprv.ofcCd;
+  fer.headGrd = apprv.userGrd;
+  fer.headNm = apprv.userNm;
+
+  const plan = data.operationPlan;
+  fer.opName = plan.opName;
+  fer.opBirth = plan.opBirth;
+  fer.opCareer = plan.opCareer;
+  fer.opEtc = plan.opEtc;
+  fer.opJob = plan.opJob;
+  fer.opPhone = plan.opPhone;
+  fer.opPosition = plan.opPosition;
+  fer.opAddress = plan.opAddress;
+  fer.opRank = plan.opRank;
+  fer.opSdate = plan.opSdate;
+  return fer;
 }

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

@@ -4,6 +4,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/igActivities/intelligenceNetwork/fireExtensionReport.js}"></script>
+  <script type="text/javascript" th:src="@{/js/igActivities/intelligenceNetwork/inPrint.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
@@ -187,5 +188,11 @@
       </div>
     </div>
   </div>
+  <div class="d-none">
+    <form id="printForm">
+      <input type="hidden" name="crfName">
+      <input type="hidden" name="json">
+    </form>
+  </div>
 </div>
 </html>

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

@@ -131,6 +131,9 @@
     </th:block>
   </div>
   <div class="col-auto">
+    <th:block th:if="${fer.ferState eq 'DST006'}">
+      <button type="button" class="btn btn-secondary" id="ferPrintBtn" th:data-ferkey="${fer.ferKey}">인쇄</button>
+    </th:block>
     <th:block th:if="${fer.wrtOrgan eq viewOrgan}">
       <th:block th:if="${(#strings.contains(apprvAuth, 'APC003') or #strings.contains(apprvAuth, 'APC004')) and fer.ferState eq 'DST002'}">
         <!--계장, 계장대행 결재권한이 있으면서 결재대기상태-->