From b168ebc938baa64d90e0352b9579b3bffa1c6b65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=B5=9C=EA=B0=95=EC=84=9D?= <cks0504_p@daum.net>
Date: Thu, 20 Jul 2023 11:55:36 +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=ED=86=B5=EA=B3=84?=
 =?UTF-8?q?=20=EB=85=84=EB=8F=84=20=EC=A1=B0=EA=B1=B4=20=EC=BB=AC=EB=9F=BC?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD.=20=EB=A7=88=EA=B0=90=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../InternationalCrimeArrestController.java   |  5 ++-
 .../model/IcaSuspectInfo.java                 |  2 +
 .../resources/mybatisMapper/BudgetMapper.xml  | 42 +++++++++----------
 .../InternationalCrimeArrestMapper.xml        | 10 ++---
 .../faStatistics/internationalCrimeArrest.js  |  1 +
 .../icaEditModal.html                         | 12 ++++++
 .../icaViewModal.html                         | 10 +++--
 7 files changed, 50 insertions(+), 32 deletions(-)

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>
   <select id="callSpGetBudgetCodeYearList" resultType="YearResult">
     select l1_year as year 
-    from public.sp_get_budget_code_year_list( )
+    from sp_get_budget_code_year_list( )
   </select>
   <select id="callSpCopyBudgetItem" resultType="UpdateResult" parameterType="BudgetParams">
