DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

불법조업 외국어선 하위 페이지 

- 검색조건 요청사항 반영.
master
강석 최 2023-08-04 16:38:24 +09:00
parent 2bf4b346ad
commit 0f2cb7a58a
12 changed files with 56 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml
View File

@ -64,42 +64,37 @@
<if test='caseAgency != null and caseAgency != ""'>
and case_agency = #{caseAgency}
</if>
<if test='casePoliceOfficer != null and casePoliceOfficer != ""'>
and case_police_officer like '%'||#{casePoliceOfficer}||'%'
</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='caseNum != null and caseNum != ""'>
and case_num like '%'||#{caseNum}||'%'
</if>
<if test='mmsi != null and mmsi != ""'>
and mmsi like '%'||#{mmsi}||'%'
</if>
<if test='napoPoint != null and napoPoint != ""'>
and (napo_sea_point_lon like '%'||#{napoPoint}||'%'
or napo_sea_point_lat like '%'||#{napoPoint}||'%'
or napo_sea_point_detail like '%'||#{napoPoint}||'%')
</if>
<if test='dateSelector == "napoDt"'>
<if test='startDate != null and startDate != ""'>
and napo_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and napo_dt &lt;= #{endDate}::date
</if>
</if>
<if test='dateSelector == "wrtDt"'>
<if test='startDate != null and startDate != ""'>
and wrt_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and wrt_dt &lt;= #{endDate}::date
</if>
<if test='searchKeyword != null and searchKeyword != ""'>
and (napo_sea_point_lon like '%'||#{searchKeyword}||'%'
or napo_sea_point_lat like '%'||#{searchKeyword}||'%'
or napo_sea_point_detail like '%'||#{searchKeyword}||'%'
or case_police_officer like '%'||#{searchKeyword}||'%'
or case_num like '%'||#{searchKeyword}||'%'
or person_damage_detail like '%'||#{searchKeyword}||'%'
or material_damage_detail like '%'||#{searchKeyword}||'%'
or catch_fish_species like '%'||#{searchKeyword}||'%')
</if>
<choose>
<when test='dateSelector == "napoDt"'>
<if test='startDate != null and startDate != ""'>
and napo_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and napo_dt &lt;= #{endDate}::date
</if>
</when>
<when test='dateSelector == "wrtDt"'>
<if test='startDate != null and startDate != ""'>
and wrt_dt >= #{startDate}::date
</if>
<if test='endDate != null and endDate != ""'>
and wrt_dt &lt;= #{endDate}::date
</if>
</when>
</choose>
<choose>
<when test='accessAuth == "ACC003"'>
and (case_agency in
@ -148,23 +143,15 @@
</select>
<sql id="selectIllegalShipInfoListWhere">
where a.status &lt;> 'DST008'
<if test='caseNum != null and caseNum != ""'>
and b.case_num like '%'||#{caseNum}||'%'
</if>
<if test='permitNum != null and permitNum != ""'>
and a.permit_num like '%'||#{permitNum}||'%'
</if>
<if test='boatNny != null and boatNny != ""'>
and (a.boat_nny_sung like '%'||#{boatNny}||'%' or a.boat_nny_si like '%'||#{boatNny}||'%')
</if>
<if test='boatName != null and boatName != ""'>
and (a.boat_name_kr like '%'||#{boatName}||'%' or a.boat_name_cn like '%'||#{boatName}||'%')
</if>
<if test='boatMaterial != null and boatMaterial != ""'>
and a.boat_material = #{boatMaterial}
</if>
<if test='fisheryType != null and fisheryType != ""'>
and a.fishery_type = #{fisheryType}
<if test='searchKeyword != null and searchKeyword != ""'>
and (a.boat_nny_sung like '%'||#{searchKeyword}||'%'
or a.boat_nny_si like '%'||#{searchKeyword}||'%'
or a.nationality like '%'||#{searchKeyword}||'%'
or a.offense_type like '%'||#{searchKeyword}||'%'
or b.case_num like '%'||#{searchKeyword}||'%')
</if>
<choose>
<when test='dateSelector == "paymentDt"'>
@ -229,9 +216,6 @@
</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>
@ -241,11 +225,12 @@
<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 test='searchKeyword != null and searchKeyword != ""'>
and (a.sentencing_detail like '%'||#{searchKeyword}||'%'
or a.sentencing_court like '%'||#{searchKeyword}||'%'
or c.case_num like '%'||#{searchKeyword}||'%'
or a.handover_boat like '%'||#{searchKeyword}||'%'
or a.middle_takeover_boat like '%'||#{searchKeyword}||'%')
</if>
<choose>
<when test='dateSelector == "napoDt"'>

4
src/main/resources/static/js/faStatistics/unlawfulFishing/crackdownInfo.js
View File

@ -7,10 +7,6 @@ $(function(){
});
})
$(document).on('change', '#searchFormPolice', function (){
getChildOption(this.value, null, "#searchFormBoat");
})
$(document).on('click', '#addCrackdownStatusBtn', function (){
getCdiEditModal(null);
})

31
src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html
View File

@ -44,42 +44,25 @@
</select>
</div>
<div class="col-2">
<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">
<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" th:disabled="${#strings.isEmpty(searchParams.crackdownPolice)}">
<select class="form-select form-select-sm" name="crackdownBoat" id="searchFormBoat">
<option value="">단속함정</option>
<th:block th:each="code:${session.commonCode.get(searchParams.crackdownPolice)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.crackdownBoat}"></option>
<th:block th:each="parent:${session.commonCode.get('CPO')}">
<th:block th:each="code:${session.commonCode.get(parent.itemCd)}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq searchParams.crackdownBoat}"></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" name="" placeholder="개발중">
</div>-->
<div class="col-2">
<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="napoPoint" placeholder="나포장소" th:value="${searchParams.napoPoint}">
<input type="text" class="form-control form-control-sm" name="searchKeyword" placeholder="통합검색" th:value="${searchParams.searchKeyword}">
</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="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일시</option>
<option value="napoDt" th:selected="${searchParams.dateSelector eq 'napoDt'}">나포일시</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}">

27
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/illegalShipInfoPage.html
View File

@ -36,39 +36,16 @@
<div class="col-11">
<div class="row justify-content-end pb-1">
<div class="col-2">
<input type="text" class="form-control form-control-sm" name="caseNum" placeholder="사건번호" th:value="${searchParams.caseNum}">
<input type="text" class="form-control form-control-sm" name="searchKeyword" placeholder="통합검색" th:value="${searchParams.searchKeyword}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" name="boatName" placeholder="선명" th:value="${searchParams.boatName}">
</div>
<div class="col-2">
<input type="text" class="form-control form-control-sm" name="boatNny" placeholder="선적지" th:value="${searchParams.boatNny}">
</div>
</div>
<div class="row justify-content-end pb-1">
<div class="col-2">
<select class="form-select form-select-sm " name="fisheryType" id="searchFisheryType">
<option value="">선종</option>
<th:block th:each="code:${session.commonCode.get('FT')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${code.itemCd eq searchParams.fisheryType}"></option>
</th:block>
</select>
</div>
<div class="col-2">
<select class="form-select form-select-sm" name="boatMaterial" id="searchBoatMaterial">
<option value="">선질</option>
<th:block th:each="code:${session.commonCode.get('BM')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}"
th:selected="${code.itemCd eq searchParams.boatMaterial}"></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 'paymentDt'}">담보금 납부일시</option>
<option value="paymentDt" th:selected="${searchParams.dateSelector eq 'paymentDt'}">담보금 납부일</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}">

2
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html
View File

@ -110,7 +110,7 @@
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm " id="damboPayment" name="damboPayment" placeholder="단위: 만원" th:value="${shipInfo.damboPayment>0?shipInfo.damboPayment:''}">
</div>
<label for="paymentPaymentDt" class="col-sm-1 col-form-label col-form-label-sm text-center fs-11">담보금 납부일시</label>
<label for="paymentPaymentDt" 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 dateSelector" id="paymentPaymentDt" name="paymentPaymentDt" placeholder="yyyy-mm-dd" th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}" autocomplete="off">
</div>

2
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html
View File

@ -76,7 +76,7 @@
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
</div>

2
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiSelectModal.html
View File

@ -48,7 +48,7 @@
<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 'paymentDt'}">담보금 납부일시</option>
<option value="napoDt" th:selected="${searchParams.dateSelector eq 'paymentDt'}">담보금 납부일</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}">

2
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html
View File

@ -107,7 +107,7 @@
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center">담보금 납부일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
</div>

2
src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html
View File

@ -162,7 +162,7 @@
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
</div>

8
src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html
View File

@ -36,9 +36,6 @@
<div class="row">
<div class="col-11">
<div class="row justify-content-end pb-1">
<div class="col-2">
<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="boatName" placeholder="어선명" th:value="${searchParams.boatName}">
</div>
@ -60,10 +57,7 @@
</div>
<div class="row justify-content-end pb-1">
<div class="col-2">
<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="선고내용" name="sentencingDetail" th:value="${searchParams.sentencingDetail}">
<input type="text" class="form-control form-control-sm" name="searchKeyword" placeholder="통합검색" th:value="${searchParams.searchKeyword}">
</div>
<div class="col-4">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">

2
src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html
View File

@ -205,7 +205,7 @@
<label class="col-sm-2 col-form-label col-form-label py-2 border-end border-secondary text-start">
<th:block th:if="${shipInfo.damboPayment>0}" th:text="|${shipInfo.damboPayment}만원|"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
<label class="col-sm-1 col-form-label col-form-label fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control border-0" readonly th:value="${#temporals.format(shipInfo.paymentPaymentDt, 'yyyy-MM-dd')}">
</div>

2
src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html
View File

@ -249,7 +249,7 @@
<label class="col-sm-2 col-form-label col-form-label-sm py-2 border-end border-secondary text-start">
<th:block th:if="${fishingBoat.damboPayment>0}" th:text="|${fishingBoat.damboPayment}만원|"></th:block>
</label>
<label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일시</label>
<label class="col-sm-1 col-form-label col-form-label-sm fw-bold bg-label py-2 border-end border-secondary text-center fs-11">담보금 납부일</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm border-0" readonly th:value="${fishingBoat.paymentPaymentDt}">
</div>