From 729e64ef666e941d638a4c8af6fab1a518b128c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Wed, 19 Apr 2023 18:13:29 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=20?= =?UTF-8?q?=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=EC=9E=91=EC=97=85?= =?UTF-8?q?=EC=A4=91.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InternationalCrimeArrestController.java | 12 +- .../model/InternationalCrimeArrest.java | 9 +- .../InternationalCrimeArrestService.java | 4 +- .../faStatistics/internationalCrimeArrest.js | 52 +++ .../internationalCrimeArrest.html | 4 +- .../internationalCrimeArrestEditModal.html | 349 +++++++----------- 6 files changed, 207 insertions(+), 223 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index 74f2dba1..dacea351 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -18,6 +18,7 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @RestController @@ -28,7 +29,6 @@ public class InternationalCrimeArrestController { private final AuthMgtService authMgtService; private final InternationalCrimeArrestService internationalCrimeArrestService; private final OrganConfigService organConfigService; - private final IcaSuspectInfoRepository suspectPersonInfoRepository; private final MenuMgtService menuMgtService; @GetMapping("/internationalCrimeArrest") @@ -43,14 +43,15 @@ public class InternationalCrimeArrestController { mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); internationalCrimeArrest.setQueryInfo(); +/* List internationalCrimeArrestList = internationalCrimeArrestService.selectInternationalCrimeArrestList(internationalCrimeArrest); for (InternationalCrimeArrest ica:internationalCrimeArrestList) { ica.setSuspectInfoList(suspectPersonInfoRepository.findByIcaKey(ica.getIcaKey())); } - - mav.addObject("internationalCrimeArrestList", internationalCrimeArrestList); - internationalCrimeArrest.setContentCnt(internationalCrimeArrestService.selectInternationalCrimeArrestListCnt(internationalCrimeArrest)); +*/ + mav.addObject("internationalCrimeArrestList", new ArrayList()); + internationalCrimeArrest.setContentCnt(0); internationalCrimeArrest.setPaginationInfo(); mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/internationalCrimeArrest")); mav.addObject("organConfigList", organConfigService.selectOrganList()); @@ -70,10 +71,9 @@ public class InternationalCrimeArrestController { internationalCrimeArrest.setWrtUserGrd(loginUser.getTitleCd()); internationalCrimeArrest.setWrtUserNm(loginUser.getUserNm()); internationalCrimeArrest.setWrtDt(LocalDateTime.now()); - internationalCrimeArrest.setSuspectInfoList(suspectPersonInfoRepository.findByIcaKey(internationalCrimeArrest.getIcaKey())); } mav.addObject("organConfigList", organConfigService.selectOrganList()); - mav.addObject("internationalCrimeArrest", internationalCrimeArrest); + mav.addObject("ica", internationalCrimeArrest); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java index b25b0f5f..db291789 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/InternationalCrimeArrest.java @@ -11,6 +11,7 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.persistence.*; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @Getter @@ -47,12 +48,12 @@ public class InternationalCrimeArrest extends BaseModel { @Column(name = "case_sent_dt") @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate caseSentDt; + @Column(name = "crime_form") + private String crimeForm; @Column(name = "case_num") private String caseNum; @Column(name = "case_overview") private String caseOverview; - @Column(name = "crime_form") - private String crimeForm; @Column(name = "status") private String status; @Column(name = "wrt_organ") @@ -70,7 +71,7 @@ public class InternationalCrimeArrest extends BaseModel { private LocalDateTime wrtDt; @Transient - private List suspectInfoList; + private List suspectInfoList = new ArrayList<>(); @Transient - private IcaSubInfo icaSubInfo; + private IcaSubInfo icaSubInfo = new IcaSubInfo(); } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 06368963..0130120b 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -3,6 +3,7 @@ package com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.service; import com.dbnt.faisp.config.BaseService; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.mapper.InternationalCrimeArrestMapper; +import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSubInfo; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.InternationalCrimeArrest; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.model.IcaSuspectInfo; import com.dbnt.faisp.main.faStatistics.internationalCrimeArrest.repository.IcaSubInfoRepository; @@ -18,8 +19,8 @@ import java.util.List; @Service @RequiredArgsConstructor public class InternationalCrimeArrestService extends BaseService { - private final InternationalCrimeArrestRepository internationalCrimeArrestRepository; private final InternationalCrimeArrestMapper internationalCrimeArrestMapper; + private final InternationalCrimeArrestRepository internationalCrimeArrestRepository; private final IcaSuspectInfoRepository icaSuspectInfoRepository; private final IcaSubInfoRepository icaSubInfoRepository; @@ -42,6 +43,7 @@ public class InternationalCrimeArrestService extends BaseService { public InternationalCrimeArrest selectInternationalCrimeArrest(Integer icaKey) { InternationalCrimeArrest savedICA = internationalCrimeArrestRepository.findById(icaKey).orElse(null); if (savedICA != null) { + savedICA.setIcaSubInfo(icaSubInfoRepository.findById(icaKey).orElse(new IcaSubInfo())); savedICA.setSuspectInfoList(icaSuspectInfoRepository.findByIcaKey(icaKey)); } return savedICA; diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 148facf0..b4e4dc01 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -62,10 +62,62 @@ $(document).on('change', '#crimeType', function (){ dynamicOption('#violationType', $(this).val()); }); +$(document).on('change', '#violationType', function (){ + inputControl(this.value); +}) + $(document).on('change', '#searchCrimeType', function (){ dynamicOption('#searchViolationType', $(this).val(), '위반유형'); }); +$(document).on('change', '#crimeForm', function (){ + if(this.value === "CMF001"){ + $("#spiAddBtn").hide(); + }else{ + $("#spiAddBtn").show(); + } +}) + +$(document).on('click', '#spiAddBtn', function (){ + $("#spiDiv").append($("#spiInputDiv").children().clone()); + spiRemoveBtnControl() +}) +$(document).on('click', '.spiRemoveBtn', function (){ + $(this).parents('.spi-list').remove(); + spiRemoveBtnControl() +}) + +function spiRemoveBtnControl(){ + if($(".spi-list").length>2){ + $(".spiRemoveBtn").show(); + }else{ + $(".spiRemoveBtn").hide(); + } +} + +function inputControl(violationType){ + $(".extInputDiv").hide(); + switch (violationType) { + case "CTH101": + case "CTH102": + case "CTH103": + $("#extCommonInputDiv").show(); + case "CTH104": + case "CTH105": + $("#"+violationType+"Div").show(); + break; + case "CTH201": + case "CTH202": + case "CTH203": + case "CTH204": + $(".smugglingInputDiv").show(); + break; + case "CTH401": + $("#"+violationType+"Div").show(); + break; + } +} + function getIcaViewModal(icaKey){ $.ajax({ url: '/faStatistics/internationalCrimeArrestViewModal', diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index 114319cc..0285b141 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -108,10 +108,10 @@
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 1edb5392..3bfbf84b 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -1,17 +1,20 @@ -
+ -
+ -
+ -
+ -
+ -
+
- +
- +
-
+ -
+ - + + + + -
- +
- +
- +
@@ -325,9 +216,9 @@
- - + +
- +
- +
- +
- @@ -437,21 +324,63 @@
- +
- +
- +
+
+
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+ +
+