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 6bf3e437..45901c27 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 @@ -286,7 +286,10 @@ public class ResultController { // 첩보수집활동 > 외사경찰 견문관 } bundleMap.put("planBoard", planBoardList); bundleMap.put("affairBoard", affairBoardList); - bundleMap.put("resultBoard", resultService.getPrintTypeResultBoard(resultBoard, codeMap)); + resultBoard = resultService.getPrintTypeResultBoard(resultBoard, codeMap); + List resultBoardList = new ArrayList<>(); + resultBoardList.add(resultBoard); + bundleMap.put("resultBoard", resultBoardList); return bundleMap; } diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java index 9cb888b3..50f87c98 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/model/ResultToPlan.java @@ -13,7 +13,7 @@ import java.io.Serializable; @NoArgsConstructor @DynamicInsert @DynamicUpdate -@Table(name = "result_info") +@Table(name = "result_to_plan") @IdClass(ResultToPlan.ResultToPlanId.class) public class ResultToPlan { @Id diff --git a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java index 94c11b8c..f7f367f1 100644 --- a/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java +++ b/src/main/java/com/dbnt/faisp/main/fpiMgt/affairResult/service/ResultService.java @@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import java.io.File; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.UUID; diff --git a/src/main/resources/static/js/igActivities/fpiMgt/print.js b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js similarity index 64% rename from src/main/resources/static/js/igActivities/fpiMgt/print.js rename to src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js index eb0c0024..285511d3 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/print.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js @@ -1,49 +1,11 @@ -$(document).on('click', '#printBtn', function (){ +$(document).on('click', '#planPrintBtn', function (){ $.ajax({ url: '/affairPlan/planBoardJson', type: 'GET', data: {planKey: $(this).attr('data-plankey')}, dataType:"json", success: function(data){ - const plan = {}; - plan.contentTitle = data.contentTitle; - plan.planDt = data.planDt; - plan.wrtOrgan = data.wrtOrgan; - plan.wrtPart = data.wrtPart; - plan.wrtUserGrd = data.wrtUserGrd; - plan.wrtUserNm = data.wrtUserNm; - for(let i=0; i - +
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html index 7876ed22..8a2acd26 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairViewModal.html @@ -335,7 +335,7 @@