From c212b4ae7e478cec68a36fef964a7e40a7eeefd4 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Mon, 30 Jan 2023 17:58:22 +0900 Subject: [PATCH] =?UTF-8?q?fix=20:=20=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84?= =?UTF-8?q?=20=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=EC=97=91=EC=85=80?= =?UTF-8?q?=EB=8B=A4=EC=9A=B4=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../InternationalCrimeArrestController.java | 8 +++----- src/main/java/com/dbnt/faisp/util/Utils.java | 7 ++----- .../mybatisMapper/InternationalCrimeArrestMapper.xml | 10 ++++------ 3 files changed, 9 insertions(+), 16 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 e641c293..68f18754 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 @@ -103,13 +103,11 @@ public class InternationalCrimeArrestController { internationalCrimeArrest.setPaginationInfo(); Excel excel = new Excel(); - String[] headers = {"ica_key", "case_num", "organ", "department", "crime_type", "violation_type", "crime_name", "occur_table", "arrest_table", "suspect_table", "sex", "age", "country", "crime_awareness_dt", "case_sent_dt", "process_result"}; - String[] headerNames = { "", "", "", "", "", "", "", "", "", "", "피의자 인적사항", "", "", "", "", ""}; - String[] headerNames2 = { "", "사건번호", "지방청", "경찰서", "범죄테마", "위반유형", "죄명", "발생원표", "검거원표", "피의자원표","성별","나이","국적","범죄인지","사건송치","신병처리"}; - String[] columnType = { "int", "String", "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String","String","String"}; + 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.setHeaderNames2(headerNames2); excel.setColumnType(columnType); excel.setSheetName("국제범죄검거현황"); excel.setExcelFileName("국제범죄검거현황"); diff --git a/src/main/java/com/dbnt/faisp/util/Utils.java b/src/main/java/com/dbnt/faisp/util/Utils.java index bfe3d88b..2ea08384 100644 --- a/src/main/java/com/dbnt/faisp/util/Utils.java +++ b/src/main/java/com/dbnt/faisp/util/Utils.java @@ -778,12 +778,9 @@ public class Utils { excel.getHeaderStyle().setFillForegroundColor(IndexedColors.LIME.getIndex()); // 헤더 생성 - createHeader(excel, excel.getHeaderNames(), excel.getHeaderStyle3(), 0); - createHeader(excel, excel.getHeaderNames2(), excel.getHeaderStyle2(), 1); - // 헤더 병합 - excel.getSheet().addMergedRegion(new CellRangeAddress(0,0,10,12)); // ( 시작행, 종료행, 시작열, 종료열 ) + createHeader(excel, excel.getHeaderNames(), excel.getHeaderStyle(), 0); - rowCreate(excel, 2, 10, 12); + rowCreate(excel, 1, 0, 0); //엑셀이름 한글깨짐방지 excelNameHangulBrokenPrevention(response, wb, excel); diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 05e7f856..dced49ee 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -102,8 +102,8 @@ i.occur_table, i.arrest_table, i.suspect_table, - i.crime_awareness_dt, - i.case_sent_dt, + to_char(i.crime_awareness_dt, 'YYYY-MM-DD') as crime_awareness_dt, + to_char(i.case_sent_dt, 'YYYY-MM-DD') as case_sent_dt, i.other_crime, i.case_num, i.case_overview, @@ -115,7 +115,7 @@ i.wrt_organ, i.wrt_user_seq, i.wrt_nm, - i.wrt_dt, + to_char(i.wrt_dt, 'YYYY-MM-DD HH24:MI') as wrt_dt, cm1.item_value AS organ, cm2.item_value AS department, cm3.item_value AS crime_type, @@ -125,9 +125,7 @@ cm7.item_value AS crime_form, COALESCE(cm8.item_value, i.purpose) AS purpose, COALESCE(cm9.item_value, i.smuggled_goods) AS smuggled_goods, - cm10.item_value AS SEX, - cm11.item_value AS age, - COALESCE(cm12.item_value, s.country) AS country + concat(cm10.item_value,' ',cm11.item_value,' ',COALESCE(cm12.item_value, s.country)) as personal_information FROM international_crime_arrest i INNER JOIN suspect_person_info s ON i.ica_key = s.ica_key