Merge branch 'feat/demo-20251205' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/demo-20251205

# Conflicts:
#	src/main/java/com/kamco/cd/kamcoback/postgres/repository/changedetection/ChangeDetectionRepositoryImpl.java

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalSttcEntity.java

@@ -5,8 +5,7 @@ import jakarta.persistence.EmbeddedId;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Table;
 import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
-import java.time.ZonedDateTime;
+import java.time.OffsetDateTime;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.annotations.ColumnDefault;
@@ -19,24 +18,22 @@ public class MapSheetAnalSttcEntity {
 
   @EmbeddedId private MapSheetAnalSttcEntityId id;
 
-  @ColumnDefault("0")
   @Column(name = "class_before_cnt")
   private Long classBeforeCnt;
 
-  @ColumnDefault("0")
   @Column(name = "class_after_cnt")
   private Long classAfterCnt;
 
   @ColumnDefault("now()")
   @Column(name = "created_dttm")
-  private ZonedDateTime createdDttm;
+  private OffsetDateTime createdDttm;
 
   @Column(name = "created_uid")
   private Long createdUid;
 
   @ColumnDefault("now()")
   @Column(name = "updated_dttm")
-  private ZonedDateTime updatedDttm;
+  private OffsetDateTime updatedDttm;
 
   @Column(name = "updated_uid")
   private Long updatedUid;
@@ -45,15 +42,6 @@ public class MapSheetAnalSttcEntity {
   @Column(name = "ref_map_sheet_num", nullable = false)
   private Long refMapSheetNum;
 
-  @NotNull
-  @Column(name = "data_uid", nullable = false)
-  private Long dataUid;
-
-  @Size(max = 30)
-  @Column(name = "class_before_cd", length = 30)
-  private String classBeforeCd;
-
-  @Size(max = 30)
-  @Column(name = "class_after_cd", length = 30)
-  private String classAfterCd;
+  @Column(name = "class_after_prob_avg")
+  private Double classAfterProbAvg;
 }

src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalSttcEntityId.java

@@ -3,18 +3,20 @@ package com.kamco.cd.kamcoback.postgres.entity;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embeddable;
 import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.Objects;
 import lombok.Getter;
 import lombok.Setter;
 import org.hibernate.Hibernate;
+import org.hibernate.annotations.ColumnDefault;
 
 @Getter
 @Setter
 @Embeddable
 public class MapSheetAnalSttcEntityId implements Serializable {
 
-  private static final long serialVersionUID = 2285491656408229553L;
+  private static final long serialVersionUID = 3649782418773406961L;
 
   @NotNull
   @Column(name = "compare_yyyy", nullable = false)
@@ -28,6 +30,25 @@ public class MapSheetAnalSttcEntityId implements Serializable {
   @Column(name = "map_sheet_num", nullable = false)
   private Long mapSheetNum;
 
+  @NotNull
+  @Column(name = "data_uid", nullable = false)
+  private Long dataUid;
+
+  @Size(max = 30)
+  @NotNull
+  @ColumnDefault("NULL")
+  @Column(name = "class_before_cd", nullable = false, length = 30)
+  private String classBeforeCd;
+
+  @Size(max = 30)
+  @NotNull
+  @ColumnDefault("NULL")
+  @Column(name = "class_after_cd", nullable = false, length = 30)
+  private String classAfterCd;
+
+  @Column(name = "anal_uid")
+  private Long analUid;
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -38,12 +59,17 @@ public class MapSheetAnalSttcEntityId implements Serializable {
     }
     MapSheetAnalSttcEntityId entity = (MapSheetAnalSttcEntityId) o;
     return Objects.equals(this.targetYyyy, entity.targetYyyy)
+        && Objects.equals(this.analUid, entity.analUid)
+        && Objects.equals(this.dataUid, entity.dataUid)
+        && Objects.equals(this.classAfterCd, entity.classAfterCd)
         && Objects.equals(this.compareYyyy, entity.compareYyyy)
+        && Objects.equals(this.classBeforeCd, entity.classBeforeCd)
         && Objects.equals(this.mapSheetNum, entity.mapSheetNum);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(targetYyyy, compareYyyy, mapSheetNum);
+    return Objects.hash(
+        targetYyyy, analUid, dataUid, classAfterCd, compareYyyy, classBeforeCd, mapSheetNum);
   }
 }