From 9ac00d37c518d7516a2c2cb18e5c83ac33258c66 Mon Sep 17 00:00:00 2001
From: "gayoun.park" <gayoun.park@tf.dabeeo.com>
Date: Wed, 11 Feb 2026 12:28:38 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AA=A8=EB=8D=B8=EB=B3=84=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=EC=85=8B=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?=
 =?UTF-8?q?=ED=9A=8C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cd/training/dataset/dto/DatasetDto.java   | 27 ++++++++++++++-----
 .../dataset/DatasetRepositoryImpl.java        |  3 +++
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java b/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java
index 03cc556..92316cb 100644
--- a/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java
+++ b/src/main/java/com/kamco/cd/training/dataset/dto/DatasetDto.java
@@ -1,8 +1,10 @@
 package com.kamco.cd.training.dataset.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.kamco.cd.training.common.enums.LearnDataRegister;
 import com.kamco.cd.training.common.enums.LearnDataType;
+import com.kamco.cd.training.common.enums.ModelType;
 import com.kamco.cd.training.common.utils.enums.Enums;
 import com.kamco.cd.training.common.utils.interfaces.JsonFormatDttm;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -228,6 +230,7 @@ public class DatasetDto {
   @JsonInclude(JsonInclude.Include.NON_NULL)
   public static class SelectDataSet {
 
+    private String modelNo; // G1, G2, G3 모델 타입
     private Long datasetId;
     private UUID uuid;
     private String dataType;
@@ -236,12 +239,16 @@ public class DatasetDto {
     private Integer compareYyyy;
     private Integer targetYyyy;
     private String memo;
-    private Long classCount;
-    private Integer buildingCount;
-    private Integer containerCount;
+    @JsonIgnore private Long classCount;
+    private Integer buildingCnt;
+    private Integer containerCnt;
     private String dataTypeName;
 
+    private Long wasteCnt;
+    private Long landCoverCnt;
+
     public SelectDataSet(
+        String modelNo,
         Long datasetId,
         UUID uuid,
         String dataType,
@@ -260,9 +267,15 @@ public class DatasetDto {
       this.targetYyyy = targetYyyy;
       this.memo = memo;
       this.classCount = classCount;
+      if (modelNo.equals(ModelType.G2.getId())) {
+        this.wasteCnt = classCount;
+      } else if (modelNo.equals(ModelType.G3.getId())) {
+        this.landCoverCnt = classCount;
+      }
     }
 
     public SelectDataSet(
+        String modelNo,
         Long datasetId,
         UUID uuid,
         String dataType,
@@ -271,8 +284,8 @@ public class DatasetDto {
         Integer compareYyyy,
         Integer targetYyyy,
         String memo,
-        Integer buildingCount,
-        Integer containerCount) {
+        Integer buildingCnt,
+        Integer containerCnt) {
       this.datasetId = datasetId;
       this.uuid = uuid;
       this.dataType = dataType;
@@ -282,8 +295,8 @@ public class DatasetDto {
       this.compareYyyy = compareYyyy;
       this.targetYyyy = targetYyyy;
       this.memo = memo;
-      this.buildingCount = buildingCount;
-      this.containerCount = containerCount;
+      this.buildingCnt = buildingCnt;
+      this.containerCnt = containerCnt;
     }
 
     public String getDataTypeName(String groupTitleCd) {
diff --git a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
index 9efc078..4ae1cee 100644
--- a/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
+++ b/src/main/java/com/kamco/cd/training/postgres/repository/dataset/DatasetRepositoryImpl.java
@@ -12,6 +12,7 @@ import com.kamco.cd.training.postgres.entity.QDatasetEntity;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.types.Projections;
 import com.querydsl.core.types.dsl.CaseBuilder;
+import com.querydsl.core.types.dsl.Expressions;
 import com.querydsl.core.types.dsl.NumberExpression;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import java.util.List;
@@ -103,6 +104,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
         .select(
             Projections.constructor(
                 SelectDataSet.class,
+                Expressions.constant(req.getModelNo()),
                 dataset.id,
                 dataset.uuid,
                 dataset.dataType,
@@ -174,6 +176,7 @@ public class DatasetRepositoryImpl implements DatasetRepositoryCustom {
         .select(
             Projections.constructor(
                 SelectDataSet.class,
+                Expressions.constant(req.getModelNo()),
                 dataset.id,
                 dataset.uuid,
                 dataset.dataType,
-- 
2.49.1