diff --git a/build.gradle b/build.gradle
index e6fffbc9..3c7f53e2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -12,10 +12,6 @@ configurations {
compileOnly {
extendsFrom annotationProcessor
}
- configureEach {
- exclude group: 'ch.qos.logback', module: 'logback-classic'
- exclude group: 'org.apache.logging.log4j', module: 'log4j-to-slf4j'
- }
}
repositories {
@@ -59,6 +55,10 @@ dependencies {
implementation(group: 'org.egovframe.rte', name: 'org.egovframe.rte.ptl.mvc', version:'4.1.0') {
exclude(module: 'commons-logging')
}
+ implementation(group: 'org.egovframe.rte', name: 'org.egovframe.rte.fdl.cmmn', version:'4.1.0') {
+ exclude(module: 'commons-logging')
+ }
+
// json
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
index 34c75d3b..e5eb7437 100644
--- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
+++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml
@@ -91,7 +91,7 @@
a.wrt_dt
FROM international_crime_arrest a
- ORDER BY a.ica_key DESC
+ ORDER BY a.crime_awareness_dt DESC nulls last, wrt_dt desc
LIMIT #{rowCnt} OFFSET #{firstIndex}
diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
index b3e02ca7..92199835 100644
--- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
+++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
@@ -242,7 +242,71 @@ function saveInternationalCrimeArrest(status){
function contentCheck(status){
let flag = true;
if(status !== "DST001"){
-
+ if(!$("#organSelector").val()){
+ alert("지방청을 선택해주세요.")
+ flag = false;
+ }
+ if(!$("#departmentSelector").val()){
+ alert("관할서를 선택해주세요.")
+ flag = false;
+ }
+ if(!$("#caseOfficer").val()){
+ alert("담당경찰관을 입력해주세요.")
+ flag = false;
+ }
+ if(!$("#crimeType").val()){
+ alert("범죄테마를 선택해주세요.")
+ flag = false;
+ }
+ if(!$("#violationType").val()){
+ alert("위반유형을 선택해주세요.")
+ flag = false;
+ }
+ if(!$("#crimeName").val()){
+ alert("죄명을 입력해주세요.")
+ flag = false;
+ }
+ if(!$("#occurTable").val()){
+ alert("발생원표를 입력해주세요.")
+ flag = false;
+ }
+ if(!$("#arrestTable").val()){
+ alert("검거원표를 입력해주세요.")
+ flag = false;
+ }
+ if(!$("#suspectTable").val()){
+ alert("피의자원표를 입력해주세요.")
+ flag = false;
+ }
+ const suspectNames = $("#spiDiv").find(".suspectName");
+ let suspectFlag = false;
+ $.each(suspectNames, function(index, suspectName){
+ if(!suspectName.value){
+ suspectFlag = true;
+ }
+ })
+ if(suspectFlag){
+ alert("피의자 이름을 입력해주세요")
+ flag = false;
+ }
+ if(!$("#caseSentDt").val()){
+ alert("사건송치를 입력해주세요.")
+ flag = false;
+ }
+ if(!CrossEditor.IsDirty()){
+ alert("범죄사실을 입력해주세요.")
+ flag = false;
+ }
+ }
+ if($("#crimeAwarenessDt").val()){
+ if(!$("#crimeAwarenessDate").val()){
+ alert("검거일자를 입력해주세요.")
+ flag = false;
+ }
+ if(!$("#crimeAwarenessTime").val()){
+ alert("검거시간을 입력해주세요.")
+ flag = false;
+ }
}
return flag;
}
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
index db4823a7..09005756 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
@@ -41,7 +41,7 @@
-
+
@@ -67,7 +67,7 @@
-
+
@@ -332,15 +332,15 @@
diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
index e36db622..f57a25e7 100644
--- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
+++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
@@ -103,9 +103,9 @@
-
+
diff --git a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
index bf29055f..d25d5c85 100644
--- a/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
+++ b/src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
@@ -49,7 +49,7 @@
@@ -58,7 +58,7 @@
@@ -67,7 +67,7 @@
@@ -76,7 +76,7 @@