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 54234037..95f2705b 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 @@ -310,6 +310,8 @@ public class IntelligenceNetworkController { @PostMapping("/intelligenceAnalyzeChange") public Integer intelligenceAnalyzeChange(@AuthenticationPrincipal UserInfo loginUser, IntelligenceAnalyzeApprv 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()); @@ -486,4 +488,12 @@ public class IntelligenceNetworkController { plan = intelligenceNetworkService.getPrintTypePlan(plan, codeMap); return plan; } + @GetMapping("/intelligenceAnalyzeJson") + public IntelligenceAnalyze intelligenceAnalyzeJson(IntelligenceAnalyze analyze, HttpSession session){ + Map> codeMap = (Map>) session.getAttribute("commonCode"); + analyze = intelligenceNetworkService.selectIntelligenceAnalyze(analyze); + analyze.setApprvList(intelligenceNetworkService.selectIntelligenceAnalyzeApprv(analyze)); + analyze = intelligenceNetworkService.getPrintTypeIntelligenceAnalyze(analyze, codeMap); + return analyze; + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java index d1eb630e..e33efac3 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/IntelligenceAnalyzeApprv.java @@ -27,6 +27,10 @@ public class IntelligenceAnalyzeApprv { 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") 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 e17bfc90..e0d46820 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 @@ -275,4 +275,15 @@ public class IntelligenceNetworkService extends BaseService { apprv.setUserGrd(Utils.searchCodeValue(apprv.getUserGrd(), codeMap.get("JT"))); return plan; } + + public IntelligenceAnalyze getPrintTypeIntelligenceAnalyze(IntelligenceAnalyze analyze, Map> codeMap) { + analyze.setWrtPart(Utils.searchCodeValue(analyze.getWrtPart(), codeMap.get(analyze.getWrtOrgan()))); + analyze.setWrtOrgan(Utils.searchCodeValue(analyze.getWrtOrgan(), codeMap.get("OG"))); + analyze.setWrtUserGrd(Utils.searchCodeValue(analyze.getWrtUserGrd(), codeMap.get("JT"))); + IntelligenceAnalyzeApprv apprv = analyze.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 analyze; + } } diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js index bb7ccaf8..7a0e73c2 100644 --- a/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js @@ -24,11 +24,50 @@ $(document).on('click', '#planPrintBtn', function (){ }); }) +$(document).on('click', '#analyzePrintBtn', function (){ + $.ajax({ + url: '/intelligenceNetwork/intelligenceAnalyzeJson', + type: 'GET', + data: {iaKey: $(this).attr('data-iakey')}, + dataType:"json", + success: function(data){ + const plan = makeAnalyzePrintData(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 = "intelligenceAnalyze"; + form.json.value = JSON.stringify(plan); + form.method = "post"; + form.submit(); + }, + error:function(e){ + ajaxErrorAction(e); + } + }); +}) + function makePlanPrintData(data){ - data.wrtDt = data.wrtDt.replace("T", " ").substring(0, 15); + data.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16); data.wrtPart = data.wrtOrgan+" "+data.wrtPart; - data.headPart = data.apprvList[0].ogCd+" "+data.apprvList[0].ofcCd; - data.headGrd = data.apprvList[0].userGrd; - data.headNm = data.apprvList[0].userNm; + const apprv = data.apprvList[0]; + data.headPart = apprv.ogCd+" "+apprv.ofcCd; + data.headGrd = apprv.userGrd; + data.headNm = apprv.userNm; + return data; +} + +function makeAnalyzePrintData(data){ + data.wrtDt = data.wrtDt.replace("T", " ").substring(0, 16); + data.wrtPart = data.wrtOrgan+" "+data.wrtPart; + 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; } \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html index 90db43e6..3d11568f 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/analyzeList.html @@ -4,6 +4,7 @@ layout:decorate="~{layout/layout}"> +
@@ -184,5 +185,11 @@
+
+
+ + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html index c999fd28..8383e500 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/intelligenceAnalyzeViewModal.html @@ -196,6 +196,9 @@
+ + +