From 469ffd563d0b16ce6d9f3f68123eb48dd828f488 Mon Sep 17 00:00:00 2001
From: jhseo <jhseo@xit.co.kr>
Date: Fri, 12 Jan 2024 14:52:46 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20OtherMerge=20=EC=98=A4=EB=9D=BC=ED=81=B4?=
 =?UTF-8?q?=20=EC=BB=AC=EB=9F=BC=20=EB=B3=80=EA=B2=BD=EC=82=AC=ED=95=AD=20?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kr/xit/other/model/ElecnoticeDTO.java     | 32 ++++++++++++++-----
 .../mapper/biz/ens-sisul-mysql-mapper.xml     |  8 ++++-
 .../mapper/other/other-oracle-mapper.xml      | 14 ++++++++
 3 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/mens-api/src/main/java/kr/xit/other/model/ElecnoticeDTO.java b/mens-api/src/main/java/kr/xit/other/model/ElecnoticeDTO.java
index 232f369..f7fd122 100644
--- a/mens-api/src/main/java/kr/xit/other/model/ElecnoticeDTO.java
+++ b/mens-api/src/main/java/kr/xit/other/model/ElecnoticeDTO.java
@@ -55,6 +55,30 @@ public class ElecnoticeDTO {
          * 수정일자
          */
         private String upddate;
+        /**
+         * 발송일시
+         */
+        private String sndngdt;
+        /**
+         * 발송구분
+         */
+        private String sndngsecode;
+        /**
+         * 고지서명
+         */
+        private String tmplatid;
+        /**
+         * 결과조회일시
+         */
+        private String searchdate;
+        /**
+         * 성공여부
+         */
+        private String success;
+        /**
+         * 메시지
+         */
+        private String message;
 
     }
 
@@ -68,14 +92,6 @@ public class ElecnoticeDTO {
          * 우편물 일련번호
          */
         private String unitysndngdetailid;
-        /**
-         * 우편물 요청일시
-         */
-        private String sndngdt;
-        /**
-         * 우편물 발송구분
-         */
-        private String tmplatid;
         /**
          * 고지차수
          */
diff --git a/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml
index 7e82053..bfae205 100644
--- a/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml
+++ b/mens-api/src/main/resources/egovframework/mapper/biz/ens-sisul-mysql-mapper.xml
@@ -164,9 +164,15 @@
          , date_format(tcsm.regist_dt, '%Y%m%d%H%i%S') as insdate
          , 'ens' as upduser
          , date_format(tcsm.updt_dt, '%Y%m%d%H%i%S') as upddate
-         , tcsd.unity_sndng_detail_id as unitysndngdetailid
          , tcsm.sndng_dt as sndngdt
+         , CASE WHEN tcsm.signgu_code = '88328' THEN SUBSTRING(tcsm.tmplat_id, 3,1) /* 교통시설운영처 */
+                WHEN tcsm.signgu_code = '88316' THEN fn_get_code_nm('ETI003', SUBSTRING(tcsm.tmplat_id, 3,1)) /* 추모시설운영처 */
+                 END as sndngsecode
          , tcsm.tmplat_id as tmplatid
+         , date_format(now(), '%Y%m%d%H%i%S') as searchdate
+         , '' as success
+         , tcsm.error_mssage as message
+         , tcsd.unity_sndng_detail_id as unitysndngdetailid
          , '' as gojidepth
          , SUBSTRING(tcsd.main_code, 1, 7)  AS taxnum1
          , SUBSTRING(tcsd.main_code, 8, 8)  AS taxnum2
diff --git a/mens-api/src/main/resources/egovframework/mapper/other/other-oracle-mapper.xml b/mens-api/src/main/resources/egovframework/mapper/other/other-oracle-mapper.xml
index 28272ca..aceca36 100644
--- a/mens-api/src/main/resources/egovframework/mapper/other/other-oracle-mapper.xml
+++ b/mens-api/src/main/resources/egovframework/mapper/other/other-oracle-mapper.xml
@@ -44,6 +44,8 @@
                  SET a.sndngprocesssttus = #{sndngprocesssttus}
                    , a.upduser = #{upduser}
                    , a.upddate = sysdate
+                   , a.success = #{success}
+                   , a.message = #{message}
                WHERE a.sndngprocesssttus != #{sndngprocesssttus}
          WHEN NOT MATCHED THEN
               INSERT (a.unitysndngmastrid
@@ -51,12 +53,24 @@
                     , a.sndngprocesssttus
                     , a.insuser
                     , a.insdate
+                    , a.sndngdt
+                    , a.sndngsecode
+                    , a.tmplatid
+                    , a.searchdate
+                    , a.success
+                    , a.message
               )
               VALUES (#{unitysndngmastrid}
                     , #{sndngco}
                     , #{sndngprocesssttus}
                     , #{insuser}
                     , sysdate
+                    , TO_DATE(#{sndngdt},'YYYYMMDDHH24MISS')
+                    , #{sndngsecode}
+                    , #{tmplatid}
+                    , TO_DATE(#{searchdate},'YYYYMMDDHH24MISS')
+                    , #{success}
+                    , #{message}
               )
 
     </insert>