불법조업외국어선 검색조건, 권한별 목록 조회 수정.

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java

@@ -36,6 +36,12 @@ public class UnlawfulFishingController {
     AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/crackdownInfo").get(0);
     mav.addObject("menuKey", accessConfig.getMenuKey());
     mav.addObject("accessAuth", accessConfig.getAccessAuth());
+    params.setAccessAuth(accessConfig.getAccessAuth());
+    if(accessConfig.getAccessAuth().equals("ACC003")){
+      params.setDownOrganCdList(loginUser.getDownOrganCdList());
+    }else{
+      params.setViewOrgan(loginUser.getOgCd());
+    }
     params.setQueryInfo();
     mav.addObject("crackdownInfoList", unlawfulFishingService.selectCrackdownInfoList(params));
     params.setContentCnt(unlawfulFishingService.selectCrackdownInfoListCnt(params));
@@ -57,6 +63,7 @@ public class UnlawfulFishingController {
       crackdownInfo.setWrtUserNm(loginUser.getUserNm());
       crackdownInfo.setWrtDt(LocalDateTime.now());
     }
+    mav.addObject("downOrganList", loginUser.getDownOrganCdList());
     mav.addObject("crackdownInfo", crackdownInfo);
     return mav;
   }
@@ -99,6 +106,13 @@ public class UnlawfulFishingController {
   @GetMapping("/cdiSelectModal")
   public ModelAndView crackdownInfoSelectModal(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){
     ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/crackdownInfo/cdiSelectModal");
+    AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/crackdownInfo").get(0);
+    params.setAccessAuth(accessConfig.getAccessAuth());
+    if(accessConfig.getAccessAuth().equals("ACC003")){
+      params.setDownOrganCdList(loginUser.getDownOrganCdList());
+    }else{
+      params.setViewOrgan(loginUser.getOgCd());
+    }
     params.setQueryInfo();
     mav.addObject("crackdownInfoList", unlawfulFishingService.selectCrackdownInfoList(params));
     params.setContentCnt(unlawfulFishingService.selectCrackdownInfoListCnt(params));
@@ -115,6 +129,12 @@ public class UnlawfulFishingController {
     AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/illegalShipInfo").get(0);
     mav.addObject("menuKey", accessConfig.getMenuKey());
     mav.addObject("accessAuth", accessConfig.getAccessAuth());
+    params.setAccessAuth(accessConfig.getAccessAuth());
+    if(accessConfig.getAccessAuth().equals("ACC003")){
+      params.setDownOrganCdList(loginUser.getDownOrganCdList());
+    }else{
+      params.setViewOrgan(loginUser.getOgCd());
+    }
     params.setQueryInfo();
     mav.addObject("illegalShipInfoList", unlawfulFishingService.selectIllegalShipInfoList(params));
     params.setContentCnt(unlawfulFishingService.selectIllegalShipInfoListCnt(params));
@@ -176,7 +196,17 @@ public class UnlawfulFishingController {
   @GetMapping("/isiSelectModal")
   public ModelAndView illegalShipInfoSelectModal(@AuthenticationPrincipal UserInfo loginUser, UnlawfulFishingParam params){
     ModelAndView mav = new ModelAndView("faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal");
+    AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/illegalShipInfo").get(0);
+    params.setAccessAuth(accessConfig.getAccessAuth());
+    if(accessConfig.getAccessAuth().equals("ACC003")){
+      params.setDownOrganCdList(loginUser.getDownOrganCdList());
+    }else{
+      params.setViewOrgan(loginUser.getOgCd());
+    }
+    params.setQueryInfo();
     mav.addObject("illegalShipInfoList", unlawfulFishingService.selectIllegalShipInfoList(params));
+    params.setContentCnt(unlawfulFishingService.selectIllegalShipInfoListCnt(params));
+    params.setPaginationInfo();
     mav.addObject("searchParams", params);
     return mav;
   }
@@ -188,6 +218,12 @@ public class UnlawfulFishingController {
     AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/shipProcessInfo").get(0);
     mav.addObject("menuKey", accessConfig.getMenuKey());
     mav.addObject("accessAuth", accessConfig.getAccessAuth());
+    params.setAccessAuth(accessConfig.getAccessAuth());
+    if(accessConfig.getAccessAuth().equals("ACC003")){
+      params.setDownOrganCdList(loginUser.getDownOrganCdList());
+    }else{
+      params.setViewOrgan(loginUser.getOgCd());
+    }
     params.setQueryInfo();
     mav.addObject("shipProcessInfoList", unlawfulFishingService.selectShipProcessInfoList(params));
     params.setContentCnt(unlawfulFishingService.selectShipProcessInfoListCnt(params));
@@ -258,6 +294,12 @@ public class UnlawfulFishingController {
     AccessConfig accessConfig = authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/unlawfulFishing/illegalShipSailor").get(0);
     mav.addObject("menuKey", accessConfig.getMenuKey());
     mav.addObject("accessAuth", accessConfig.getAccessAuth());
+    params.setAccessAuth(accessConfig.getAccessAuth());
+    if(accessConfig.getAccessAuth().equals("ACC003")){
+      params.setDownOrganCdList(loginUser.getDownOrganCdList());
+    }else{
+      params.setViewOrgan(loginUser.getOgCd());
+    }
     params.setQueryInfo();
     mav.addObject("sailorList", unlawfulFishingService.selectIllegalShipSailorList(params));
     params.setContentCnt(unlawfulFishingService.selectIllegalShipSailorListCnt(params));

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java

@@ -5,36 +5,59 @@ import com.dbnt.faisp.config.BaseModel;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDate;
 import java.util.List;
 
 @Getter
 @Setter
 @NoArgsConstructor
 public class UnlawfulFishingParam  extends BaseModel {
-
+  /*공통*/
-  private String caseNum;
+  private String viewOrgan;
-  private String permitNum;
+  /*단속현황*/
-  private String boatNny;
-  private String boatName;
-  private String boatMaterial;
-  private String fisheryType;
-
-
-  private Integer year;
-  private Integer month;
   private String caseAgency;
   private String casePoliceOfficer;
   private String crackdownPolice;
   private String crackdownBoat;
+  private String caseNum;
+  private String mmsi;
   private String napoPoint;
+  /*어선정보*/
+  private String boatName;
+  private String boatMaterial;
+  private String fisheryType;
+  private String permitNum;
+  private String boatNny;
+  /*처리현황*/
+  private String isIvsgtStop;
+  private String sentencingCourt;
+  private String sentencingDetail;
+  /*선원*/
+  private String sailorName;
+  private String processStatus;
+  private String position;
+  private String career;
+  @DateTimeFormat(pattern = "yyyy-MM-dd")
+  private LocalDate birthdate;
+  private Integer arrestHistory;
+  private Integer heterogeneousCriminalHistory;
+  private Integer similarCriminalHistory;
+
+
+
+
+
+
+
+  private Integer year;
+  private Integer month;
   private Double tonMin;
   private Double tonMax;
   private List<String> violationList;
-  private String processStatus;
   private String napoSeaPointDetail;
   private String nll;
-  private String mmsi;
   private String distance;
   private String isDamboUnpaidAmount;
   private String isEvictionDt;
@@ -73,7 +96,5 @@ public class UnlawfulFishingParam  extends BaseModel {
   private String seniorRestriction;
   private String normalRestriction;
 
-  private String sentencingCourt;
-  private String sentencingDetail;
   private String executionDetail;
 }

src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml

@@ -100,6 +100,17 @@
         and wrt_dt <= #{endDate}::date
       </if>
     </if>
+    <choose>
+      <when test='accessAuth == "ACC003"'>
+        and case_agency in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
+      </when>
+      <otherwise>
+        and case_agency = #{viewOrgan}
+      </otherwise>
+    </choose>
   </sql>
 
 
@@ -130,6 +141,7 @@
   <select id="selectIllegalShipInfoListCnt" resultType="int" parameterType="UnlawfulFishingParam">
     select count(*)
     from illegal_ship_info a
+          left outer join crackdown_info b on a.cds_key = b.cds_key
     <include refid="selectIllegalShipInfoListWhere"></include>
   </select>
   <sql id="selectIllegalShipInfoListWhere">
@@ -152,22 +164,35 @@
       <if test='fisheryType != null and fisheryType != ""'>
         and a.fishery_type = #{fisheryType}
       </if>
-      <if test='dateSelector == "paymentDt"'>
+      <choose>
+        <when test='dateSelector == "paymentDt"'>
           <if test='startDate != null and startDate != ""'>
             and a.payment_payment_dt >= #{startDate}::date
           </if>
           <if test='endDate != null and endDate != ""'>
             and a.payment_payment_dt &lt;= #{endDate}::date+1
           </if>
-      </if>
+        </when>
-      <if test='dateSelector == "wrtDt"'>
+        <when test='dateSelector == "wrtDt"'>
           <if test='startDate != null and startDate != ""'>
             and a.wrt_dt >= #{startDate}::date
           </if>
           <if test='endDate != null and endDate != ""'>
             and a.wrt_dt &lt;= #{endDate}::date+1
           </if>
-      </if>
+        </when>
+      </choose>
+      <choose>
+        <when test='accessAuth == "ACC003"'>
+          and b.case_agency in
+          <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+            #{organCd}
+          </foreach>
+        </when>
+        <otherwise>
+          and b.case_agency = #{viewOrgan}
+        </otherwise>
+      </choose>
   </sql>
 
   <select id="selectShipProcessInfoList" resultType="ShipProcessInfo" parameterType="UnlawfulFishingParam">
@@ -200,6 +225,53 @@
   </select>
   <sql id="selectShipProcessInfoListWhere">
     where a.status &lt;> 'DST008'
+    <if test='caseNum != null and caseNum != ""'>
+      and c.case_num like '%'||#{caseNum}||'%'
+    </if>
+    <if test='boatName != null and boatName != ""'>
+      and (b.boat_name_kr like '%'||#{boatName}||'%' or b.boat_name_cn like '%'||#{boatName}||'%')
+    </if>
+    <if test='processStatus != null and processStatus != ""'>
+      and a.process_status = #{processStatus}
+    </if>
+    <if test='isIvsgtStop != null and isIvsgtStop != ""'>
+      and a.is_ivsgt_stop = #{isIvsgtStop}
+    </if>
+    <if test='sentencingCourt != null and sentencingCourt != ""'>
+      and a.sentencing_court like '%'||#{sentencingCourt}||'%'
+    </if>
+    <if test='sentencingDetail != null and sentencingDetail != ""'>
+      and a.sentencing_detail like '%'||#{sentencingDetail}||'%'
+    </if>
+    <choose>
+      <when test='dateSelector == "napoDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and c.napo_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and c.napo_dt &lt;= #{endDate}::date
+        </if>
+      </when>
+      <when test='dateSelector == "wrtDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and a.wrt_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and a.wrt_dt &lt;= #{endDate}::date+1
+        </if>
+      </when>
+    </choose>
+    <choose>
+      <when test='accessAuth == "ACC003"'>
+        and c.case_agency in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
+      </when>
+      <otherwise>
+        and c.case_agency = #{viewOrgan}
+      </otherwise>
+    </choose>
   </sql>
 
   <select id="selectIllegalShipSailorList" resultType="IllegalShipSailor" parameterType="UnlawfulFishingParam">
@@ -223,7 +295,7 @@
         inner join illegal_ship_info isi on iss.fb_key = isi.fb_key
         inner join crackdown_info ci on isi.cds_key = ci.cds_key
     <include refid="selectIllegalShipSailorListWhere"></include>
-    order by a.wrt_dt desc
+    order by iss.wrt_dt desc
     limit #{rowCnt} offset #{firstIndex}
   </select>
 
@@ -237,5 +309,61 @@
 
   <sql id="selectIllegalShipSailorListWhere">
     where iss.status &lt;> 'DST008'
+    <if test='caseNum != null and caseNum != ""'>
+      and ci.case_num like '%'||#{caseNum}||'%'
+    </if>
+    <if test='boatName != null and boatName != ""'>
+      and (isi.boat_name_kr like '%'||#{boatName}||'%'
+        or isi.boat_name_cn like '%'||#{boatName}||'%')
+    </if>
+    <if test='sailorName != null and sailorName != ""'>
+      and (iss.sailorName_kr like '%'||#{sailorName}||'%'
+        or iss.sailorName_cn like '%'||#{sailorName}||'%')
+    </if>
+    <if test='position != null and position != ""'>
+      and iss.position = #{position}
+    </if>
+    <if test='career != null and career != ""'>
+      and iss.career = #{career}
+    </if>
+    <if test='similarCriminalHistory != null and similarCriminalHistory != ""'>
+      and iss.similar_criminal_history = #{similarCriminalHistory}
+    </if>
+    <if test='heterogeneousCriminalHistory != null and heterogeneousCriminalHistory != ""'>
+      and iss.heterogeneous_criminal_history = #{heterogeneousCriminalHistory}
+    </if>
+    <if test='arrestHistory != null and arrestHistory != ""'>
+      and iss.arrest_history = #{arrestHistory}
+    </if>
+
+    <choose>
+      <when test='dateSelector == "birthdate"'>
+        <if test='startDate != null and startDate != ""'>
+          and iss.birthdate >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and iss.birthdate &lt;= #{endDate}::date
+        </if>
+      </when>
+      <when test='dateSelector == "wrtDt"'>
+        <if test='startDate != null and startDate != ""'>
+          and iss.wrt_dt >= #{startDate}::date
+        </if>
+        <if test='endDate != null and endDate != ""'>
+          and iss.wrt_dt &lt;= #{endDate}::date+1
+        </if>
+      </when>
+    </choose>
+    <choose>
+      <when test='accessAuth == "ACC003"'>
+        and ci.case_agency in
+        <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
+          #{organCd}
+        </foreach>
+      </when>
+      <otherwise>
+        and ci.case_agency = #{viewOrgan}
+      </otherwise>
+    </choose>
   </sql>
 </mapper>

src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html

@@ -61,8 +61,10 @@
       <div class="col-sm-2">
         <select class="form-select form-select-sm" id="caseAgency" name="caseAgency">
           <option value="">선택</option>
-          <th:block th:each="code:${session.commonCode.get('OG')}">
+          <th:block th:each="organ:${session.commonCode.get('OG')}">
-            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq crackdownInfo.caseAgency}"></option>
+            <th:block th:if="${organ.useChk eq 'T' and #lists.contains(downOrganList, organ.itemCd)}">
+              <option th:value="${organ.itemCd}" th:text="${organ.itemValue}" th:selected="${organ.itemCd eq crackdownInfo.caseAgency}"></option>
+            </th:block>
           </th:block>
         </select>
       </div>

src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html

@@ -44,7 +44,7 @@
                         </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" name="casePoliceOfficer" placeholder="사건담당경찰관">
+                        <input type="text" class="form-control form-control-sm" name="casePoliceOfficer" placeholder="사건담당경찰관" th:value="${searchParams.casePoliceOfficer}">
                       </div>
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">
@@ -66,13 +66,13 @@
                     </div>
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호">
+                        <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" name="mmsi" placeholder="MMSI.NO">
+                        <input type="text" class="form-control form-control-sm" name="mmsi" placeholder="MMSI.NO" th:value="${searchParams.mmsi}">
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" name="napoPoint" placeholder="나포장소">
+                        <input type="text" class="form-control form-control-sm" name="napoPoint" placeholder="나포장소" th:value="${searchParams.napoPoint}">
                       </div>
                       <div class="col-4">
                         <div class="input-group w-auto input-daterange" id="dateSelectorDiv">

src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html

@@ -36,52 +36,67 @@
                   <div class="col-11">
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <select class="form-select form-select-sm " id="caseAgency" name="caseAgency">
+                        <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
-                          <option value="">사건담당경찰서</option>
+                      </div>
-                          <th:block th:each="code:${session.commonCode.get('OG')}">
+                      <div class="col-2">
-                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                        <input type="text" class="form-control form-control-sm" name="boatName" placeholder="어선명" th:value="${searchParams.boatName}">
-                                    th:selected="${code.itemCd eq searchParams.caseAgency}"></option>
+                      </div>
+                      <div class="col-2">
+                        <input type="text" class="form-control form-control-sm" name="sailorName" placeholder="선원명" th:value="${searchParams.sailorName}">
+                      </div>
+                      <div class="col-2">
+                        <select class="form-select form-select-sm" name="position">
+                          <option value="">선박직책</option>
+                          <th:block th:each="code:${session.commonCode.get('POS')}">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.position}"></option>
                           </th:block>
                         </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="사건담당경찰관">
+                        <select class="form-select form-select-sm" name="career">
-                      </div>
+                          <option value="">승선경력</option>
-                      <div class="col-2">
+                          <th:block th:each="code:${session.commonCode.get('BE')}">
-                        <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.career}"></option>
-                          <option value="">단속경찰서</option>
-                          <th:block th:each="code:${session.commonCode.get('CPO')}">
-                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
-                                    th:selected="${code.itemCd eq searchParams.crackdownPolice}"></option>
-                          </th:block>
-                        </select>
-                      </div>
-                      <div class="col-2">
-                        <select class="form-select form-select-sm" name="crackdownBoat" id="searchFormBoat" disabled>
-                          <option value="">단속함정</option>
-                          <th:block th:each="cpoNum:${#numbers.sequence(1, #lists.size(session.commonCode.get('CPO')))}">
-                            <th:block th:each="code:${session.commonCode.get('CPO'+cpoNum)}">
-                              <option th:class="${code.categoryCd}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.crackdownBoat}" style="display: none;"></option>
-                            </th:block>
                           </th:block>
                         </select>
                       </div>
                     </div>
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="사건번호">
+                        <select class="form-select form-select-sm" name="similarCriminalHistory">
+                          <option value="">동종범죄경력</option>
+                          <option value="1" th:selected="${searchParams.similarCriminalHistory == 1}">1건</option>
+                          <option value="2" th:selected="${searchParams.similarCriminalHistory == 2}">2건</option>
+                          <option value="3" th:selected="${searchParams.similarCriminalHistory == 3}">3건</option>
+                          <option value="4" th:selected="${searchParams.similarCriminalHistory == 4}">4이상</option>
+                          <option value="0" th:selected="${searchParams.similarCriminalHistory == 0}">없음</option>
+                        </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="MMSI.NO">
+                        <select class="form-select form-select-sm" name="heterogeneousCriminalHistory">
+                          <option value="">이종범죄경력</option>
+                          <option value="1" th:selected="${searchParams.heterogeneousCriminalHistory == 1}">1건</option>
+                          <option value="2" th:selected="${searchParams.heterogeneousCriminalHistory == 2}">2건</option>
+                          <option value="3" th:selected="${searchParams.heterogeneousCriminalHistory == 3}">3건</option>
+                          <option value="4" th:selected="${searchParams.heterogeneousCriminalHistory == 4}">4이상</option>
+                          <option value="0" th:selected="${searchParams.heterogeneousCriminalHistory == 0}">없음</option>
+                        </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="나포장소">
+                        <select class="form-select form-select-sm" name="arrestHistory">
+                          <option value="">검거이력</option>
+                          <option value="1" th:selected="${searchParams.arrestHistory == 1}">1건</option>
+                          <option value="2" th:selected="${searchParams.arrestHistory == 2}">2건</option>
+                          <option value="3" th:selected="${searchParams.arrestHistory == 3}">3건</option>
+                          <option value="4" th:selected="${searchParams.arrestHistory == 4}">4이상</option>
+                          <option value="0" th:selected="${searchParams.arrestHistory == 0}">없음</option>
+                        </select>
                       </div>
                       <div class="col-4">
                         <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
                           <select class="form-select form-select-sm w-30" name="dateSelector">
                             <option value="">조건선택</option>
-                            <option value="napoDt" th:selected="${searchParams.dateSelector eq 'napoDt'}">나포일시</option>
+                            <option value="birthdate" th:selected="${searchParams.dateSelector eq 'birthdate'}">생년월일</option>
                             <option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일시</option>
                           </select>
                           <input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">

src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html

@@ -28,7 +28,7 @@
     <div class="row mx-0">
       <div class="col-12 card bg-light text-center">
         <div class="card-body">
-          <form method="get" th:action="@{/faStatistics/shipProcessInfo}" id="cdsSearchForm">
+          <form method="get" th:action="@{/unlawfulFishing/shipProcessInfo}" id="cdsSearchForm">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
             <div class="row justify-content-between py-1">
               <div class="col-auto"></div>
@@ -37,46 +37,33 @@
                   <div class="col-11">
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <select class="form-select form-select-sm " id="caseAgency" name="caseAgency">
+                        <input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
-                          <option value="">사건담당경찰서</option>
+                      </div>
-                          <th:block th:each="code:${session.commonCode.get('OG')}">
+                      <div class="col-2">
-                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
+                        <input type="text" class="form-control form-control-sm" name="boatName" placeholder="어선명" th:value="${searchParams.boatName}">
-                                    th:selected="${code.itemCd eq searchParams.caseAgency}"></option>
+                      </div>
+                      <div class="col-2">
+                        <select class="form-select form-select-sm" name="processStatus">
+                          <option value="">처리현황</option>
+                          <th:block th:each="code:${session.commonCode.get('PR')}">
+                            <option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.processStatus}"></option>
                           </th:block>
                         </select>
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="사건담당경찰관">
+                        <select class="form-select form-select-sm" name="isIvsgtStop">
-                      </div>
+                          <option value="">수사중지여부</option>
-                      <div class="col-2">
+                          <option value="Y" th:selected="${searchParams.isIvsgtStop eq 'Y'}">중지</option>
-                        <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">
+                          <option value="N" th:selected="${searchParams.isIvsgtStop eq 'N'}">수사중</option>
-                          <option value="">단속경찰서</option>
-                          <th:block th:each="code:${session.commonCode.get('CPO')}">
-                            <option th:value="${code.itemCd}" th:text="${code.itemValue}"
-                                    th:selected="${code.itemCd eq searchParams.crackdownPolice}"></option>
-                          </th:block>
-                        </select>
-                      </div>
-                      <div class="col-2">
-                        <select class="form-select form-select-sm" name="crackdownBoat" id="searchFormBoat" disabled>
-                          <option value="">단속함정</option>
-                          <th:block th:each="cpoNum:${#numbers.sequence(1, #lists.size(session.commonCode.get('CPO')))}">
-                            <th:block th:each="code:${session.commonCode.get('CPO'+cpoNum)}">
-                              <option th:class="${code.categoryCd}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.crackdownBoat}" style="display: none;"></option>
-                            </th:block>
-                          </th:block>
                         </select>
                       </div>
                     </div>
                     <div class="row justify-content-end pb-1">
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="사건번호">
+                        <input type="text" class="form-control form-control-sm" placeholder="선고법원" name="sentencingCourt" th:value="${searchParams.sentencingCourt}">
                       </div>
                       <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="MMSI.NO">
+                        <input type="text" class="form-control form-control-sm" placeholder="선고내용" name="sentencingDetail" th:value="${searchParams.sentencingDetail}">
-                      </div>
-                      <div class="col-2">
-                        <input type="text" class="form-control form-control-sm" placeholder="나포장소">
                       </div>
                       <div class="col-4">
                         <div class="input-group w-auto input-daterange" id="dateSelectorDiv">

src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html

@@ -64,7 +64,7 @@
       </div>
       <label for="distance" class="col-sm-1 col-form-label col-form-label-sm text-center">압송거리</label>
       <div class="col-sm-2">
-        <input type="text" class="form-control form-control-sm" id="distance" name="distance" placeholder="해리" th:value="${processInfo.distance}">
+        <input type="text" class="form-control form-control-sm" id="distance" name="distance" placeholder="해리" th:value="${shipProcessInfo.distance}">
       </div>
       <label for="warrantReqTakeDate" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">영장청구 소요시간</label>
       <div class="col-sm-2">