DBNT
/
FAISP
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix : 국제범죄 검거현황 엑셀다운오류 수정중

master
TaehunPark 2023-01-30 17:58:22 +09:00
parent 0118c53f6e
commit c212b4ae7e
3 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java
View File

@ -103,13 +103,11 @@ public class InternationalCrimeArrestController {
internationalCrimeArrest.setPaginationInfo(); internationalCrimeArrest.setPaginationInfo();
Excel excel = new Excel(); 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[] 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[] headerNames = {"지방청", "경찰서", "범죄테마", "위반유형", "죄명", "발생원표", "검거원표", "피의자원표","피의자 인적사항","범죄인지","사건송치","신병처리"};
String[] headerNames2 = { "", "사건번호", "지방청", "경찰서", "범죄테마", "위반유형", "죄명", "발생원표", "검거원표", "피의자원표","성별","나이","국적","범죄인지","사건송치","신병처리"}; String[] columnType = { "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String"};
String[] columnType = { "int", "String", "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String","String","String"};
excel.setHeaders(headers); excel.setHeaders(headers);
excel.setHeaderNames(headerNames); excel.setHeaderNames(headerNames);
excel.setHeaderNames2(headerNames2);
excel.setColumnType(columnType); excel.setColumnType(columnType);
excel.setSheetName("국제범죄검거현황"); excel.setSheetName("국제범죄검거현황");
excel.setExcelFileName("국제범죄검거현황"); excel.setExcelFileName("국제범죄검거현황");

7
src/main/java/com/dbnt/faisp/util/Utils.java
View File

@ -778,12 +778,9 @@ public class Utils {
excel.getHeaderStyle().setFillForegroundColor(IndexedColors.LIME.getIndex()); excel.getHeaderStyle().setFillForegroundColor(IndexedColors.LIME.getIndex());
// 헤더 생성 // 헤더 생성
createHeader(excel, excel.getHeaderNames(), excel.getHeaderStyle3(), 0); createHeader(excel, excel.getHeaderNames(), excel.getHeaderStyle(), 0);
createHeader(excel, excel.getHeaderNames2(), excel.getHeaderStyle2(), 1);
// 헤더 병합
excel.getSheet().addMergedRegion(new CellRangeAddress(0,0,10,12)); // ( 시작행, 종료행, 시작열, 종료열 )
rowCreate(excel, 2, 10, 12); rowCreate(excel, 1, 0, 0);
//엑셀이름 한글깨짐방지 //엑셀이름 한글깨짐방지
excelNameHangulBrokenPrevention(response, wb, excel); excelNameHangulBrokenPrevention(response, wb, excel);

10
src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
View File

@ -102,8 +102,8 @@
i.occur_table, i.occur_table,
i.arrest_table, i.arrest_table,
i.suspect_table, i.suspect_table,
i.crime_awareness_dt, to_char(i.crime_awareness_dt, 'YYYY-MM-DD') as crime_awareness_dt,
i.case_sent_dt, to_char(i.case_sent_dt, 'YYYY-MM-DD') as case_sent_dt,
i.other_crime, i.other_crime,
i.case_num, i.case_num,
i.case_overview, i.case_overview,
@ -115,7 +115,7 @@
i.wrt_organ, i.wrt_organ,
i.wrt_user_seq, i.wrt_user_seq,
i.wrt_nm, i.wrt_nm,
i.wrt_dt, to_char(i.wrt_dt, 'YYYY-MM-DD HH24:MI') as wrt_dt,
cm1.item_value AS organ, cm1.item_value AS organ,
cm2.item_value AS department, cm2.item_value AS department,
cm3.item_value AS crime_type, cm3.item_value AS crime_type,
@ -125,9 +125,7 @@
cm7.item_value AS crime_form, cm7.item_value AS crime_form,
COALESCE(cm8.item_value, i.purpose) AS purpose, COALESCE(cm8.item_value, i.purpose) AS purpose,
COALESCE(cm9.item_value, i.smuggled_goods) AS smuggled_goods, COALESCE(cm9.item_value, i.smuggled_goods) AS smuggled_goods,
cm10.item_value AS SEX, concat(cm10.item_value,' ',cm11.item_value,' ',COALESCE(cm12.item_value, s.country)) as personal_information
cm11.item_value AS age,
COALESCE(cm12.item_value, s.country) AS country
FROM international_crime_arrest i FROM international_crime_arrest i
INNER JOIN suspect_person_info s INNER JOIN suspect_person_info s
ON i.ica_key = s.ica_key ON i.ica_key = s.ica_key