From f47242688f64f0c747717dfc64b2f482a873a2da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Mon, 17 Jul 2023 18:10:29 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B6=88=EB=B2=95=EC=A1=B0=EC=97=85=EC=99=B8?= =?UTF-8?q?=EA=B5=AD=EC=96=B4=EC=84=A0=20=EA=B2=80=EC=83=89=EC=A1=B0?= =?UTF-8?q?=EA=B1=B4,=20=EA=B6=8C=ED=95=9C=EB=B3=84=20=EB=AA=A9=EB=A1=9D?= =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C=20=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UnlawfulFishingController.java | 42 +++++ .../model/UnlawfulFishingParam.java | 51 ++++-- .../mybatisMapper/UnlawfulFishingMapper.xml | 162 ++++++++++++++++-- .../crackdownInfo/cdiEditModal.html | 6 +- .../crackdownInfo/crackdownInfoPage.html | 8 +- .../illegalShipSailorPage.html | 69 +++++--- .../shipProcessInfo/shipProcessInfoPage.html | 47 ++--- .../shipProcessInfo/spiEditModal.html | 2 +- 8 files changed, 291 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java index 3cefa579..ea2778a7 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/unlawfulFishing/UnlawfulFishingController.java +++ b/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)); 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 52d4845a..9be17d75 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 @@ -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 permitNum; - private String boatNny; - private String boatName; - private String boatMaterial; - private String fisheryType; - - - private Integer year; - private Integer month; + /*공통*/ + private String viewOrgan; + /*단속현황*/ 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 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; } diff --git a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml index 9c54edd3..10f59145 100644 --- a/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml +++ b/src/main/resources/mybatisMapper/UnlawfulFishingMapper.xml @@ -100,6 +100,17 @@ and wrt_dt <= #{endDate}::date + + + and case_agency in + + #{organCd} + + + + and case_agency = #{viewOrgan} + + @@ -130,6 +141,7 @@ @@ -152,22 +164,35 @@ and a.fishery_type = #{fisheryType} - - - and a.payment_payment_dt >= #{startDate}::date - - - and a.payment_payment_dt <= #{endDate}::date+1 - - - - - and a.wrt_dt >= #{startDate}::date - - - and a.wrt_dt <= #{endDate}::date+1 - - + + + + and a.payment_payment_dt >= #{startDate}::date + + + and a.payment_payment_dt <= #{endDate}::date+1 + + + + + and a.wrt_dt >= #{startDate}::date + + + and a.wrt_dt <= #{endDate}::date+1 + + + + + + and b.case_agency in + + #{organCd} + + + + and b.case_agency = #{viewOrgan} + + where a.status <> 'DST008' + + and c.case_num like '%'||#{caseNum}||'%' + + + and (b.boat_name_kr like '%'||#{boatName}||'%' or b.boat_name_cn like '%'||#{boatName}||'%') + + + and a.process_status = #{processStatus} + + + and a.is_ivsgt_stop = #{isIvsgtStop} + + + and a.sentencing_court like '%'||#{sentencingCourt}||'%' + + + and a.sentencing_detail like '%'||#{sentencingDetail}||'%' + + + + + and c.napo_dt >= #{startDate}::date + + + and c.napo_dt <= #{endDate}::date + + + + + and a.wrt_dt >= #{startDate}::date + + + and a.wrt_dt <= #{endDate}::date+1 + + + + + + and c.case_agency in + + #{organCd} + + + + and c.case_agency = #{viewOrgan} + + @@ -237,5 +309,61 @@ where iss.status <> 'DST008' + + and ci.case_num like '%'||#{caseNum}||'%' + + + and (isi.boat_name_kr like '%'||#{boatName}||'%' + or isi.boat_name_cn like '%'||#{boatName}||'%') + + + and (iss.sailorName_kr like '%'||#{sailorName}||'%' + or iss.sailorName_cn like '%'||#{sailorName}||'%') + + + and iss.position = #{position} + + + and iss.career = #{career} + + + and iss.similar_criminal_history = #{similarCriminalHistory} + + + and iss.heterogeneous_criminal_history = #{heterogeneousCriminalHistory} + + + and iss.arrest_history = #{arrestHistory} + + + + + + and iss.birthdate >= #{startDate}::date + + + and iss.birthdate <= #{endDate}::date + + + + + and iss.wrt_dt >= #{startDate}::date + + + and iss.wrt_dt <= #{endDate}::date+1 + + + + + + and ci.case_agency in + + #{organCd} + + + + and ci.case_agency = #{viewOrgan} + + \ No newline at end of file diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html index 1b5b611d..f0dba033 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/cdiEditModal.html @@ -61,8 +61,10 @@
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html index 66fa2d1a..4885cd23 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/crackdownInfo/crackdownInfoPage.html @@ -44,7 +44,7 @@
- +
+
- +
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html index 8fea7ef4..ab801b7f 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/illegalShipSailor/illegalShipSailorPage.html @@ -36,52 +36,67 @@
- +
+
+ +
+
+ +
+
+
- -
-
- -
-
- + + +
- +
- +
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html index e69a3c87..f105c278 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/shipProcessInfoPage.html @@ -28,7 +28,7 @@
-
+
@@ -37,46 +37,33 @@
- +
+
+ +
+
+
- -
-
- -
-
- + + +
- +
- -
-
- +
diff --git a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html index 6c2ed735..ead499f4 100644 --- a/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html +++ b/src/main/resources/templates/faStatistics/unlawfulFishing/shipProcessInfo/spiEditModal.html @@ -64,7 +64,7 @@
- +