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

그레이들 의존성 수정 

국제범죄 검거현황 작성 모달 요청사항 반영.
견문목록 견문 작성 모달 요청사항 반영
master
최강석 2023-10-05 13:17:59 +09:00
parent 79c02ac701
commit 1408d69dd0
7 changed files with 82 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle
View File

@ -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'

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

@ -91,7 +91,7 @@
a.wrt_dt
FROM international_crime_arrest a
<include refid="selectInternationalCrimeArrestListWhere"></include>
ORDER BY a.ica_key DESC
ORDER BY a.crime_awareness_dt DESC nulls last, wrt_dt desc
LIMIT #{rowCnt} OFFSET #{firstIndex}
</select>

66
src/main/resources/static/js/faStatistics/internationalCrimeArrest.js
View File

@ -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;
}

10
src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html
View File

@ -41,7 +41,7 @@
</div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">담당경찰관</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" name="caseOfficer" th:value="${ica.caseOfficer}">
<input type="text" class="form-control form-control-sm" name="caseOfficer" id="caseOfficer" th:value="${ica.caseOfficer}">
</div>
</div>
<div class="row mb-1" id="spiParentDiv">
@ -67,7 +67,7 @@
</div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center crimeName">죄명</label>
<div class="col-sm-2 crimeName">
<input type="text" class="form-control form-control-sm" name="crimeName" th:value="${ica.crimeName}">
<input type="text" class="form-control form-control-sm" name="crimeName" id="crimeName" th:value="${ica.crimeName}">
</div>
</div>
<!--위반유형별 양식 시작-->
@ -332,15 +332,15 @@
<div class="row mb-1">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">발생원표</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" name="occurTable" th:value="${ica.occurTable}">
<input type="text" class="form-control form-control-sm" name="occurTable" id="occurTable" th:value="${ica.occurTable}">
</div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">검거원표</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" name="arrestTable" th:value="${ica.arrestTable}">
<input type="text" class="form-control form-control-sm" name="arrestTable" id="arrestTable" th:value="${ica.arrestTable}">
</div>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">피의자원표</label>
<div class="col-sm-2">
<input type="text" class="form-control form-control-sm" name="suspectTable" th:value="${ica.suspectTable}">
<input type="text" class="form-control form-control-sm" name="suspectTable" id="suspectTable" th:value="${ica.suspectTable}">
</div>
</div>
<div class="row mb-1">

4
src/main/resources/templates/faStatistics/internationalCrimeArrest/icaList.html
View File

@ -103,9 +103,9 @@
<div class="col-4">
<div class="input-group w-auto input-daterange" id="dateSelectorDiv">
<select class="form-select form-select-sm w-30" name="dateSelector">
<option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
<option value="awarenessDt" th:selected="${searchParams.dateSelector eq 'awarenessDt'}">범죄인지</option>
<option value="awarenessDt" th:selected="${searchParams.dateSelector eq 'awarenessDt'}">검거일시</option>
<option value="caseSentDt" th:selected="${searchParams.dateSelector eq 'caseSentDt'}">사건송치</option>
<option value="wrtDt" th:selected="${searchParams.dateSelector eq 'wrtDt'}">작성일</option>
</select>
<input type="text" class="form-control form-control-sm w-35" id="startDate" name="startDate" placeholder="시작일" autocomplete="off" readonly th:value="${searchParams.startDate}">
<input type="text" class="form-control form-control-sm w-35" id="endDate" name="endDate" placeholder="종료일" autocomplete="off" readonly th:value="${searchParams.endDate}">

2
src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html
View File

@ -279,7 +279,7 @@
</div>
</div>
<div class="row mb-1">
<label class="col-sm-1 col-form-label col-form-label-sm text-center">범죄인지</label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">검거일시</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${#temporals.format(ica.crimeAwarenessDt, 'yyyy-MM-dd HH:mm')}"></label>
<label class="col-sm-1 col-form-label col-form-label-sm text-center">사건송치</label>
<label class="col-sm-2 col-form-label col-form-label-sm text-start" th:text="${ica.caseSentDt}"></label>

8
src/main/resources/templates/igActivities/fpiMgt/affair/affairEditModal.html
View File

@ -49,7 +49,7 @@
<select class="form-select form-select-sm" id="affairType1" name="affairType1">
<option value="">선택</option>
<th:block th:each="code:${session.commonCode.get('DC01')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType1}"></option>
<option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType1}"></option>
</th:block>
</select>
</div>
@ -58,7 +58,7 @@
<select class="form-select form-select-sm" id="affairType2" name="affairType2">
<option value="">선택</option>
<th:block th:each="code:${session.commonCode.get('DC02')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType2}"></option>
<option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType2}"></option>
</th:block>
</select>
</div>
@ -67,7 +67,7 @@
<select class="form-select form-select-sm" id="affairType3" name="affairType3">
<option value="">선택</option>
<th:block th:each="code:${session.commonCode.get('DC03')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType3}"></option>
<option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType3}"></option>
</th:block>
</select>
</div>
@ -76,7 +76,7 @@
<select class="form-select form-select-sm" id="affairType4" name="affairType4">
<option value="">선택</option>
<th:block th:each="code:${session.commonCode.get('DC04')}">
<option th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType4}"></option>
<option th:if="${code.useChk eq 'T'}" th:value="${code.itemCd}" th:text="${code.itemValue}" th:selected="${code.itemCd eq affair.affairType4}"></option>
</th:block>
</select>
</div>