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

Compare commits

base: DBNT:b2fa46df9b860464c792fbcfdaa19b8fa89bc98b
Branches Tags
DBNT:master
..
compare: DBNT:f93ac028d5ea454756dba69a1ba05af2263c14b5
Branches Tags
DBNT:master

No commits in common. "b2fa46df9b860464c792fbcfdaa19b8fa89bc98b" and "f93ac028d5ea454756dba69a1ba05af2263c14b5" have entirely different histories.
b2fa46df9b ... f93ac028d5

5 changed files with 4 additions and 17 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/dbnt/faisp/main/faStatistics/crackdownsStatus/model/crackdownStatus/CrackdownStatus.java
View File

@ -83,8 +83,6 @@ public class CrackdownStatus extends CrackdownStatusBaseEntity {
@Transient
private String year;
@Transient
private String month;
@Transient
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate napoDate;
@Transient

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

@ -106,7 +106,7 @@ public class InternationalCrimeArrestController {
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[] columnType = { "int", "int", "String", "String", "String", "String", "String", "String", "String", "String","String","String","String","String","String","String"};
excel.setHeaders(headers);
excel.setHeaderNames(headerNames);
excel.setHeaderNames2(headerNames2);

5
src/main/resources/mybatisMapper/CrackdownStatustMapper.xml
View File

@ -7,10 +7,7 @@
<sql id="selectCrackdownStatusListWhere">
<where>
<if test='year != null and year != ""'>
And EXTRACT(YEAR FROM pr.wrt_dt) = #{year}::NUMERIC
</if>
<if test='month != null and month != ""'>
And EXTRACT(MONTH FROM pr.wrt_dt) = #{month}::NUMERIC
And EXTRACT(YEAR FROM pr.wrt_dt) = EXTRACT(YEAR FROM CAST(#{year} AS DATE)::TIMESTAMP)
</if>
<if test='caseNum != null and caseNum != ""'>
AND caseNum = #{caseNum}

10
src/main/resources/templates/faStatistics/crackdownStatus/crackdownStatus.html
View File

@ -26,15 +26,7 @@
<select class="form-select form-select-sm" name="year">
<option value="">연도</option>
<th:block th:each="year : ${#numbers.sequence(2020, 2030)}">
<option th:value="${year}" th:text="${year}" th:selected="${searchParams.year eq year}"></option>
</th:block>
</select>
</div>
<div class="col-auto">
<select class="form-select form-select-sm" name="month">
<option value="">월</option>
<th:block th:each="month : ${#numbers.sequence(1, 12)}">
<option th:value="${month}" th:text="${month}" th:selected="${searchParams.month eq month}"></option>
<option th:value="${year + '-01-01'}" th:text="${year}" th:selected="${searchParams.year eq year}"></option>
</th:block>
</select>
</div>

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

@ -89,7 +89,7 @@
</form>
<div class="tab-pane fade show active" id="ica" role="tabpanel"
aria-labelledby="arrest-tab">
<table class="table table-striped" id="ivsgtTable">
<table class="table table-striped">
<thead>
<tr>
<th rowspan="2">지방청</th>