asf 및 코로나19 관련조치사항 3차

master
DESKTOP-QGC5RJO\DBNT 2023-01-12 13:29:13 +09:00
parent 18714e8f71
commit d8d50f7a7d
10 changed files with 186 additions and 378 deletions

View File

@ -10,13 +10,14 @@ import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.processResult.Pro
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.AsfCovService; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.service.AsfCovService;
import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.userInfo.model.UserInfo;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import oracle.jdbc.proxy.annotation.Post;
import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.multipart.MultipartHttpServletRequest;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import java.util.List;
@RestController @RestController
@ -69,6 +70,18 @@ public class AsfCovController {
return mav; return mav;
} }
@PostMapping("/saveContent")
public Integer saveContent (AsfCov asfCov){
return asfCovService.saveContent(asfCov);
}
@PostMapping("/deleteContent")
@ResponseBody
public void deleteContent(@RequestBody AsfCov asfCov){
asfCovService.deleteContent(asfCov);
}
} }

View File

@ -1,7 +1,8 @@
package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper; package com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov;
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus; import com.dbnt.faisp.main.ivsgtMgt.boardInvestigation.model.ArrestType;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import java.util.List; import java.util.List;
@ -10,7 +11,7 @@ import java.util.List;
public interface AsfCovMapper { public interface AsfCovMapper {
List<AsfCov> selectAsfCovList(AsfCov asfCov); List<AsfCov> selectAsfCovList(AsfCov asfCov);
Integer selectAsfCovListCnt(AsfCov asfCov); Integer selectAsfCovListCnt(AsfCov asfCov);
// ArrestType selectArrestType(AsfCov asfCov);
List<AsfCov> selectAsfCovListWhere(AsfCov asfCov); List<AsfCov> selectAsfCovListWhere(AsfCov asfCov);
} }

View File

@ -71,6 +71,9 @@ public class AsfCov extends BaseModel {
@Column(name = "wrt_part") @Column(name = "wrt_part")
private String wrtPart; private String wrtPart;
@Column(name = "content_status")
private String contentStatus;
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////

View File

@ -9,6 +9,6 @@ import java.util.Optional;
public interface AsfCovRepository extends JpaRepository<AsfCov, Integer> { public interface AsfCovRepository extends JpaRepository<AsfCov, Integer> {
// void deleteByAsfCov(Integer asfcovKey); // void deleteByAsfCov(Integer asfCovKey);
} }

View File

@ -4,9 +4,10 @@ import com.dbnt.faisp.config.BaseService;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.AsfCovMapper; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.mapper.AsfCovMapper;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.model.asfCov.AsfCov;
import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.AsfCovRepository; import com.dbnt.faisp.main.faStatistics.crackdownsStatus.repository.AsfCovRepository;
import com.dbnt.faisp.main.ivsgtMgt.majorStatus.model.MajorStatus;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List; import java.util.List;
@ -25,9 +26,23 @@ public class AsfCovService extends BaseService {
return asfCovMapper.selectAsfCovListCnt(asfCov); return asfCovMapper.selectAsfCovListCnt(asfCov);
} }
public AsfCov selectAsfCov(Integer asfcovKey) { public AsfCov selectAsfCov(Integer asfCovKey) {
AsfCov asfCov= asfCovRepository.findById(asfcovKey).orElse(null); AsfCov asfCov= asfCovRepository.findById(asfCovKey).orElse(null);
return asfCov; return asfCov;
} }
@Transactional
public Integer saveContent(AsfCov asfCov) {
Integer asfCovKey = asfCovRepository.save(asfCov).getAsfCovKey();
return asfCovKey;
}
@Transactional
public void deleteContent(AsfCov asfCov){
asfCov=asfCovRepository.findById(asfCov.getAsfCovKey()).orElse(null);
asfCov.setContentStatus("DST008");
}
} }

View File

