diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java index 580afeb6..e46c6d0a 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/UnlawfulFishingParam.java @@ -62,7 +62,7 @@ public class UnlawfulFishingParam extends BaseModel { private String napoSeaPointDetail; private String nll; private String distance; - private String isDamboUnpaidAmount; + private String depositUnpaid; private String isEvictionDt; private String isReturnDt; private String isConsignmentStartDt; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java index b9080ab0..cb0cc169 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/model/fishingBoat/FishingBoatBaseEntity.java @@ -46,15 +46,15 @@ public class FishingBoatBaseEntity extends BaseModel { private Integer offenseQuantity=0; @Column(name = "offense_amount") private Integer offenseAmount=0; - @Column(name = "offense_illegal_waste_quantity") - private Integer offenseIllegalWasteQuantity=0; - @Column(name = "dambo_unpaid_amount") - private Double damboUnpaidAmount=0d; - @Column(name = "dambo_payment") - private Double damboPayment=0d; - @Column(name = "payment_payment_dt") + @Column(name = "offense_disposal") + private Integer offenseDisposal=0; + @Column(name = "deposit_unpaid") + private Double depositUnpaid=0d; + @Column(name = "deposit_payment") + private Double depositPayment=0d; + @Column(name = "deposit_payment_dt") @DateTimeFormat(pattern = "yyyy-MM-dd") - private LocalDate paymentPaymentDt; + private LocalDate depositPaymentDt; @Column(name = "confiscation_frame") private String confiscationFrame; @Column(name = "confiscation_width") diff --git a/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java b/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java index c0dfeaa8..0ca6e67a 100644 --- a/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java +++ b/src/main/java/com/dbnt/faisp/main/organMgt/service/OrganConfigService.java @@ -101,9 +101,6 @@ public class OrganConfigService { childList = childList.stream() .sorted(Comparator.comparing(OrganConfig::getOrderNum, Comparator.nullsLast(Comparator.naturalOrder()))) .collect(Collectors.toList()); - OrganConfig total = new OrganConfig(); - total.setOrganNm(middle.getOrganNm()+" 계"); - childList.add(total); middle.setChildList(childList); } middleOrganList = middleOrganList.stream() diff --git a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml index 88ee5695..f166a113 100644 --- a/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml +++ b/src/main/resources/mybatisMapper/CrackdownStatusMapper.xml @@ -28,10 +28,10 @@ and a.distance like '%'||#{distance}||'%' - and b.dambo_unpaid_amount > 0 + and b.deposit_unpaid > 0 - and (b.dambo_unpaid_amount = 0 or b.dambo_unpaid_amount is null) + and (b.deposit_unpaid = 0 or b.deposit_unpaid is null) and b.eviction_dt is not null @@ -316,11 +316,11 @@ c.offense_weight , c.offense_quantity , c.offense_amount , - c.offense_illegal_waste_quantity , + c.offense_disposal , b.process_status , - c.dambo_unpaid_amount , - c.dambo_payment , - c.payment_payment_dt , + c.deposit_unpaid , + c.deposit_payment , + c.deposit_payment_dt , b.consignment_start_dt , b.consignment_end_dt , b.eviction_dt , diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index d142293f..9a7bb125 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -156,10 +156,10 @@ - and a.payment_payment_dt >= #{startDate}::date + and a.deposit_payment_dt >= #{startDate}::date - and a.payment_payment_dt <= #{endDate}::date+1 + and a.deposit_payment_dt <= #{endDate}::date+1 diff --git a/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js b/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js index 0a5effbc..ba2aa0df 100644 --- a/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js +++ b/src/main/resources/static/js/faStatistics/unlawfulFishing/shipProcessInfo.js @@ -30,7 +30,7 @@ $(document).on('change', '#directHandoverSelector', function (){ }) $(document).on('change', '#offenseSelector', function (){ - childInputStateChange(Number(this.value), $("#offenseIllegalWasteQuantity")) + childInputStateChange(Number(this.value), $("#offenseDisposal")) childInputStateChange(Number(this.value), $("#offenseQuantity")) childInputStateChange(Number(this.value), $("#offenseAmount")) }) diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html index e665f50c..c438e039 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiEditModal.html @@ -88,9 +88,9 @@ - +
- +
@@ -98,21 +98,21 @@
- +
- +
- +
- +
- +
- +
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html index 6a2d91ce..5af38995 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiHistoryDiv.html @@ -56,7 +56,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html index 5e9e7f21..f67e78c4 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipInfo/isiViewModal.html @@ -87,7 +87,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html index 3dd871a0..e9c127f3 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/issViewModal.html @@ -142,7 +142,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html index 9677ab98..4724877d 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiViewModal.html @@ -185,7 +185,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html index 115663a8..e55bd6b3 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/statistics/statistics.html @@ -16,7 +16,7 @@
- +
@@ -69,7 +69,7 @@ 담보금
(납부/부과) 몰수 / 폐선 공무집행방해
(건/척) - 위탁관리 + 비고 소계 @@ -87,22 +87,6 @@ - - 연도 - - - - - - - - - - - - - -
경찰서
연도 @@ -118,6 +102,9 @@ + + +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html index 3302ed74..35803581 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/versionInfo.html @@ -229,7 +229,7 @@