From 18fa95e9035b09938055d4aafbf541a39281c1ca Mon Sep 17 00:00:00 2001
From: hyojin kim <hjkim4@gcsc.co.kr>
Date: Mon, 24 Nov 2025 10:43:43 +0900
Subject: [PATCH] =?UTF-8?q?:adhesive=5Fbandage:=20OwnerHistory=20DataSetVe?=
 =?UTF-8?q?rsion=20=ED=95=98=EB=93=9C=EC=BD=94=EB=94=A9=20=EC=A0=9C?=
 =?UTF-8?q?=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jobs/shipdetail/batch/dto/OwnerHistoryDto.java   | 12 ++++++++++++
 .../shipdetail/batch/entity/OwnerHistoryEntity.java  |  1 +
 .../batch/processor/ShipDetailDataProcessor.java     |  1 +
 .../batch/repository/ShipDetailRepositoryImpl.java   |  1 +
 .../shipdetail/batch/repository/ShipDetailSql.java   |  2 +-
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java
index 0e98e35..eddccd5 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/dto/OwnerHistoryDto.java
@@ -49,4 +49,16 @@ public class OwnerHistoryDto {
      */
     @JsonProperty("Sequence")
     private String Sequence;
+
+    @JsonProperty("DataSetVersion")
+    private DataSetVersion dataSetVersion;
+
+    @Data
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public static class DataSetVersion {
+        @JsonProperty("DataSetVersion")
+        private String version;
+    }
 }
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java
index 3e77ef7..ccd1ff9 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/entity/OwnerHistoryEntity.java
@@ -20,4 +20,5 @@ public class OwnerHistoryEntity extends BaseEntity {
     private String Owner;
     private String OwnerCode;
     private String Sequence;
+    private String dataSetVersion;
 }
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java
index 88ddbdf..6c8bec8 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/processor/ShipDetailDataProcessor.java
@@ -119,6 +119,7 @@ public class ShipDetailDataProcessor extends BaseProcessor<ShipDetailComparisonD
                     .Owner(safeGetString(dto.getOwner()))
                     .OwnerCode(safeGetString(dto.getOwnerCode()))
                     .Sequence(safeGetString(dto.getSequence()))
+                    .dataSetVersion(safeGetString(dto.getDataSetVersion().getVersion()))
                     .build();
 
             ownerHistoryEntityList.add(entity);
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java
index e4ecfa7..3ff9a49 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailRepositoryImpl.java
@@ -264,6 +264,7 @@ public class ShipDetailRepositoryImpl extends BaseJdbcRepository<ShipDetailEntit
 
     private void setOwnerHistoryInsertParameters(PreparedStatement ps, OwnerHistoryEntity entity)throws Exception{
         int idx = 1;
+        ps.setString(idx++, entity.getDataSetVersion());
         ps.setString(idx++, entity.getCompanyStatus());
         ps.setString(idx++, entity.getEffectiveDate());
         ps.setString(idx++, entity.getLRNO());
diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java
index e898499..1b12bcd 100644
--- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java
+++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipDetailSql.java
@@ -7,7 +7,7 @@ public class ShipDetailSql {
                INSERT INTO test_s_p.test_ownerhistory(
                     datasetversion, companystatus, effectivedate, lrno, "owner", 
                     ownercode, "sequence", shipresultindex, vesselid, rowindex, batch_flag
-                )VALUES('1.0.0', ?, ?, ?, ?, ?, ?, nextval('test_s_p.ownerhistory_index_seq'::regclass), ?, nextval('test_s_p.ownerhistory_row_index_seq'::regclass), 'N')
+                )VALUES(?, ?, ?, ?, ?, ?, ?, nextval('test_s_p.ownerhistory_index_seq'::regclass), ?, nextval('test_s_p.ownerhistory_row_index_seq'::regclass), 'N')
                 ON CONFLICT (lrno,ownercode, effectivedate)
                 DO UPDATE SET
                     datasetversion = EXCLUDED.datasetversion,