견문관리 요청사항 반영

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 {
+public class UnlawfulFishing2Controller {
-  private final UnlawfulFishingService unlawfulFishingService;
+  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<Integer> yearList = unlawfulFishingService.selectFishingBoatYearParam();
+    List<Integer> yearList = unlawfulFishing2Service.selectFishingBoatYearParam();
     if(!yearList.contains(params.getYear())){
       yearList.add(params.getYear());
     }

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;
 

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,

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();

src/main/resources/templates/igActivities/fpiMgt/affair/affairMgt.html

@@ -150,7 +150,7 @@
                     <th>관서</th>
                     <th>부서</th>
                     <th>작성자</th>
-                    <th>작성일시</th>
+                    <th>보고일자</th>
                     <th>첨부파일</th>
                     <th>상태</th>
                     <th>평가</th>
@@ -194,7 +194,7 @@
                       </th:block>
                     </td>
                     <td th:text="${affair.wrtUserNm}"></td>
-                    <td th:text="${#temporals.format(affair.wrtDt, 'yyyy-MM-dd HH:mm')}"></td>
+                    <td th:text="${#temporals.format(affair.reportDt, 'yyyy-MM-dd')}"></td>
                     <td th:text="${affair.fileCnt eq null?'파일 없음':#strings.concat(affair.fileCnt,' 건')}"></td>
                     <td>
                       <th:block th:each="code:${session.commonCode.get('DST')}">