From b5c9121bb29d8f28713aeba67d814eecbbc995bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= Date: Tue, 30 May 2023 14:47:06 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B5=AD=EC=A0=9C=EB=B2=94=EC=A3=84=20?= =?UTF-8?q?=EA=B2=80=EA=B1=B0=ED=98=84=ED=99=A9=20=EC=9A=94=EC=B2=AD?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EB=B0=98=EC=98=81=20=EC=A3=BC=EC=9A=94?= =?UTF-8?q?=EC=82=AC=EA=B1=B4=EC=B2=98=EB=A6=AC=ED=98=84=ED=99=A9=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=EC=9D=BC=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../model/IcaStatistics.java | 1 + .../InternationalCrimeArrestService.java | 1 + .../majorStatus/MajorStatusController.java | 3 +-- .../faisp/main/userInfo/model/UserInfo.java | 2 ++ .../main/userInfo/model/UserInfoHistory.java | 2 ++ .../InternationalCrimeArrestMapper.xml | 20 +++++++++++++++---- src/main/resources/static/js/common.js | 14 +++++++------ .../faStatistics/internationalCrimeArrest.js | 6 +++--- .../icaStatisticsModal.html | 4 +++- .../internationalCrimeArrestEditModal.html | 11 +++------- .../internationalCrimeArrestViewModal.html | 2 +- .../majorStatus/majorStatusEditModal.html | 4 ++-- .../ivsgt/majorStatus/majorStatusPage.html | 4 ++-- .../majorStatus/majorStatusViewModal.html | 4 ++-- 14 files changed, 47 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java index 4712b218..fc08d612 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaStatistics.java @@ -22,6 +22,7 @@ public class IcaStatistics { private Integer pcr003Cnt = 0; private Integer pcr004Cnt = 0; private Integer pcr005Cnt = 0; + private Integer pcr006Cnt = 0; private String organ; private Integer year; diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java index 04b8e617..554c3eb6 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/service/InternationalCrimeArrestService.java @@ -107,6 +107,7 @@ public class InternationalCrimeArrestService extends BaseService { total.setPcr003Cnt(total.getPcr003Cnt()+statistics.getPcr003Cnt()); total.setPcr004Cnt(total.getPcr004Cnt()+statistics.getPcr004Cnt()); total.setPcr005Cnt(total.getPcr005Cnt()+statistics.getPcr005Cnt()); + total.setPcr006Cnt(total.getPcr006Cnt()+statistics.getPcr006Cnt()); } return total; } diff --git a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java index 1d8e2331..a46b2b5f 100644 --- a/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java +++ b/src/main/java/com/dbnt/faisp/main/ivsgtMgt/majorStatus/MajorStatusController.java @@ -61,8 +61,7 @@ public class MajorStatusController { majorStatus.setWrtUserSeq(loginUser.getUserSeq()); majorStatus.setWrtUserGrd(loginUser.getTitleCd()); majorStatus.setWrtUserNm(loginUser.getUserNm()); - majorStatus.setWrtDt(loginUser.getWrtDt()); - majorStatus.setWrtDt(loginUser.getWrtDt()); + majorStatus.setWrtDt(LocalDateTime.now()); } diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java index 1f9d3cf5..03329ab6 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfo.java @@ -111,6 +111,8 @@ public class UserInfo extends BaseModel implements UserDetails{ private String school; @Column(name = "specialism") private String specialism; + @Column(name = "affair_organ") + private String affairOrgan; @Transient private String modifyPassword; diff --git a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfoHistory.java b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfoHistory.java index 56cc82d6..e990e5a9 100644 --- a/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfoHistory.java +++ b/src/main/java/com/dbnt/faisp/main/userInfo/model/UserInfoHistory.java @@ -117,6 +117,8 @@ public class UserInfoHistory extends BaseModel implements Serializable{ private String school; @Column(name = "specialism") private String specialism; + @Column(name = "affair_organ") + private String affairOrgan; @Embeddable diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index fdcb49d6..74cb4590 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -118,7 +118,8 @@ coalesce(c.pcr002Cnt, 0) as pcr002Cnt, coalesce(c.pcr003Cnt, 0) as pcr003Cnt, coalesce(c.pcr004Cnt, 0) as pcr004Cnt, - coalesce(c.pcr005Cnt, 0) as pcr005Cnt + coalesce(c.pcr005Cnt, 0) as pcr005Cnt, + coalesce(c.pcr006Cnt, 0) as pcr006Cnt from code_mgt a inner join code_mgt b on a.category_cd = 'CTH' and a.item_cd = b.category_cd left outer join ( @@ -126,13 +127,24 @@ aa.violation_type, count(distinct aa.ica_key) as caseCnt, count(*) as suspectCnt, - 0 as arrestCnt, - 0 as arrestSuspectCnt, + count(distinct case + when ab.process_result = 'PCR001' + or ab.process_result = 'PCR002' + or ab.process_result = 'PCR003' then aa.ica_key + else null + end) as arrestCnt, + sum(case + when ab.process_result = 'PCR001' + or ab.process_result = 'PCR002' + or ab.process_result = 'PCR003' then 1 + else 0 + end) as arrestSuspectCnt, sum(case when ab.process_result = 'PCR001' then 1 else 0 end) as pcr001Cnt, sum(case when ab.process_result = 'PCR002' then 1 else 0 end) as pcr002Cnt, sum(case when ab.process_result = 'PCR003' then 1 else 0 end) as pcr003Cnt, sum(case when ab.process_result = 'PCR004' then 1 else 0 end) as pcr004Cnt, - sum(case when ab.process_result = 'PCR005' then 1 else 0 end) as pcr005Cnt + sum(case when ab.process_result = 'PCR005' then 1 else 0 end) as pcr005Cnt, + sum(case when ab.process_result = 'PCR006' then 1 else 0 end) as pcr006Cnt from international_crime_arrest aa inner join ica_suspect_info ab on aa.ica_key = ab.ica_key where department = #{organ} diff --git a/src/main/resources/static/js/common.js b/src/main/resources/static/js/common.js index 759b677d..c1499d3e 100644 --- a/src/main/resources/static/js/common.js +++ b/src/main/resources/static/js/common.js @@ -263,19 +263,21 @@ function dynamicOption(targetTagName, code, defaultOptionName='') { $(targetTagName).append('' + option); } -function departmentDynamicOption(targetTagName, code, defaultOptionName='') { - $(targetTagName).empty(); - let option = ''; +function departmentDynamicOption(targetTagName, parentEl) { + let option = ''; + option += ''; organConfigList.forEach(function (organConfig) { if(organConfig.organCd !== "OG028"){ - if (organConfig.parentOrgan != null && organConfig.organType !== 'OGC002' && organConfig.parentOrgan === code) { + if (organConfig.parentOrgan != null + && organConfig.organType !== 'OGC002' + && organConfig.parentOrgan === parentEl.val()) { option += ''; - }else if(code==="OG001" && organConfig.organType === 'OGC003'){ + }else if(parentEl.val()==="OG001" && organConfig.organType === 'OGC003'){ option += ''; } } }); - $(targetTagName).append('' + option); + $(targetTagName).empty().append(option); } function dateTimeCalc(startDateTime, endDateTime) { diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 5053ac49..7429edfd 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -10,7 +10,7 @@ $(function(){ autoclose: true }); - // getStatisticsModal(); + //getStatisticsModal(); }); $(document).on('click', '#statisticsModalBtn', function (){ @@ -58,8 +58,8 @@ $(document).on('click', '.tr', function (){ getIcaViewModal($(this).data('key')); }); -$(document).on('change', 'select[name="organ"]', function (){ - departmentDynamicOption('select[name="department"]', $(this).val()); +$(document).on('change', '#organSelector', function (){ + departmentDynamicOption('#departmentSelector', $(this)); }); $(document).on('change', '#crimeType', function (){ diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html index 98a213e0..aa492491 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaStatisticsModal.html @@ -53,7 +53,7 @@ 위반유형 발생 검거 - 피의자 신병 처리 결과 + 피의자 신병 처리 결과 건 @@ -70,6 +70,7 @@ + @@ -86,6 +87,7 @@ + diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html index 9d35fb17..7b8b139f 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/internationalCrimeArrestEditModal.html @@ -19,7 +19,7 @@
- @@ -30,10 +30,10 @@
- - + @@ -417,7 +417,6 @@
- -
- +
- +
diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html index 30dc7413..06559c1d 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusPage.html @@ -83,7 +83,7 @@ 제목 내용 첨부파일 - 작성일시 + 작성일 @@ -99,7 +99,7 @@ - + diff --git a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html index bb55d115..5010990c 100644 --- a/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html +++ b/src/main/resources/templates/ivsgt/majorStatus/majorStatusViewModal.html @@ -25,9 +25,9 @@ - + + th:text="${#temporals.format(majorStatus.wrtDt, 'yyyy-MM-dd')}">