From 2af6670c38d78b1f5ee5900aba1a41b5ca54dbec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Tue, 23 May 2023 10:51:56 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EB=AC=B8=EA=B4=80=EB=A6=AC=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ngController.java => UnlawfulFishing2Controller.java} | 9 ++++----- ...lFishingService.java => UnlawfulFishing2Service.java} | 2 +- src/main/resources/mybatisMapper/AffairMapper.xml | 1 + .../resources/static/js/igActivities/fpiMgt/fpiPrint.js | 2 ++ .../templates/igActivities/fpiMgt/affair/affairMgt.html | 4 ++-- 5 files changed, 10 insertions(+), 8 deletions(-) rename src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/{UnlawfulFishingController.java => UnlawfulFishing2Controller.java} (87%) rename src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/{UnlawfulFishingService.java => UnlawfulFishing2Service.java} (93%) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishing2Controller.java similarity index 87% rename from src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishing2Controller.java index cbd2c67a..7436a80e 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishing2Controller.java @@ -3,9 +3,8 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing; import com.dbnt.faisp.main.authMgt.service.AuthMgtService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.UnlawfulFishingParam; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CSStatistics; -import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatus; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.crackdownStatus.CrackdownStatusDTO; -import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishingService; +import com.dbnt.faisp.main.faStatistics.unlawfulFishing.service.UnlawfulFishing2Service; import com.dbnt.faisp.main.userInfo.model.UserInfo; import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; @@ -21,8 +20,8 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping("/unlawfulFishing") -public class UnlawfulFishingController { - private final UnlawfulFishingService unlawfulFishingService; +public class UnlawfulFishing2Controller { + private final UnlawfulFishing2Service unlawfulFishing2Service; private final AuthMgtService authMgtService; @GetMapping("/crackdownStatus") @@ -35,7 +34,7 @@ public class UnlawfulFishingController { if(params.getYear()==null){ params.setYear(LocalDateTime.now().getYear()); } - List yearList = unlawfulFishingService.selectFishingBoatYearParam(); + List yearList = unlawfulFishing2Service.selectFishingBoatYearParam(); if(!yearList.contains(params.getYear())){ yearList.add(params.getYear()); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishing2Service.java similarity index 93% rename from src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java rename to src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishing2Service.java index a427ef56..e68d2b2b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishingService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/UnlawfulFishing2Service.java @@ -9,7 +9,7 @@ import java.util.List; @Service @RequiredArgsConstructor -public class UnlawfulFishingService { +public class UnlawfulFishing2Service { private final UnlawfulFishingMapper unlawfulFishingMapper; diff --git a/src/main/resources/mybatisMapper/AffairMapper.xml b/src/main/resources/mybatisMapper/AffairMapper.xml index 9e5f5a40..d8d7932d 100644 --- a/src/main/resources/mybatisMapper/AffairMapper.xml +++ b/src/main/resources/mybatisMapper/AffairMapper.xml @@ -108,6 +108,7 @@ a.wrt_user_nm, a.wrt_user_seq, a.wrt_dt, + a.report_dt, b.fileCnt, c.rating_organ, c.affair_status, diff --git a/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js index e6af1ffa..fa063c4a 100644 --- a/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js +++ b/src/main/resources/static/js/igActivities/fpiMgt/fpiPrint.js @@ -41,6 +41,8 @@ $(document).on('click', '#affairPrintBtn', function (){ form.target = title; form.action = url; form.crfName.value = "affairBoard"; + data.wrtDt = data.reportDt; + debugger form.json.value = JSON.stringify(data); form.method = "post"; form.submit(); diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html index f022cef7..b955e2a5 100644 --- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html +++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html @@ -150,7 +150,7 @@ 관서 부서 작성자 - 작성일시 + 보고일자 첨부파일 상태 평가 @@ -194,7 +194,7 @@ - +