diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java index df4a4074..102cf0a7 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/ResultController.java @@ -1,23 +1,24 @@ package com.dbnt.faisp.main.fpiMgt.affairResult; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; +import com.dbnt.faisp.main.codeMgt.model.CodeMgt; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.fpiMgt.affair.model.AffairBoard; import com.dbnt.faisp.main.fpiMgt.affair.service.AffairService; -import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultApprv; -import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultBoard; -import com.dbnt.faisp.main.fpiMgt.affairResult.model.ClearInfo; -import com.dbnt.faisp.main.fpiMgt.affairResult.model.ResultInfo; +import com.dbnt.faisp.main.fpiMgt.affairResult.model.*; import com.dbnt.faisp.main.fpiMgt.affairResult.service.ResultService; import com.dbnt.faisp.main.userInfo.model.UserInfo; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; 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 @@ -170,6 +171,7 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 resultBoard.setWrtOrgan(loginUser.getOgCd()); resultBoard.setWrtPart(loginUser.getOfcCd()); resultBoard.setWrtUserSeq(loginUser.getUserSeq()); + resultBoard.setWrtUserGrd(loginUser.getTitleCd()); resultBoard.setWrtUserNm(loginUser.getUserNm()); resultBoard.setWrtDt(LocalDateTime.now()); } @@ -237,4 +239,31 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 mav.addObject("info", info); return mav; } + + @GetMapping("/resultBoardJson") + public ResultBoard resultBoardJson(ResultBoard resultBoard, HttpSession session){ + Map> codeMap = (Map>) session.getAttribute("commonCode"); + resultBoard = resultService.selectResultBoard(resultBoard.getResultKey()); + resultBoard.setWrtPart(Utils.searchCodeValue(resultBoard.getWrtPart(), codeMap.get(resultBoard.getWrtOrgan()))); + resultBoard.setWrtOrgan(Utils.searchCodeValue(resultBoard.getWrtOrgan(), codeMap.get("OG"))); + resultBoard.setWrtUserGrd(Utils.searchCodeValue(resultBoard.getWrtUserGrd(), codeMap.get("JT"))); + for(ClearInfo info: resultBoard.getClearInfoList()){ + info.setUseCatg(Utils.searchCodeValue(info.getUseCatg(), codeMap.get("RIC"))); + info.setUseDetail(Utils.searchCodeValue(info.getUseDetail(), codeMap.get("RID"))); + } + for(ResultApprv apprv: resultBoard.getApprvList()){ + if(apprv.getState().equals("DST004")){ + resultBoard.setSectionApprv(apprv.getUserNm()); + }else if(apprv.getState().equals("DST006")){ + resultBoard.setHeadApprv(apprv.getUserNm()); + } + } + for(AffairBoard affair: resultBoard.getAffairBoardList()){ + affair.setAffairRate(Utils.searchCodeValue(affair.getAffairRate(), codeMap.get("AAR"))+(affair.getOrganUp().equals("T")?"(상보)":"")); + } + for(ResultFile file: resultBoard.getFileList()){ + file.setOrigNm(file.getOrigNm()+"."+file.getFileExtn()); + } + return resultBoard; + } } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java index 5a689046..04973f0f 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultBoard.java @@ -88,4 +88,9 @@ public class ResultBoard extends BaseModel { private List affairList; @Transient private List affairBoardList; + + @Transient + private String sectionApprv; + @Transient + private String headApprv; } diff --git a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js index 7d4f4ad9..592ff348 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/affair/affairMgt.js @@ -233,14 +233,15 @@ $(document).on('click', '#printBtn', function (){ data: {affairKey: $(this).attr('data-affairkey')}, dataType:"json", success: function(data){ - var url = $("#printUrl").attr("data-printurl")+"/affairBoard.jsp"; + 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.affair.value = JSON.stringify(data); + form.crfName.value = "affairBoard"; + form.json.value = JSON.stringify(data); form.method = "post"; form.submit(); }, diff --git a/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js index be538ba7..a5b7ab9e 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/plan/planMgt.js @@ -149,14 +149,15 @@ $(document).on('click', '#printBtn', function (){ } plan.fileList = fileList; - var url = $("#printUrl").attr("data-printurl")+"/planBoard.jsp"; + 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.plan.value = JSON.stringify(plan); + form.crfName.value = "planBoard"; + form.json.value = JSON.stringify(plan); form.method = "post"; form.submit(); }, diff --git a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js index 1f1a6642..eec40d4c 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/result/resultMgt.js @@ -203,14 +203,20 @@ $(document).on('click', '#printBtn', function (){ data: {resultKey: $(this).attr('data-resultkey')}, dataType:"json", success: function(data){ - var url = $("#printUrl").attr("data-printurl")+"/resultBoard.jsp"; + data.planPrice = priceNumberToKorean(data.planPrice); + data.usePrice = priceNumberToKorean(data.usePrice); + for(let i=0; i 0) { + const mod = Math.floor(price % (division * unit) / division); + if(mod) { + const modToArray = mod.toString().split(''); + const modLength = modToArray.length - 1; + const toKorean = modToArray.reduce((a, v, i) => { + a+= `${koreanNumber[v*1]}${tenUnit[modLength - i]}`; + return a; + }, ''); + answer = `${toKorean}${tenThousandUnit[index]} `+ answer; + } + division = Math.pow(unit, ++index); + } + return "壹金 "+answer+"원 整 (￦ "+price.toLocaleString('ko-KR')+")"; +} + function getResultViewModal(resultKey){ $.ajax({ url: '/affairResult/resultViewModal', diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index a21b3abe..11da732f 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -309,7 +309,8 @@
- + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html index 63fe9c5d..f5e80131 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairPlan/planMgt.html @@ -196,7 +196,8 @@
- + +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html index 833c860b..14f3111d 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affairResult/resultEditModal.html @@ -11,6 +11,7 @@ +