-    call public.sp_copy_budget_item (#{year},#{copyYear},#{id},NULL,NULL,NULL)
+    call sp_copy_budget_item (#{year},#{copyYear},#{id},NULL,NULL,NULL)
   </select>
   <select id="callBruteForceDeleteBudgetItem" resultType="UpdateResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpAddBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpUpdateBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpDeleteBudgetPlanCodeName" resultType="UpdateResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpUpdateBudgetPlanCodeItem" resultType="UpdateResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpDeleteBudgetPlan" resultType="UpdateResult" parameterType="BudgetParams">
-    call public.sp_clear_budget_plan(#{year}, #{org}, #{id},NULL,NULL,NULL)
+    call sp_clear_budget_plan(#{year}, #{org}, #{id},NULL,NULL,NULL)
   </select>
   <select id="callSpGetBudgetAssignInfo" resultType="AssignResult" parameterType="BudgetParams">
     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>
   <select id="callSpGetDownOrg" resultType="CodeResult" parameterType="BudgetParams">
     select org_code as orgCode, 
            org_name as orgName  
-    from public.sp_get_down_org(#{org})
+    from sp_get_down_org(#{org})
   </select>
   <select id="callSpGetLowerOrgCodeByName" resultType="CodeResult" parameterType="BudgetParams">
     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>
   <select id="callSpGetHighOrgCode" resultType="String" parameterType="BudgetParams">
     select * 
-    from  public.sp_get_high_org_code(#{org})
+    from  sp_get_high_org_code(#{org})
   </select>
   <select id="callSpAddBudgetAssign" resultType="UpdateResult" parameterType="BudgetParams">
-    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>
   <select id="callSpGetBudgetExpenseInfo" resultType="ExpenseResult" parameterType="BudgetParams">
     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>
   <select id="callSpGetBudgetExpense" resultType="ExpenseInfoResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpAddBudgetExpense" resultType="UpdateResult" parameterType="BudgetParams">
-    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)
   </select>
   <select id="callSpUpdateBudgetExpense" resultType="ExpenseResult" parameterType="BudgetParams">
-    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>
   <select id="callSpGetbudgetStatOrg" resultType="ExpenseResult" parameterType="BudgetParams">
     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>
   <select id="callSpGetbudgetStatDetail" resultType="StatsItemResult" parameterType="BudgetParams">
     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>
   <select id="callSpGetBudgetCodeL3" resultType="L3CodeResult" parameterType="BudgetParams">
     select * 
-    from public.sp_get_budget_code_l3(#{year},null,null,null)
+    from sp_get_budget_code_l3(#{year},null,null,null)
   </select>
 </mapper>
\ 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}
                 </if>
                 <if test='year != null and year != 0'>
-                  and EXTRACT(YEAR FROM wrt_dt) = ${year}
+                  and EXTRACT(YEAR FROM case_sent_dt) = ${year}
                 </if>
                 <if test='month != null and month != 0'>
-                  and EXTRACT(MONTH FROM wrt_dt) = ${month}
+                  and EXTRACT(MONTH FROM case_sent_dt) = ${month}
                 </if>
               </where>
               group by crime_type, violation_type
@@ -163,9 +163,9 @@
     order by a.item_cd, b.item_cd
   </select>
 
-  <select id="selectYearOptionList" resultType="int" parameterType="string">
-    select distinct EXTRACT(YEAR FROM wrt_dt)
+  <select id="selectYearOptionList" resultType="int">
+    select distinct EXTRACT(YEAR FROM case_sent_dt)
     from international_crime_arrest
-    where department = #{organ}
+    where status &lt;> 'DST008'
   </select>
 </mapper>
\ 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 @@
         <div class="border p-1" id="spiDiv">
           <th:block th:if="${#lists.isEmpty(ica.suspectInfoList)}">
             <div class="row spi-list m-0">
+              <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
+              <div class="col-sm-1">
+                <input type="text" class="form-control form-control-sm suspectName">
+              </div>
               <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
               <div class="col-sm-auto">
                 <select class="form-select form-select-sm sex">
@@ -430,6 +434,10 @@
           <th:block th:unless="${#lists.isEmpty(ica.suspectInfoList)}">
             <th:block th:each="suspectInfo:${ica.suspectInfoList}">
               <div class="row spi-list m-0">
+                <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
+                <div class="col-sm-1">
+                  <input type="text" class="form-control form-control-sm suspectName" th:value="${suspectInfo.suspectName}">
+                </div>
                 <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
                 <div class="col-sm-auto">
                   <select class="form-select form-select-sm sex">
@@ -492,6 +500,10 @@
   </form>
   <div class="d-none" id="spiInputDiv">
     <div class="row spi-list m-0">
+      <label class="col-sm-1 col-form-label col-form-label-sm text-center">이름</label>
+      <div class="col-sm-1">
+        <input type="text" class="form-control form-control-sm suspectName">
+      </div>
       <label class="col-sm-1 col-form-label col-form-label-sm text-center">성별</label>
       <div class="col-sm-auto">
         <select class="form-select form-select-sm sex">
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 @@
       <div class="border">
         <th:block th:each="suspect:${ica.suspectInfoList}">
           <div class="row m-0">
+            <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="${suspect.suspectName}"></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">
+            <label class="col-sm-1 col-form-label col-form-label-sm text-start">
               <th:block th:each="code:${session.commonCode.get('SEX')}">
                 <th:block th:if="${code.itemCd eq suspect.sex}" th:text="${code.itemValue}"></th:block>
               </th:block>
             </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">
+            <label class="col-sm-1 col-form-label col-form-label-sm text-start">
               <th:block th:each="code:${session.commonCode.get('AGE')}">
                 <th:block th:if="${code.itemCd eq suspect.age}" th:text="${code.itemValue}"></th:block>
               </th:block>
             </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">
+            <label class="col-sm-1 col-form-label col-form-label-sm text-start">
               <th:block th:each="code:${session.commonCode.get('NNY')}">
                 <th:block th:if="${code.itemCd eq suspect.country}" th:text="${code.itemValue}"></th:block>
               </th:block>
             </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">
+            <label class="col-sm-1 col-form-label col-form-label-sm text-start">
               <th:block th:each="code:${session.commonCode.get('PCR')}">
                 <th:block th:if="${code.itemCd eq suspect.processResult}" th:text="${code.itemValue}"></th:block>
               </th:block>