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 c5c8151d..f07d0086 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 @@ -30,6 +30,8 @@ public class InternationalCrimeArrest extends BaseModel { private String organ; @Column(name = "department") private String department; + @Column(name = "case_officer") + private String caseOfficer; @Column(name = "crime_type") private String crimeType; @Column(name = "violation_type") diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 2fa0d282..131a1fbc 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -62,6 +62,7 @@ SELECT a.ica_key, a.organ, a.department, + a.case_officer, a.crime_type, a.violation_type, a.crime_name, @@ -70,7 +71,12 @@ a.suspect_table, a.crime_awareness_dt, a.case_sent_dt, - a.case_num + a.case_num, + a.wrt_organ, + a.wrt_part, + a.wrt_user_grd, + a.wrt_user_nm, + a.wrt_dt FROM international_crime_arrest a ORDER BY a.ica_key DESC diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html index 9377bb5a..a61304d2 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrest.html @@ -139,6 +139,7 @@ 순번 지방청 경찰서 + 담당경찰관
범죄테마
(대분류)
@@ -157,6 +158,8 @@ 피의자 인적사항 범죄인지 사건송치 + 작성자 + 작성일시 @@ -173,6 +176,7 @@ + @@ -208,6 +212,19 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 2333bc9c..a5101b7b 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -39,6 +39,10 @@ + +
+ +
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html index fb916778..0fe41015 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestViewModal.html @@ -7,6 +7,12 @@