@ -8,29 +8,34 @@
<sql id="selectAsfCovListWhere"> <sql id="selectAsfCovListWhere">
<where> <where>
a.content_status &lt;> 'DST008' a.content_status &lt;> 'DST008'
<if test='majorType != null and majorType != ""'> <if test='caseNum != null and caseNum != ""'>
and a.major_type = #{majorType} AND case_num = #{caseNum}
</if>
<if test='napoDt != null and napoDt !=""'>
AND napo_dt::DATE = #{napoDt}::DATE
</if>
<if test='caseAgency != null and caseAgency != ""'>
AND case_agency = #{caseAgency}
</if>
<if test='crackdownPolice != null and crackdownPolice != ""'>
AND crackdown_police = #{crackdownPolice}
</if>
<if test='crackdownBoat != null and crackdownBoat != ""'>
AND crackdown_boat = #{crackdownBoat}
</if>
<if test='boatNameKr != null and boatNameKr != ""'>
AND boat_name_kr LIKE CONCAT('%', #{boatNameKr}, '%')
</if> </if>
<if test='wrtOrgan != null and wrtOrgan != ""'> <if test='wrtOrgan != null and wrtOrgan != ""'>
and a.wrt_organ = #{wrtOrgan} and wrt_organ = #{wrtOrgan}
</if>
<if test="contentTitle != null and contentTitle != ''">
AND a.content_title LIKE CONCAT('%', #{contentTitle}, '%')
</if> </if>
<if test="wrtUserNm != null and wrtUserNm != ''"> <if test="wrtUserNm != null and wrtUserNm != ''">
AND a.wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%') AND wrt_user_nm LIKE CONCAT('%', #{wrtUserNm}, '%')
</if> </if>
<if test='startDate != null and startDate != ""'> <!-- and wrt_organ in-->
and a.wrt_dt >= #{startDate}::date <!-- <foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">-->
</if> <!-- #{organCd}-->
<if test='endDate != null and endDate != ""'> <!-- </foreach>-->
and a.wrt_dt &lt;= #{endDate}::date+1
</if>
and a.wrt_organ in
<foreach collection="downOrganCdList" item="organCd" separator="," open="(" close=")">
#{organCd}
</foreach>
</where> </where>
</sql> </sql>
@ -52,6 +57,7 @@
a.wrt_dt, a.wrt_dt,
a.wrt_organ, a.wrt_organ,
a.wrt_part, a.wrt_part,
a.content_status,
cs.cds_key cs.cds_key
, cs.case_num , cs.case_num
, cs.napo_dt , cs.napo_dt
@ -111,14 +117,16 @@
INNER JOIN fishing_boat fb INNER JOIN fishing_boat fb
ON a.cds_key = fb.cds_key ON a.cds_key = fb.cds_key
<!-- <include refid="selectAsfCovListWhere"></include>--> <include refid="selectAsfCovListWhere"></include>
order by a.asfcov_key desc order by a.asfcov_key desc
limit #{rowCnt} offset #{firstIndex} limit #{rowCnt} offset #{firstIndex}
</select> </select>
<select id="selectAsfCovListCnt" resultType="int" parameterType="AsfCov"> <select id="selectAsfCovListCnt" resultType="int" parameterType="AsfCov">
select count(*) select count(*)
from asfcov_status from asfcov_status a
INNER JOIN fishing_boat fb
ON a.cds_key = fb.cds_key
<include refid="selectAsfCovListWhere"></include> <include refid="selectAsfCovListWhere"></include>
</select> </select>

View File

@ -9,32 +9,32 @@ $("#jqueryBtn").click(function(){
$(document).on('click', '#saveBtn', function (){ $(document).on('click', '#saveBtn', function (){
if(confirm("저장하시겠습니까?")){ if(confirm("저장하시겠습니까?")){
if($('#contentTitle').val() == ''){ // if($('#contentTitle').val() == ''){
alert("제목을 입력해주세요."); // alert("제목을 입력해주세요.");
$('#contentTitle').focus(); // $('#contentTitle').focus();
return false; // return false;
} // }
if($('#majorType').val() == ''){ // if($('#majorType').val() == ''){
alert("종류를 선택해주세요."); // alert("종류를 선택해주세요.");
$('#majorType').focus(); // $('#majorType').focus();
return false; // return false;
} // }
saveContent('DST007'); saveContent('DST007');
} }
}) })
$(document).on('click', '#saveTempBtn', function (){ $(document).on('click', '#saveTempBtn', function (){
if(confirm("임시저장 하시겠습니까?")){ if(confirm("임시저장 하시겠습니까?")){
if($('#contentTitle').val() == ''){ // if($('#contentTitle').val() == ''){
alert("제목을 입력해주세요."); // alert("제목을 입력해주세요.");
$('#contentTitle').focus(); // $('#contentTitle').focus();
return false; // return false;
} // }
if($('#majorType').val() == ''){ // if($('#majorType').val() == ''){
alert("종류를 선택해주세요."); // alert("종류를 선택해주세요.");
$('#majorType').focus(); // $('#majorType').focus();
return false; // return false;
} // }
saveContent('DST001'); saveContent('DST001');
} }
}) })
@ -141,19 +141,14 @@ function getViewModal(asfCovKey){
function saveContent(contentStatus){ function saveContent(contentStatus){
const formData = new FormData($("#asfCovEditForm")[0]); const formData = new FormData($("#asfCovEditForm")[0]);
for(const file of files) {
if(!file.isDelete)
formData.append('uploadFiles', file, file.name);
}
$(".text-decoration-line-through").each(function (idx, el){
formData.append('fileSeq', $(el).attr("data-fileseq"));
})
formData.append('contentStatus', contentStatus); formData.append('contentStatus', contentStatus);
formData.append('contentInfo', CrossEditor.GetBodyValue());
$.ajax({ $.ajax({
type : 'POST', type : 'POST',
data : formData, data : formData,
url : "/ivsgt/saveContent", url : "/faStatistics/saveContent",
processData: false, processData: false,
contentType: false, contentType: false,
success : function(result) { success : function(result) {
@ -199,9 +194,22 @@ $(document).on('click', '#caseNumBtn', function (){
$(document).on('click', '#getCrackdownBtn', function (){ $(document).on('click', '#getCrackdownBtn', function (){
getEditModal($(".crackdownChkbox:checked").parents(".crackdownTr").attr("data-key")); 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(".caseAgency").val())
$("#casePoliceOfficer").val(tr.find(".casePoliceOfficer").val())
$("#crackdownPolice").val(tr.find(".crackdownPolice").val())
$("#crackdownBoat").val(tr.find(".crackdownBoat").val())
$("#asfCovSubModal").modal('hide'); $("#asfCovSubModal").modal('hide');
$(".cdsInfo").attr("disable", "disable")
}) })
$(function(){ $(function(){
const searchFormBoat = $("#searchFormBoat") const searchFormBoat = $("#searchFormBoat")
if(searchFormBoat.val()!==""){ if(searchFormBoat.val()!==""){

View File

@ -193,12 +193,12 @@
<tbody class="table-group-divider"> <tbody class="table-group-divider">
<th:block th:each="crackdownStatus:${crackdownList}"> <th:block th:each="crackdownStatus:${crackdownList}">
<tr class="crackdownTr" th:data-key="${crackdownStatus.cdsKey}"> <tr class="crackdownTr" th:data-key="${crackdownStatus.cdsKey}">
<!-- <input type="hidden" name="boatNameKr" th:value="${crackdownStatus.fishingBoat.boatNameKr}">--> <input type="hidden" class="boatNameKr" th:value="${crackdownStatus.fishingBoat.boatNameKr}">
<!-- <input type="hidden" name="caseNum" th:value=" ${crackdownStatus.caseNum}">--> <input type="hidden" class="caseNum" th:value=" ${crackdownStatus.caseNum}">
<!-- <input type="hidden" name="caseAgency" th:value="${crackdownStatus.caseAgency}">--> <input type="hidden" class="caseAgency" th:value="${crackdownStatus.caseAgency}">
<!-- <input type="hidden" name="casePoliceOfficer" th:value="${crackdownStatus.casePoliceOfficer}">--> <input type="hidden" class="casePoliceOfficer" th:value="${crackdownStatus.casePoliceOfficer}">
<!-- <input type="hidden" name="crackdownPolice" th:value="${crackdownStatus.crackdownPolicer}">--> <input type="hidden" class="crackdownPolice" th:value="${crackdownStatus.crackdownPolice}">
<!-- <input type="hidden" name="crackdownBoat" th:value="${crackdownStatus.crackdownBoat}">--> <input type="hidden" class="crackdownBoat" th:value="${crackdownStatus.crackdownBoat}">
<td><input type="checkbox" class="crackdownChkbox"></td> <td><input type="checkbox" class="crackdownChkbox"></td>
<!--<td th:text="${crackdownStatus.cdsKey}"></td>--> <!--<td th:text="${crackdownStatus.cdsKey}"></td>-->
<td th:text="${crackdownStatus.caseNum}"></td> <td th:text="${crackdownStatus.caseNum}"></td>
@ -246,7 +246,7 @@
<td th:if="${crackdownStatus.crackdownBoat eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td> <td th:if="${crackdownStatus.crackdownBoat eq commonCode.itemCd}" th:text="${commonCode.itemValue}"></td>
</th:block> </th:block>
</th:block> </th:block>
<th:block th:if="${!#strings.contains(crackdownStatus.crackdownBoat, 'CPO')}"> <th:block th:if="${crackdownStatus.crackdownBoat eq null or !#strings.contains(crackdownStatus.crackdownBoat, 'CPO')}">
<td></td> <td></td>
</th:block> </th:block>
<td th:text="${crackdownStatus.mmsi}"></td> <td th:text="${crackdownStatus.mmsi}"></td>

View File

@ -17,313 +17,67 @@
<div class="row mx-0"> <div class="row mx-0">
<div class="col-12 card bg-light text-center"> <div class="col-12 card bg-light text-center">
<div class="card-body"> <div class="card-body">
<!-- <form method="get" th:action="@{/faStatistics/crackdownStatus}" id="cdsSearchForm">--> <form method="get" th:action="@{/faStatistics/asfCov}">
<!-- <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">--> <input type="hidden" name="pageIndex" id="pageIndex" th:value="${searchParams.pageIndex}">
<!-- <div class="row justify-content-between py-1">--> <div class="row justify-content-between py-1">
<!-- <div class="col-auto">--> <div class="col-auto">
<!-- <div>--> <div>
<!-- <select class="form-select form-select-sm" name="year">--> <!-- <select class="form-select form-select-sm" name="year">-->
<!-- <option value="">연도</option>--> <!-- <option value="">연도</option>-->
<!-- <th:block th:each="year : ${#numbers.sequence(2020, 2030)}">--> <!-- <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>--> <!-- <option th:value="${year}" th:text="${year}" th:selected="${searchParams.year eq #strings.toString(year)}"></option>-->
<!-- </th:block>--> <!-- </th:block>-->
<!-- </select>--> <!-- </select>-->
<!-- </div>--> </div>
<!-- <div>--> </div>
<!-- <select class="form-select form-select-sm" name="month">--> <div class="col-8">
<!-- <option value="">월</option>--> <div class="row">
<!-- <th:block th:each="month : ${#numbers.sequence(1, 12)}">--> <div class="col-11">
<!-- <option th:value="${month}" th:text="${month}" th:selected="${searchParams.month eq month}"></option>--> <div class="row justify-content-end pb-1">
<!-- </th:block>--> <div class="col-2">
<!-- </select>--> <select class="form-select form-select-sm" name="caseAgency">
<!-- </div>--> <option value="">사건담당기관</option>
<!-- </div>--> <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
<!-- <div class="col-8">--> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
<!-- <div class="row">--> th:selected="${commonCode.itemCd eq searchParams.caseAgency}"></option>
<!-- <div class="col-11">--> </th:block>
<!-- <div class="row justify-content-end pb-1">--> </select>
<!-- <div class="col-2">--> </div>
<!-- <select class="form-select form-select-sm violation" name="violation">--> <div class="col-2">
<!-- <option value="">위반내용</option>--> <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">
<!-- <th:block th:each="commonCode:${session.commonCode.get('VT')}">--> <option value="">단속경찰서</option>
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"--> <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
<!-- th:selected="${commonCode.itemCd eq searchParams.violation}"></option>></option>--> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"
<!-- </th:block>--> th:selected="${commonCode.itemCd eq searchParams.crackdownPolice}"></option>
<!-- </select>--> </th:block>
<!-- </div>--> </select>
<!-- <div class="col-2">--> </div>
<!-- <input class="form-control form-control-sm" name="napoSeaPointDetail" id="napoSeaPointDetail" placeholder="위반장소" th:value="${searchParams.napoSeaPointDetail}">--> <div class="col-2">
<!-- </div>--> <select class="form-select form-select-sm" name="crackdownBoat" id="searchFormBoat" disabled>
<!-- <div class="col-2">--> <option value="">단속함정</option>
<!-- <select class="form-select form-select-sm" name="invasionType">--> <th:block th:each="cpoNum:${#numbers.sequence(1, #lists.size(session.commonCode.get('CPO')))}">
<!-- <option value="">침범유형</option>--> <th:block th:each="code:${session.commonCode.get('CPO'+cpoNum)}">
<!-- <th:block th:each="commonCode:${session.commonCode.get('IST')}">--> <option th:class="${code.categoryCd}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.crackdownBoat}" style="display: none;"></option>
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"--> </th:block>
<!-- th:selected="${commonCode.itemCd eq searchParams.invasionType}"></option>--> </th:block>
<!-- </th:block>--> </select>
<!-- </select>--> </div>
<!-- </div>--> <div class="col-4">
<!-- <div class="col-2">--> <div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<!-- <select class="form-select form-select-sm" name="nll">--> <option value="napoDt" th:selected="${searchParams.dateSelector eq 'napoDt'}">나포일시</option>
<!-- <option value="">NLL</option>--> <input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<!-- <option value="Y" th:selected="${searchParams.nll == 'Y'}">O</option>--> <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">
<!-- <option value="N" th:selected="${searchParams.nll == 'N'}">X</option>--> </div>
<!-- </select>--> </div>
<!-- </div>--> </div>
<!-- <div class="col-2">--> </div>
<!-- <input class="form-control form-control-sm" name="mmsi" id="mmsi" placeholder="MMSI.NO" th:value="${searchParams.mmsi}">--> <div class="col-1 d-grid gap-0">
<!-- </div>--> <input type="submit" class="btn btn-sm btn-primary" id="searchBtn" value="검색">
<!-- <div class="col-2">--> </div>
<!-- <select class="form-select form-select-sm" name="caseAgency">--> </div>
<!-- <option value="">사건담당기관</option>--> </div>
<!-- <th:block th:each="commonCode:${session.commonCode.get('ATA')}">--> </div>
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"--> </form>
<!-- th:selected="${commonCode.itemCd eq searchParams.caseAgency}"></option>-->
<!-- </th:block>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row justify-content-end pb-1">-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="crackdownPolice" id="searchFormPolice">-->
<!-- <option value="">단속경찰서</option>-->
<!-- <th:block th:each="commonCode:${session.commonCode.get('CPO')}">-->
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"-->
<!-- th:selected="${commonCode.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 class="col-2">-->
<!-- <input class="form-control form-control-sm" name="distance" id="distance" placeholder="거리" th:value="${searchParams.distance}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="processStatus" id="processStatus">-->
<!-- <option value="">처리현황</option>-->
<!-- <th:block th:each="commonCode:${session.commonCode.get('PR')}">-->
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"-->
<!-- th:selected="${commonCode.itemCd eq searchParams.processStatus}"></option>-->
<!-- </th:block>-->
<!-- </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="evictionDt" th:selected="${searchParams.dateSelector eq 'evictionDt'}">퇴거일</option>-->
<!-- <option value="directHandoverDt" th:selected="${searchParams.dateSelector eq 'directHandoverDt'}">직접인계일</option>-->
<!-- <option value="consignmentDt" th:selected="${searchParams.dateSelector eq 'consignmentDt'}">위탁일</option>-->
<!-- <option value="confiscationDt" th:selected="${searchParams.dateSelector eq 'confiscationDt'}">몰수확정일</option>-->
<!-- <option value="boatDisposalDt" th:selected="${searchParams.dateSelector eq 'boatDisposalDt'}">폐선일</option>-->
<!-- <option value="returnDt" th:selected="${searchParams.dateSelector eq 'returnDt'}">환부일</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}">-->
<!-- <input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row justify-content-start pb-1 subSearchParam" style="display: none">-->
<!-- <hr class="mb-1">-->
<!-- <label class="col-2 col-form-label col-form-label-sm">처리현황</label>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="isDamboUnpaidAmount" th:value="${searchParams.isDamboUnpaidAmount}">-->
<!-- <option value="">담보금 미납 여부</option>-->
<!-- <option value="Y" th:selected="${searchParams.isDamboUnpaidAmount eq 'Y'}">O</option>-->
<!-- <option value="N" th:selected="${searchParams.isDamboUnpaidAmount eq 'N'}">X</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="isEvictionDt" th:value="${searchParams.isEvictionDt}">-->
<!-- <option value="">퇴거여부</option>-->
<!-- <option value="Y" th:selected="${searchParams.isEvictionDt eq 'Y'}">O</option>-->
<!-- <option value="N" th:selected="${searchParams.isEvictionDt eq 'N'}">X</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="isReturnDt" th:value="${searchParams.isReturnDt}">-->
<!-- <option value="">환부여부</option>-->
<!-- <option value="Y" th:selected="${searchParams.isReturnDt eq 'Y'}">O</option>-->
<!-- <option value="N" th:selected="${searchParams.isReturnDt eq 'N'}">X</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="isConsignmentStartDt" th:value="${searchParams.isConsignmentStartDt}">-->
<!-- <option value="">위탁관리 여부</option>-->
<!-- <option value="Y" th:selected="${searchParams.isConsignmentStartDt eq 'Y'}">O</option>-->
<!-- <option value="N" th:selected="${searchParams.isConsignmentStartDt eq 'N'}">X</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="isConfiscationDt" th:value="${searchParams.isConfiscationDt}">-->
<!-- <option value="">침몰여부</option>-->
<!-- <option value="Y" th:selected="${searchParams.isConfiscationDt eq 'Y'}">O</option>-->
<!-- <option value="N" th:selected="${searchParams.isConfiscationDt eq 'N'}">X</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2"></div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="boatDisposalType" th:value="${searchParams.boatDisposalType}">-->
<!-- <option value="">폐선종류</option>-->
<!-- <th:block th:each="commonCode:${session.commonCode.get('BDT')}">-->
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"-->
<!-- th:selected="${commonCode.itemCd eq searchParams.boatDisposalType}"></option>-->
<!-- </th:block>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="isDirectHandoverDt" th:value="${searchParams.isDirectHandoverDt}">-->
<!-- <option value="">직접인계 여부</option>-->
<!-- <option value="Y" th:selected="${searchParams.isDirectHandoverDt eq 'Y'}">O</option>-->
<!-- <option value="N" th:selected="${searchParams.isDirectHandoverDt eq 'N'}">X</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="handoverSeaPointDetail" id="handoverSeaPointDetail" placeholder="직접인계 해점" th:value="${searchParams.handoverSeaPointDetail}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="handoverBoat" id="handoverBoat" placeholder="인계함정" th:value="${searchParams.handoverBoat}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="middleTakeoverBoat" id="middleTakeoverBoat" placeholder="중측 인수함정" th:value="${searchParams.middleTakeoverBoat}">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row justify-content-start pb-1 subSearchParam" style="display: none">-->
<!-- <hr class="mb-1">-->
<!-- <label class="col-2 col-form-label col-form-label-sm">어선정보</label>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="boatNameKr" id="boatNameKr" placeholder="선명" th:value="${searchParams.boatNameKr}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <div class="input-group">-->
<!-- <input type="number" min="0" class="form-control form-control-sm" name="tonStartCnt" id="tonStartCnt" placeholder="톤수" th:value="${searchParams.tonStartCnt}">-->
<!-- ~<input type="number" min="0" class="form-control form-control-sm" name="tonEndCnt" id="tonEndCnt" placeholder="톤수" th:value="${searchParams.tonEndCnt}">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="boatMaterial" id="boatMaterial">-->
<!-- <option value="">선질</option>-->
<!-- <th:block th:each="commonCode:${session.commonCode.get('BM')}">-->
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"-->
<!-- th:selected="${commonCode.itemCd eq searchParams.boatMaterial}"></option>-->
<!-- </th:block>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="boatNnySung" id="boatNnySung" placeholder="선적 성" th:value="${searchParams.boatNnySung}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="boatNnySi" id="boatNnySi" placeholder="선적 시" th:value="${searchParams.boatNnySi}">-->
<!-- </div>-->
<!-- <div class="col-2"></div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="sailorNameKr" id="sailorNameKr" placeholder="선장명" th:value="${searchParams.sailorNameKr}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="fisheryType" id="fisheryType">-->
<!-- <option value="">선종</option>-->
<!-- <th:block th:each="commonCode:${session.commonCode.get('FT')}">-->
<!-- <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}"-->
<!-- th:selected="${commonCode.itemCd eq searchParams.fisheryType}"></option>-->
<!-- </th:block>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="catchFishSpecies" id="catchFishSpecies" placeholder="어획물 축소기재 어종" th:value="${searchParams.catchFishSpecies}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="offenseFishSpecies" id="offenseFishSpecies" placeholder="범칙물 어종" th:value="${searchParams.offenseFishSpecies}">-->
<!-- </div>-->
<!-- <div class="col-2"></div>-->
<!-- <label class="col-2 col-form-label col-form-label-sm">압수어구</label>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="confiscationFrame" id="confiscationFrame" placeholder="틀" th:value="${searchParams.confiscationFrame}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="confiscationWidth" id="confiscationWidth" placeholder="폭" th:value="${searchParams.confiscationWidth}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="confiscationJo" id="confiscationJo" placeholder="조" th:value="${searchParams.confiscationJo}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="confiscationGae" id="confiscationGae" placeholder="개" th:value="${searchParams.confiscationGae}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="confiscationEtc" id="confiscationEtc" placeholder="기타" th:value="${searchParams.confiscationEtc}">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row justify-content-start pb-1 subSearchParam" style="display: none">-->
<!-- <hr class="mb-1">-->
<!-- <label class="col-2 col-form-label col-form-label-sm">피해내용</label>-->
<!-- <div class="col-2">-->
<!-- <input type="number" min="0" class="form-control form-control-sm" name="obstrExspdCnt" id="obstrExspdCnt" placeholder="인적피해 발생건수" th:value="${searchParams.obstrExspdCnt}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input type="number" min="0" class="form-control form-control-sm" name="personDamageCnt" id="personDamageCnt" placeholder="인적피해 피해인원" th:value="${searchParams.personDamageCnt}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input type="number" min="0" class="form-control form-control-sm" name="personDamageAmount" id="personDamageAmount" placeholder="인적피해 피해액" th:value="${searchParams.personDamageAmount}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="personDamageDetail" id="personDamageDetail" placeholder="인적피해 상세내용" th:value="${searchParams.personDamageDetail}">-->
<!-- </div>-->
<!-- <div class="col-2"></div>-->
<!-- <div class="col-2"></div>-->
<!-- <div class="col-2">-->
<!-- <input type="number" min="0" class="form-control form-control-sm" name="materialDamageCnt" id="materialDamageCnt" placeholder="물적피해 발생건수" th:value="${searchParams.materialDamageCnt}">-->
<!-- </div>-->
<!-- <div class="col-2"></div>-->
<!-- <div class="col-2">-->
<!-- <input type="number" min="0" class="form-control form-control-sm" name="materialDamageAmount" id="materialDamageAmount" placeholder="물적피해 피해액" th:value="${searchParams.materialDamageAmount}">-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <input class="form-control form-control-sm" name="materialDamageDetail" id="materialDamageDetail" placeholder="물적피해 상세내용" th:value="${searchParams.materialDamageDetail}">-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="row justify-content-start subSearchParam" style="display: none">-->
<!-- <hr class="mb-1">-->
<!-- <label class="col-2 col-form-label col-form-label-sm">구속여부</label>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="captin">-->
<!-- <option value="">선장</option>-->
<!-- <option value="Y" th:selected="${searchParams.captin eq 'Y'}">구속</option>-->
<!-- <option value="N" th:selected="${searchParams.captin eq 'N'}">불구속</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="mate">-->
<!-- <option value="">향해장</option>-->
<!-- <option value="Y" th:selected="${searchParams.mate eq 'Y'}">구속</option>-->
<!-- <option value="N" th:selected="${searchParams.mate eq 'N'}">불구속</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- <div class="col-2">-->
<!-- <select class="form-select form-select-sm" name="warden">-->
<!-- <option value="">기관장</option>-->
<!-- <option value="Y" th:selected="${searchParams.warden eq 'Y'}">구속</option>-->
<!-- <option value="N" th:selected="${searchParams.warden eq 'N'}">불구속</option>-->
<!-- </select>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="col-1 d-grid gap-2">-->
<!-- <input type="submit" class="btn btn-primary" id="searchBtn" value="검색">-->
<!-- <button type="button" class="btn btn-info" id="searchFormBtn" data-state="hide">조건<br>펼치기</button>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </form>-->
<div class="card"> <div class="card">
<div class="card-body"> <div class="card-body">
<div class="row"> <div class="row">

View File

@ -1,7 +1,7 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="ko" xmlns:th="http://www.thymeleaf.org"> <html lang="ko" xmlns:th="http://www.thymeleaf.org">
<div class="modal-header bg-dark"> <div class="modal-header bg-dark">
<h5 class="modal-title text-white" id="asfCovEditModalLabel" th:text="${asfCov.cdsKey eq null?'ASF 및 코로나19 관련 조치현황 작성':'ASF 및 코로나19 관련 조치현황 수정'}"></h5> <h5 class="modal-title text-white" id="asfCovEditModalLabel" th:text="${asfCov.asfCovKey eq null?'ASF 및 코로나19 관련 조치현황 작성':'ASF 및 코로나19 관련 조치현황 수정'}"></h5>
<button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button> <button type="button" class="btn-close f-invert" data-bs-dismiss="modal" aria-label="Close"></button>
</div> </div>
<div class="modal-body" id="asfCovEditModalContent"> <div class="modal-body" id="asfCovEditModalContent">
@ -14,25 +14,26 @@
<input type="hidden" name="wrtUserSeq" th:value="${asfCov.wrtUserSeq}"> <input type="hidden" name="wrtUserSeq" th:value="${asfCov.wrtUserSeq}">
<input type="hidden" name="wrtUserGrd" th:value="${asfCov.wrtUserGrd}"> <input type="hidden" name="wrtUserGrd" th:value="${asfCov.wrtUserGrd}">
<input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}"> <input type="hidden" name="wrtUserNm" th:value="${asfCov.wrtUserNm}">
<input type="hidden" name="cdsKey" th:value="${asfCov.cdsKey}"> <input type="hidden" name="cdsKey" id="cdsKey" th:value="${asfCov.cdsKey}">
<div class="row mb-1"> <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"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm fishingBoatInfo boatNameKr" id="boatNameKr" name="boatNameKr" placeholder="한글" th:value="${asfCov.boatNameKr}"> <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> <label for="caseNum" class="col-sm-1 col-form-label col-form-label-sm text-center">사건번호</label>
<div class="col-sm-2"> <div class="col-sm-2">
<div class="input-group"> <div class="input-group">
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="caseNum" name="caseNum" th:value="${asfCov.caseNum}"> <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="caseNumBtn" value="불러오기">
</div> </div>
</div> </div>
<label for="caseNum" class="col-sm-2 col-form-label col-form-label-sm text-center">*사건번호로 불러와주세요</label>
</div> </div>
<div class="row mb-1"> <div class="row mb-1">
<label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당기관</label> <label for="caseAgency" class="col-sm-1 col-form-label col-form-label-sm text-center">사건담당기관</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm crackdownStatusInfo" id="caseAgency" name="caseAgency"> <select class="form-select form-select-sm cdsInfo" id="caseAgency" name="caseAgency" disabled>
<option value="">선택</option> <option value=""></option>
<th:block th:each="commonCode:${session.commonCode.get('ATA')}"> <th:block th:each="commonCode:${session.commonCode.get('ATA')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.caseAgency}"></option>
</th:block> </th:block>
@ -40,12 +41,12 @@
</div> </div>
<label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label> <label for="casePoliceOfficer" class="col-sm-1 col-form-label col-form-label-sm text-center fs-13">사건담당경찰관</label>
<div class="col-sm-2"> <div class="col-sm-2">
<input type="text" class="form-control form-control-sm crackdownStatusInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}"> <input type="text" class="form-control form-control-sm cdsInfo" id="casePoliceOfficer" name="casePoliceOfficer" th:value="${asfCov.casePoliceOfficer}" disabled>
</div> </div>
<label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label> <label for="crackdownPolice" class="col-sm-1 col-form-label col-form-label-sm text-center">단속경찰서</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm crackdownStatusInfo crackdownPolice" name="crackdownPolice" id="crackdownPolice"> <select class="form-select form-select-sm cdsInfo" name="crackdownPolice" id="crackdownPolice" disabled>
<option value="">선택</option> <option value=""></option>
<th:block th:each="commonCode:${session.commonCode.get('CPO')}"> <th:block th:each="commonCode:${session.commonCode.get('CPO')}">
<option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option> <option th:value="${commonCode.itemCd}" th:text="${commonCode.itemValue}" th:selected="${commonCode.itemCd eq asfCov.crackdownPolice}"></option>
</th:block> </th:block>
@ -53,8 +54,13 @@
</div> </div>
<label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label> <label for="crackdownBoat" class="col-sm-1 col-form-label col-form-label-sm text-center">단속함정</label>
<div class="col-sm-2"> <div class="col-sm-2">
<select class="form-select form-select-sm crackdownStatusInfo crackdownBoat" name="crackdownBoat" id="crackdownBoat" th:data-boatcode="${asfCov.crackdownBoat}" disabled> <select class="form-select form-select-sm cdsInfo" name="crackdownBoat" id="crackdownBoat" disabled>
<option value="">단속경찰서를 선택해주세요.</option> <option value=""></option>
<th:block th:each="cpoCode:${session.commonCode.get('CPO')}">
<th:block th:each="boatCode:${session.commonCode.get(cpoCode.itemCd)}">
<option th:value="${boatCode.itemCd}" th:text="${boatCode.itemValue}"></option>
</th:block>
</th:block>
</select> </select>
</div> </div>
</div> </div>