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 7edcbe23..a30a7768 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 @@ -95,31 +95,4 @@ public class InternationalCrimeArrestController { internationalCrimeArrestService.deleteInternationalCrimeArrest(internationalCrimeArrest); } - @GetMapping("/internationalCrimeArrest/ExcelDown") - public void icaExcelDown(HttpServletResponse response, InternationalCrimeArrest internationalCrimeArrest) { - int duplicateCount = internationalCrimeArrestService.icaDuplicateCount(internationalCrimeArrest); - int rowCnt = internationalCrimeArrest.getRowCnt() + duplicateCount; - internationalCrimeArrest.setRowCnt(rowCnt); - internationalCrimeArrest.setQueryInfo(); - internationalCrimeArrest.setContentCnt(internationalCrimeArrestService.selectInternationalCrimeArrestListCnt(internationalCrimeArrest)); - internationalCrimeArrest.setPaginationInfo(); - - Excel excel = new Excel(); - String[] headers = {"organ", "department", "crime_type", "violation_type", "crime_name", "occur_table", "arrest_table", "suspect_table", "personal_information", "crime_awareness_dt", "case_sent_dt", "process_result"}; - String[] headerNames = {"지방청", "경찰서", "범죄테마", "위반유형", "죄명", "발생원표", "검거원표", "피의자원표","피의자 인적사항","범죄인지","사건송치","신병처리"}; - String[] columnType = { "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String"}; - excel.setHeaders(headers); - excel.setHeaderNames(headerNames); - excel.setColumnType(columnType); - excel.setSheetName("국제범죄검거현황"); - excel.setExcelFileName("국제범죄검거현황"); - List icaList = internationalCrimeArrestService.selectInternationalCrimeArrestParamList(internationalCrimeArrest); - excel.setList(icaList); - - try { - Utils.icaDownExcel(response, excel); - } catch (IOException e) { - - } - } } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java index a8f62fb5..109f0c6f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/mapper/InternationalCrimeArrestMapper.java @@ -12,6 +12,4 @@ import java.util.List; public interface InternationalCrimeArrestMapper{ List selectInternationalCrimeArrestList(InternationalCrimeArrest internationalCrimeArrest); Integer selectInternationalCrimeArrestListCnt(InternationalCrimeArrest internationalCrimeArrest); - List selectInternationalCrimeArrestParamList(InternationalCrimeArrest internationalCrimeArrest); - Integer icaDuplicateCount(InternationalCrimeArrest internationalCrimeArrest); } 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 f35e88a3..dca51f61 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 @@ -45,18 +45,10 @@ public class InternationalCrimeArrestService extends BaseService { return icaList; } - public List selectInternationalCrimeArrestParamList(InternationalCrimeArrest InternationalCrimeArrest) { - return internationalCrimeArrestMapper.selectInternationalCrimeArrestParamList(InternationalCrimeArrest); - } - public Integer selectInternationalCrimeArrestListCnt(InternationalCrimeArrest internationalCrimeArrest) { return internationalCrimeArrestMapper.selectInternationalCrimeArrestListCnt(internationalCrimeArrest); } - public Integer icaDuplicateCount(InternationalCrimeArrest internationalCrimeArrest) { - return internationalCrimeArrestMapper.icaDuplicateCount(internationalCrimeArrest); - } - public InternationalCrimeArrest selectInternationalCrimeArrest(Integer icaKey) { InternationalCrimeArrest savedICA = internationalCrimeArrestRepository.findById(icaKey).orElse(null); if (savedICA != null) { diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 1fd735ba..2fa0d282 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -83,56 +83,6 @@ - - - \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index ea86a06f..b03a137e 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -84,6 +84,21 @@ $(document).on('click', '.spiRemoveBtn', function (){ spiRemoveBtnControl() }) +$(document).on('change', '.etcSelfInput', function (){ + const selfInput = $("#"+this.id+"_self") + if(this.value === "etc"){ + const temp = this.name + this.name = "" + selfInput[0].name = temp; + selfInput.show(); + }else{ + const temp = selfInput[0].name + selfInput[0].name = "" + this.name = temp; + selfInput.hide(); + } + +}) function spiRemoveBtnControl(){ if($(".spi-list").length>2){ $(".spiRemoveBtn").show(); @@ -205,6 +220,6 @@ function contentCheck(status){ } $(document).on('click', '#icaExcelDownBtn', function (){ - const formData = $("#icaSearchForm").serialize(); - location.href = '/faStatistics/internationalCrimeArrest/ExcelDown?'+formData; + debugger + exportExcel('국제범죄검거현황', 'icaTable') }); diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index 4a23686d..9377bb5a 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -73,8 +73,6 @@ - -
+
+
@@ -133,7 +133,7 @@
- +
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 3a074644..2333bc9c 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -85,7 +85,6 @@ - @@ -102,52 +101,86 @@
- - +
- - +
+
+
+
+ +
+
+
+ +
@@ -158,26 +191,43 @@
- - +
- - +
+
+
+
+ +
+
+
+ +
@@ -190,7 +240,6 @@ - @@ -204,26 +253,43 @@
- - +
- - +
+
+
+
+ +
+
+
+ +
@@ -246,13 +312,14 @@
- + +
+
+
+
+
@@ -298,7 +373,7 @@ th:selected="${code.itemCd eq ica.crimeForm}"> - @@ -351,47 +426,46 @@ - -
- + +
-
- - +
-
- - +
-
- - + - +
- -
- -
-
- - - + +
+ +
+
순번