감염병 관리현황 수정.

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

@@ -53,6 +53,7 @@ public class AsfCovController {
       asfCov.setWrtUserNm(loginUser.getUserNm());
       asfCov.setWrtDt(LocalDateTime.now());
     }
+    mav.addObject("downOrganList", loginUser.getDownOrganCdList());
     mav.addObject("asfCov", asfCov);
     mav.addObject("userSeq", loginUser.getUserSeq());
 

src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/service/AsfCovService.java

@@ -3,10 +3,12 @@ package com.dbnt.faisp.main.faStatistics.unlawfulFishing.service;
 import com.dbnt.faisp.config.BaseService;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.mapper.AsfCovMapper;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.asfCov.AsfCov;
+import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownInfo;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.crackdownStatus.CrackdownStatus;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.model.fishingBoat.FishingBoat;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.AsfCovRepository;
 
+import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.CrackdownInfoRepository;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.CrackdownStatusRepository;
 import com.dbnt.faisp.main.faStatistics.unlawfulFishing.repository.FishingBoatRepository;
 import lombok.RequiredArgsConstructor;
@@ -23,7 +25,7 @@ public class AsfCovService extends BaseService {
 
     private final AsfCovMapper asfCovMapper;
     private final AsfCovRepository asfCovRepository;
-    private final CrackdownStatusRepository crackdownStatusRepository;
+    private final CrackdownInfoRepository cdiRepository;
     private final FishingBoatRepository fishingBoatRepository;
 
     public List<AsfCov> selectAsfCovList(AsfCov asfCov){
@@ -36,11 +38,7 @@ public class AsfCovService extends BaseService {
 
     public AsfCov selectAsfCov(Integer asfCovKey) {
         AsfCov asfCov= asfCovRepository.findTop1ByAsfCovKeyOrderByVersionNoDesc(asfCovKey).orElse(null);
-        CrackdownStatus cs = crackdownStatusRepository.findByCdsKey(asfCov.getCdsKey()).orElse(null);
+        CrackdownInfo cs = cdiRepository.findByCdsKey(asfCov.getCdsKey()).orElse(null);
-        FishingBoat fb = fishingBoatRepository.findByCdsKey(asfCov.getCdsKey()).orElse(null);
-        if(fb!=null){
-            asfCov.setBoatNameKr(fb.getBoatNameKr());
-        }
         if(cs!=null){
             asfCov.setCaseNum(cs.getCaseNum());
             asfCov.setCaseAgency(cs.getCaseAgency());

src/main/resources/mybatisMapper/AsfCovMapper.xml

@@ -27,10 +27,10 @@
                 AND boat_name_kr LIKE CONCAT('%', #{boatNameKr}, '%')
             </if>
             <if test='wrtOrgan != null and wrtOrgan != ""'>
-                and wrt_organ = #{wrtOrgan}
+                and a.wrt_organ = #{wrtOrgan}
             </if>
             <if test="wrtUserNm != null and wrtUserNm != ''">
-                AND wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%')
+                AND a.wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%')
             </if>
 
         </where>
@@ -65,15 +65,12 @@
         , fb.boat_name_kr
         , fb.boat_name_cn
         , fb.status
-
         FROM asfcov_status a
             inner join (select asfcov_key, max(version_no) as lastVersion
                         from asfcov_status
                         group by asfcov_key) b on a.asfcov_key = b.asfcov_key and a.version_no = b.lastVersion
-            INNER JOIN crackdown_status cs
+            INNER JOIN crackdown_info cs ON a.cds_key = cs.cds_key
-                ON a.cds_key = cs.cds_key
+            INNER JOIN illegal_ship_info fb ON a.cds_key = fb.cds_key
-            INNER JOIN fishing_boat fb
-                ON a.cds_key = fb.cds_key
        <include refid="selectAsfCovListWhere"></include>
         order by a.asfcov_key desc
         limit #{rowCnt} offset #{firstIndex}
@@ -82,8 +79,11 @@
     <select id="selectAsfCovListCnt" resultType="int" parameterType="AsfCov">
         select count(*)
         from asfcov_status a
-        INNER JOIN fishing_boat fb
+            inner join (select asfcov_key, max(version_no) as lastVersion
-        ON a.cds_key = fb.cds_key
+                        from asfcov_status
+                        group by asfcov_key) b on a.asfcov_key = b.asfcov_key and a.version_no = b.lastVersion
+            INNER JOIN crackdown_info cs ON a.cds_key = cs.cds_key
+            INNER JOIN illegal_ship_info fb ON a.cds_key = fb.cds_key
         <include refid="selectAsfCovListWhere"></include>
     </select>
 

src/main/resources/static/js/faStatistics/asfCov.js

@@ -177,43 +177,6 @@ $(document).on('click', '#asfCovDownExcel', function (){
   exportExcel('감염병 관련 조치현황', 'asfCovTable');
 });
 
-$(document).on('click', '#caseNumBtn', function (){
-  const cdsKey = $("#cdsKey").val();
-  $.ajax({
-    url: $("#modalUrl").val(),
-    data : $("#modalSearchForm").serialize(),
-    type: 'GET',
-    contentType: false,
-    dataType:"html",
-    success: function(html){
-      $("#subModalBody").empty().append(html);
-      if(cdsKey != ""){
-        $(".crackdownChkbox[value="+cdsKey+"]").prop("checked", true);
-      }
-      $("#asfCovSubModal").modal('show');
-    },
-    error:function(e){
-      ajaxErrorAction(e);
-    }
-  });
-})
-
-$(document).on('click', '#getCrackdownBtn', function (){
-  getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key"));
-  const tr= $(".crackdownChkbox:checked").parents(".crackdownTr")
-  $(".cdsInfo").removeAttr("disable")
-  $("#cdsKey").val(tr.attr("data-key"))
-  $("#boatNameKr").val(tr.find(".boatNameKr").val())
-  $("#caseNum").val(tr.find(".caseNum").val())
-  $("#caseAgency").val(tr.find(".caseAgencyNm").val())
-  $("#casePoliceOfficer").val(tr.find(".casePoliceOfficer").val())
-  $("#crackdownPolice").val(tr.find(".crackdownPolice").val())
-  $("#crackdownBoat").val(tr.find(".crackdownBoat").val())
-  $("#asfCovSubModal").modal('hide');
-  $(".cdsInfo").attr("disable", "disable")
-})
-
-
 $(function(){
   const searchFormBoat = $("#searchFormBoat")
   if(searchFormBoat.val()!==""){

src/main/resources/static/js/faStatistics/unlawfulFishing/cdiSelectModal.js

@@ -14,6 +14,13 @@ $(document).on('click', '#cdiSelectBtn', function (){
     const modalBody = $(".modal-body")
     modalBody.find("#cdsKey").val(selectedCheckbox.attr('data-cdskey'))
     modalBody.find("#caseNum").val(selectedCheckbox.attr('data-casenum'))
+    if($("#menuKey").val() === "45"){
+      const tr = selectedCheckbox.parents(".cdiTr");
+      modalBody.find("#caseAgency").val(tr.find(".caseAgency").attr("data-caseagency"))
+      modalBody.find("#casePoliceOfficer").val(tr.find(".casePoliceOfficer")[0].innerText)
+      modalBody.find("#crackdownPolice").val(tr.find(".crackdownPolice").attr("data-crackdownpolice"))
+      modalBody.find("#crackdownBoat").val(tr.find(".crackdownBoat").attr("data-crackdownboat"))
+    }
     $("#cdiSelectModal").modal('hide');
   }else{
     alert("대상을 선택해주세요.")

src/main/resources/templates/faStatistics/asfCov/asfCov.html

@@ -5,6 +5,7 @@
       layout:decorate="~{layout/layout}">
 <th:block layout:fragment="script">
   <script type="text/javascript" th:src="@{/js/faStatistics/asfCov.js}"></script>
+  <script type="text/javascript" th:src="@{/js/faStatistics/unlawfulFishing/cdiSelectModal.js}"></script>
 </th:block>
 <div layout:fragment="content">
   <main>
@@ -23,17 +24,7 @@
         <div class="card-body">
           <form method="get" th:action="@{/faStatistics/asfCov}">
             <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
-            <div class="row justify-content-between py-1">
+            <div class="row justify-content-end py-1">
-              <div class="col-auto">
-                <div>
-<!--                  <select class="form-select form-select-sm" name="year">-->
-<!--                    <option value="">연도</option>-->
-<!--                    <th:block th:each="year : ${#numbers.sequence(2020, 2030)}">-->
-<!--                      <option th:value="${year}" th:text="${year}" th:selected="${searchParams.year eq #strings.toString(year)}"></option>-->
-<!--                    </th:block>-->
-<!--                  </select>-->
-                </div>
-              </div>
               <div class="col-8">
                 <div class="row">
                   <div class="col-11">
@@ -41,9 +32,11 @@
                       <div class="col-2">
                         <select class="form-select form-select-sm" name="caseAgency">
                           <option value="">사건담당경찰서</option>
-                          <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
+                          <th:block th:each="organ:${session.commonCode.get('OG')}">
-                            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
+                            <th:block th:if="${organ.useChk eq 'T' and #lists.contains(mgtOrganList, organ.itemCd)}">
-                                    th:selected="${commonCode.itemCd eq searchParams.caseAgency}"></option>
+                              <option th:value="${organ.itemCd}" th:text="${organ.itemValue}"
+                                      th:selected="${organ.itemCd eq searchParams.caseAgency}"></option>
+                            </th:block>
                           </th:block>
                         </select>
                       </div>
@@ -176,14 +169,13 @@
         </div>
       </div>
     </div>
-  </main>
+    <div class="modal fade" id="asfCovEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovEditModalLabel" aria-hidden="true">
-  <div class="modal fade" id="asfCovEditModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovEditModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-xl modal-dialog-scrollable">
-    <div class="modal-dialog modal-xl modal-dialog-scrollable">
+        <div class="modal-content" id="asfCovEditModalContent">
-      <div class="modal-content" id="asfCovEditModalContent">
 
+        </div>
       </div>
     </div>
-  </div>
     <div class="modal fade" id="asfCovViewModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="asfCovViewModalLabel" aria-hidden="true">
       <div class="modal-dialog modal-xl modal-dialog-scrollable">
         <div class="modal-content" id="asfCovViewModalContent">
@@ -211,11 +203,18 @@
           </div>
           <div class="modal-footer bg-light">
             <button type="button" class="btn btn-primary" id="getCrackdownBtn">불러오기</button>
-<!--            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
+  <!--            <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">닫기</button>-->
           </div>
         </div>
       </div>
     </div>
+    <div class="modal fade" id="cdiSelectModal" data-bs-backdrop="static" data-bs-keyboard="false" tabindex="-1" aria-labelledby="cdiSelectModalLabel" aria-hidden="true">
+      <div class="modal-dialog modal-xxl modal-dialog-scrollable">
+        <div class="modal-content" id="cdiSelectModalContent">
 
+        </div>
+      </div>
+    </div>
+  </main>
 </div>
 </html>

src/main/resources/templates/faStatistics/asfCov/asfCovEditModal.html

@@ -10,7 +10,6 @@
     <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}"/>
     <input type="hidden" name="asfCovKey" th:value="${asfCov.asfCovKey}">
     <input type="hidden" name="versionNo" th:value="${asfCov.versionNo}">
-    <input type="hidden" name="cdsKey" id="cdsKey" th:value="${asfCov.cdsKey}">
     <input type="hidden" name="wrtOrgan" th:value="${asfCov.wrtOrgan}">
     <input type="hidden" name="wrtPart" th:value="${asfCov.wrtPart}">
     <input type="hidden" name="wrtUserSeq" th:value="${asfCov.wrtUserSeq}">
@@ -36,33 +35,31 @@
       </div>
     </div>
     <div class="row mb-1">
-      <label for="boatNameKr" class="col-sm-1 col-form-label col-form-label-sm text-center">선명</label>
+      <!--한 사건번호에 여러 어선이 등록되므로 어선 칸 삭제.-->
+      <!--<label for="boatNameKr" 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 cdsInfo" id="boatNameKr" name="boatNameKr"  th:value="${asfCov.boatNameKr}" disabled>
-      </div>
+      </div>-->
       <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
       <div class="col-sm-2">
         <div class="input-group">
+          <input type="hidden" name="cdsKey" id="cdsKey" th:value="${asfCov.cdsKey}">
           <input type="text" class="form-control form-control-sm cdsInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}" disabled>
-          <input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="caseNumBtn" value="불러오기">
+          <input type="button" class="btn btn-sm btn-outline-primary crackdownStatusInfo w-auto" id="selectCrackdownInfoBtn" value="불러오기">
         </div>
       </div>
-      <label for="caseNum" class="col-sm-2 col-form-label  text-center">*사건번호로 불러와주세요</label>
     </div>
     <div class="row mb-1">
       <label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center ps-0 pe-0">사건담당경찰서</label>
       <div class="col-sm-2">
-      <th:block th:if="${asfCov.asfCovKey eq null}">
-      <input type="text" class="form-control form-control-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
-      </th:block>
-      <th:block th:unless="${asfCov.asfCovKey eq null}">
         <select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
           <option value=""></option>
-          <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
+          <th:block th:each="organ:${session.commonCode.get('OG')}">
-            <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.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 asfCov.caseAgency}"></option>
+            </th:block>
           </th:block>
         </select>
-      </th:block>
       </div>
       <label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center ps-0 pe-0">사건담당경찰관</label>
       <div class="col-sm-2">

src/main/resources/templates/faStatistics/asfCov/asfCovViewModal.html

@@ -28,40 +28,42 @@
           <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성일시</label>
           <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(asfCov.wrtDt, 'yyyy-MM-dd HH:mm')}"></label>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건번호</label>
-          <label class="col-sm-8 col-form-label col-form-label-sm text-start" th:text="${asfCov.caseNum}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.caseNum}"></label>
+          <div class="col-sm-6"></div>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">작성자</label>
           <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.wrtUserNm}"></label>
         </div>
         <hr class="my-1">
         <div class="row mb-1">
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">선명</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold fs-11">사건담당경찰서</label>
-          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.boatNameKr}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속함정</label>
+            <th:block th:each="code:${session.commonCode.get('OG')}">
-          <th:block th:unless="${#strings.isEmpty(asfCov.crackdownBoat)}">
+              <th:block th:if="${asfCov.caseAgency eq code.itemCd}" th:text="${code.itemValue}"></th:block>
-            <th:block th:each="code:${session.commonCode.get(asfCov.crackdownPolice)}">
-              <label class="col-sm-2 col-form-label col-form-label-sm text-start"  th:if="${asfCov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></td>
             </th:block>
-          </th:block>
+          </label>
-        </div>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold fs-11">사건담당경찰관</label>
-        <hr class="my-1">
-        <div class="row mb-1">
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰서</label>
-          <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
-            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.caseAgency eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
-          </th:block>
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">사건담당경찰관</label>
           <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.casePoliceOfficer}"></label>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속경찰서</label>
-          <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start">
-            <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:if="${asfCov.crackdownPolice eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></label>
+            <th:block th:each="code:${session.commonCode.get('CPO')}">
-          </th:block>
+              <th:block th:if="${asfCov.crackdownPolice eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+            </th:block>
+          </label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">단속함정</label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start">
+            <th:block th:unless="${#strings.isEmpty(asfCov.crackdownBoat)}">
+              <th:block th:each="code:${session.commonCode.get(asfCov.crackdownPolice)}">
+                <th:block th:if="${asfCov.crackdownBoat eq code.itemCd}" th:text="${code.itemValue}"></th:block>
+              </th:block>
+            </th:block>
+          </label>
         </div>
         <hr class="my-1">
         <div class="row mb-1">
-          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">전용부두 압송여부</label>
+          <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">전용부두<br/>압송여부</label>
-          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedYn}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedYn eq 'Y'?'압송':'미압송'}"></label>
           <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">미압송시</label>
-          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedN}"></label>
+          <label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${asfCov.pressurizedN eq 'A'?'현장조사':'기타'}"></label>
         </div>
         <div class="row mb-1">
           <label class="col-sm-1 col-form-label col-form-label-sm text-center fw-bold">검사인원</label>

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

@@ -111,18 +111,18 @@
                       <div th:if="${!#strings.isEmpty(cdi.napoSeaPointLon) or !#strings.isEmpty(cdi.napoSeaPointLon)}" th:text="${#strings.concat(cdi.napoSeaPointLon, cdi.napoSeaPointLat)}"></div>
                       <div th:text="${cdi.napoSeaPointDetail}"></div>
                     </td>
-                    <td>
+                    <td class="caseAgency" th:data-caseagency="${cdi.caseAgency}">
                       <th:block th:each="code:${session.commonCode.get('OG')}">
                         <th:block th:if="${code.itemCd eq cdi.caseAgency}" th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </td>
-                    <td th:text="${cdi.casePoliceOfficer}"></td>
+                    <td class="casePoliceOfficer" th:text="${cdi.casePoliceOfficer}"></td>
-                    <td>
+                    <td class="crackdownPolice" th:data-crackdownpolice="${cdi.crackdownPolice}">
                       <th:block th:each="code:${session.commonCode.get('CPO')}">
                         <th:block th:if="${code.itemCd eq cdi.crackdownPolice}" th:text="${code.itemValue}"></th:block>
                       </th:block>
                     </td>
-                    <td>
+                    <td class="crackdownBoat" th:data-crackdownboat="${cdi.crackdownBoat}">
                       <th:block th:each="code:${session.commonCode.get(cdi.crackdownPolice)}">
                         <th:block th:if="${code.itemCd eq cdi.crackdownBoat}" th:text="${code.itemValue}"></th:block>
                       </th:block>