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 615b98f6..54234037 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 @@ -1,6 +1,7 @@ package com.dbnt.faisp.main.fpiMgt.intelligenceNetwork; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyze; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.model.IntelligenceAnalyzeApprv; @@ -17,8 +18,10 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartHttpServletRequest; import org.springframework.web.servlet.ModelAndView; +import javax.servlet.http.HttpSession; import java.time.LocalDateTime; import java.util.List; +import java.util.Map; @RestController @RequiredArgsConstructor @@ -153,6 +156,8 @@ public class IntelligenceNetworkController { @PostMapping("/operationPlanStateChange") public Integer operationPlanStateChange(@AuthenticationPrincipal UserInfo loginUser, OperationPlanApprv 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()); @@ -473,4 +478,12 @@ public class IntelligenceNetworkController { intelligenceNetworkService.deleteFireExtensionReport(feReport.getFerKey()); } + + @GetMapping("/operationPlanJson") + public OperationPlan operationPlanJson(OperationPlan plan, HttpSession session){ + Map> codeMap = (Map>) session.getAttribute("commonCode"); + plan = intelligenceNetworkService.selectOperationPlan(plan.getOpKey()); + plan = intelligenceNetworkService.getPrintTypePlan(plan, codeMap); + return plan; + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlanApprv.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlanApprv.java index d5b347fb..af55a196 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlanApprv.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/intelligenceNetwork/model/OperationPlanApprv.java @@ -27,6 +27,10 @@ public class OperationPlanApprv { 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 44425f7b..e17bfc90 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 @@ -3,6 +3,7 @@ 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.codeMgt.model.CodeMgt; 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.IntelligenceAnalyzeApprv; @@ -22,6 +23,7 @@ import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanAp import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanFileRepository; import com.dbnt.faisp.main.fpiMgt.intelligenceNetwork.repository.OperationPlanRepository; import com.dbnt.faisp.main.userInfo.service.UserAlarmService; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -29,6 +31,7 @@ import org.springframework.web.multipart.MultipartFile; import java.io.File; import java.util.List; +import java.util.Map; import java.util.UUID; @Service @@ -261,4 +264,15 @@ public class IntelligenceNetworkService extends BaseService { public void deleteFireExtensionReport(Integer ferKey) { fireExtensionReportRepository.bulkModifyingByFerKeyToFerState(ferKey, "DST008"); } + + public OperationPlan getPrintTypePlan(OperationPlan plan, Map> codeMap) { + plan.setWrtPart(Utils.searchCodeValue(plan.getWrtPart(), codeMap.get(plan.getWrtOrgan()))); + plan.setWrtOrgan(Utils.searchCodeValue(plan.getWrtOrgan(), codeMap.get("OG"))); + plan.setWrtUserGrd(Utils.searchCodeValue(plan.getWrtUserGrd(), codeMap.get("JT"))); + OperationPlanApprv apprv = plan.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 plan; + } } diff --git a/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js b/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js new file mode 100644 index 00000000..bb7ccaf8 --- /dev/null +++ b/src/main/resources/static/js/igActivities/intelligenceNetwork/inPrint.js @@ -0,0 +1,34 @@ +$(document).on('click', '#planPrintBtn', function (){ + $.ajax({ + url: '/intelligenceNetwork/operationPlanJson', + type: 'GET', + data: {opKey: $(this).attr('data-opkey')}, + dataType:"json", + success: function(data){ + const plan = makePlanPrintData(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 = "operationPlan"; + 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.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; + return data; +} \ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html index 36983e6a..75f5afc5 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanList.html @@ -4,6 +4,7 @@ layout:decorate="~{layout/layout}"> +
@@ -172,5 +173,11 @@
+
+
+ + +
+
\ No newline at end of file diff --git a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html index 1c34b1a0..c6f162a3 100644 --- a/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html +++ b/src/main/resources/templates/igActivities/intelligenceNetwork/operationPlanViewModal.html @@ -153,6 +153,9 @@
+ + +