diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java index e27dd833..5763c90f 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/InternationalCrimeArrestController.java @@ -56,6 +56,7 @@ public class InternationalCrimeArrestController { if(yearList.size()==0){ yearList.add(icaStatistics.getYear()); } + mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/icaStatistics")); mav.addObject("accessAuth", accessAuth); mav.addObject("yearOptionList", yearList); mav.addObject("searchParams", icaStatistics); @@ -77,7 +78,7 @@ public class InternationalCrimeArrestController { mav.addObject("icaList", internationalCrimeArrestService.selectInternationalCrimeArrestList(internationalCrimeArrest)); internationalCrimeArrest.setContentCnt(internationalCrimeArrestService.selectInternationalCrimeArrestListCnt(internationalCrimeArrest)); internationalCrimeArrest.setPaginationInfo(); - mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/internationalCrimeArrest")); + mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/icaStatistics")); mav.addObject("organConfigList", organConfigService.selectOrganList()); mav.addObject("searchParams", internationalCrimeArrest); return mav; @@ -111,7 +112,7 @@ public class InternationalCrimeArrestController { mav.addObject("accessAuth", authMgtService.selectAccessConfigList(loginUser.getUserSeq(), "/faStatistics/icaStatistics").get(0).getAccessAuth()); mav.addObject("mgtOrganList", loginUser.getDownOrganCdList()); //마감여부 - mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/internationalCrimeArrest")); + mav.addObject("deadlineState", menuMgtService.selectDeadlineChk("/faStatistics/icaStatistics")); return mav; } diff --git a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java index eefe71fc..8b45b222 100644 --- a/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java +++ b/src/main/java/com/dbnt/faisp/main/faStatistics/internationalCrimeArrest/model/IcaSuspectInfo.java @@ -32,6 +32,8 @@ public class IcaSuspectInfo extends BaseModel { private String country; @Column(name = "process_result") private String processResult; + @Column(name = "suspect_name") + private String suspectName; @Embeddable @Data diff --git a/src/main/resources/mybatisMapper/BudgetMapper.xml b/src/main/resources/mybatisMapper/BudgetMapper.xml index 76ea759d..efa86a0b 100644 --- a/src/main/resources/mybatisMapper/BudgetMapper.xml +++ b/src/main/resources/mybatisMapper/BudgetMapper.xml @@ -14,77 +14,77 @@ remark, modi_id as modiId, modi_date as modiDate - from public.sp_get_budget_plan_info(#{code1}, #{code2}, #{code3}) + from sp_get_budget_plan_info(#{code1}, #{code2}, #{code3}) select l1_year as year - from public.sp_get_budget_code_year_list( ) + from sp_get_budget_code_year_list( ) - call public.sp_copy_budget_item (#{year},#{copyYear},#{id},NULL,NULL,NULL) + call sp_copy_budget_item (#{year},#{copyYear},#{id},NULL,NULL,NULL) - call public.sp_brute_force_delete_budget_item(#{year}, #{id},NULL,NULL,NULL) + call sp_brute_force_delete_budget_item(#{year}, #{id},NULL,NULL,NULL) - call public.sp_add_budget_plan_codename (#{year}, #{code1}, #{code2}, #{code3}, #{org}, #{id} ,NULL, NULL, NULL) + call sp_add_budget_plan_codename (#{year}, #{code1}, #{code2}, #{code3}, #{org}, #{id} ,NULL, NULL, NULL) - call public.sp_update_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{newCode1}, #{newCode2}, #{newCode3}, #{org},#{id},NULL,NULL,NULL) + call sp_update_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{newCode1}, #{newCode2}, #{newCode3}, #{org},#{id},NULL,NULL,NULL) - call public.sp_delete_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{org},#{id},NULL,NULL,NULL) + call sp_delete_budget_plan_codename(#{year}, #{code1}, #{code2}, #{code3}, #{org},#{id},NULL,NULL,NULL) - call public.sp_update_budget_plan_item (#{year}, #{code1}, #{code2}, #{code3}, #{amount}::int, #{org}, #{id},NULL, NULL, NULL) + call sp_update_budget_plan_item (#{year}, #{code1}, #{code2}, #{code3}, #{amount}::int, #{org}, #{id},NULL, NULL, NULL) - call public.sp_clear_budget_plan(#{year}, #{org}, #{id},NULL,NULL,NULL) + call sp_clear_budget_plan(#{year}, #{org}, #{id},NULL,NULL,NULL) select * - from public.sp_get_budget_assign_info(#{year}, #{code}, #{user} ,#{stDate}::date, #{edDate}::date) + from sp_get_budget_assign_info(#{year}, #{code}, #{user} ,#{stDate}::date, #{edDate}::date) select org_code as orgCode, org_name as orgName - from public.sp_get_down_org(#{org}) + from sp_get_down_org(#{org}) select org_code as orgCode, org_name as orgName - from public.sp_get_lower_org_code_by_name('본청') + from sp_get_lower_org_code_by_name('본청') select * - from public.sp_get_high_org_code(#{org}) + from sp_get_high_org_code(#{org}) - call public.sp_add_budget_assign(#{code}, #{org}, #{org}1, #{amount}::int, #{dt}::date, 'admin', NULL,NULL,NULL) + call sp_add_budget_assign(#{code}, #{org}, #{org}1, #{amount}::int, #{dt}::date, 'admin', NULL,NULL,NULL) select * - from public.sp_get_budget_expense_info(#{year},#{code},#{user},#{stDate}::date,#{edDate}::date) + from sp_get_budget_expense_info(#{year},#{code},#{user},#{stDate}::date,#{edDate}::date) - select * from public.sp_get_budget_expense(#{year},#{code1},#{code2},#{code3},#{org},1,2,20,1) + select * from sp_get_budget_expense(#{year},#{code1},#{code2},#{code3},#{org},1,2,20,1) - call public.sp_add_budget_EXPENSE(#{year},#{code1},#{code2},#{code3}, #{org}, #{item} ,cast (#{amount} as bigint), #{dt}::date,'admin',NULL,NULL,NULL) + call sp_add_budget_EXPENSE(#{year},#{code1},#{code2},#{code3}, #{org}, #{item} ,cast (#{amount} as bigint), #{dt}::date,'admin',NULL,NULL,NULL) - call public.sp_update_budget_expense(#{seq},#{item} ,#{amount}::int,NULL,NULL,NULL,NULL,NULL) + call sp_update_budget_expense(#{seq},#{item} ,#{amount}::int,NULL,NULL,NULL,NULL,NULL) select * - from public.sp_get_budget_statistics_by_org(#{year},#{code},#{user},#{stDate}::date,#{edDate}::date,#{won}) + from sp_get_budget_statistics_by_org(#{year},#{code},#{user},#{stDate}::date,#{edDate}::date,#{won}) select * - from public.sp_get_budget_statistics_by_item(#{year},#{code},#{item}, #{user},#{stDate}::date,#{edDate}::date,#{won}) + from sp_get_budget_statistics_by_item(#{year},#{code},#{item}, #{user},#{stDate}::date,#{edDate}::date,#{won}) select * - from public.sp_get_budget_code_l3(#{year},null,null,null) + from sp_get_budget_code_l3(#{year},null,null,null) \ No newline at end of file diff --git a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml index 34c1c204..4e5f6773 100644 --- a/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml +++ b/src/main/resources/mybatisMapper/InternationalCrimeArrestMapper.xml @@ -152,10 +152,10 @@ and department = #{organ} - and EXTRACT(YEAR FROM wrt_dt) = ${year} + and EXTRACT(YEAR FROM case_sent_dt) = ${year} - and EXTRACT(MONTH FROM wrt_dt) = ${month} + and EXTRACT(MONTH FROM case_sent_dt) = ${month} group by crime_type, violation_type @@ -163,9 +163,9 @@ order by a.item_cd, b.item_cd - - select distinct EXTRACT(YEAR FROM wrt_dt) + + select distinct EXTRACT(YEAR FROM case_sent_dt) from international_crime_arrest - where department = #{organ} + where status <> 'DST008' \ No newline at end of file diff --git a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js index 52c894f0..e00427cb 100644 --- a/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js +++ b/src/main/resources/static/js/faStatistics/internationalCrimeArrest.js @@ -189,6 +189,7 @@ function saveInternationalCrimeArrest(status){ $.each($("#spiDiv").find(".spi-list"), function (idx, spi){ spi = $(spi); formData.append("suspectInfoList["+idx+"].spiKey", idx+1); + formData.append("suspectInfoList["+idx+"].suspectName", spi.find('.suspectName').val()); formData.append("suspectInfoList["+idx+"].sex", spi.find('.sex').val()); formData.append("suspectInfoList["+idx+"].age", spi.find('.age').val()); formData.append("suspectInfoList["+idx+"].country", spi.find('.country').val()); diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html index 7b8b139f..1498333d 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaEditModal.html @@ -389,6 +389,10 @@ + 이름 + + + 성별 @@ -430,6 +434,10 @@ + 이름 + + + 성별 @@ -492,6 +500,10 @@ + 이름 + + + 성별 diff --git a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html index ae13d12c..3f466d19 100644 --- a/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html +++ b/src/main/resources/templates/faStatistics/internationalCrimeArrest/icaViewModal.html @@ -252,26 +252,28 @@ + 이름 + 성별 - + 나이 - + 국적 - + 신병처리 - +