diff --git a/src/main/java/com/kri/kfpa/dash/common/consts/KfpaDashConstant.java b/src/main/java/com/kri/kfpa/dash/common/consts/KfpaDashConstant.java index 797adc2..c63918a 100644 --- a/src/main/java/com/kri/kfpa/dash/common/consts/KfpaDashConstant.java +++ b/src/main/java/com/kri/kfpa/dash/common/consts/KfpaDashConstant.java @@ -9,11 +9,11 @@ public final class KfpaDashConstant { public static final String KFPA_COMMENT_PKEY = "2604005_F"; public static final String TOTAL = "-1"; public static final String SEOUL = "1"; - public static final String GYEONGGI = "2"; - public static final String BUSAN = "3"; - public static final String DAEGU = "4"; - public static final String DAEJEON = "5"; - public static final String GWANGJU = "6"; + public static final String GYEONGGI = "3"; + public static final String BUSAN = "2"; + public static final String DAEGU = "5"; + public static final String DAEJEON = "6"; + public static final String GWANGJU = "4"; private static final String IDKEY_PREFIX = "Q1003_"; diff --git a/src/main/java/com/kri/kfpa/dash/mapper/DataMapper.java b/src/main/java/com/kri/kfpa/dash/mapper/DataMapper.java index 0c5878a..84990aa 100644 --- a/src/main/java/com/kri/kfpa/dash/mapper/DataMapper.java +++ b/src/main/java/com/kri/kfpa/dash/mapper/DataMapper.java @@ -15,8 +15,7 @@ public interface DataMapper { List selectDivCsiData(@Param("pkey") String pkey); List selectDivObjectTypeCsiRank( - @Param("pkey") String pkey, - @Param("div") String div + @Param("pkey") String pkey ); DivCommentEntity selectDivComment( diff --git a/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java b/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java index 6d5ba11..0c83448 100644 --- a/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java +++ b/src/main/java/com/kri/kfpa/dash/service/StatisticsService.java @@ -55,7 +55,9 @@ public class StatisticsService { } List objectTypeCsiRankList = - dataMapper.selectDivObjectTypeCsiRank(KFPA_DASH_PKEY, div); + dataMapper.selectDivObjectTypeCsiRank(KFPA_DASH_PKEY).stream() + .filter(entity -> entity.getDiv().equals(div)) + .toList(); Map divDetailData = new LinkedHashMap<>(); Map divCommentCache = new LinkedHashMap<>(); diff --git a/src/main/resources/mybatis/mapper/DataMapper.xml b/src/main/resources/mybatis/mapper/DataMapper.xml index 093024e..dd43be0 100644 --- a/src/main/resources/mybatis/mapper/DataMapper.xml +++ b/src/main/resources/mybatis/mapper/DataMapper.xml @@ -42,11 +42,7 @@ THEN JSON_VALUE(DATJSON, '$.Q16.Q14') ELSE JSON_VALUE(DATJSON, '$.Q14.Q14') END AS object_type_raw - , CASE - WHEN JSON_VALUE(DATJSON, '$.Q16.Q15') IS NOT NULL - THEN JSON_VALUE(DATJSON, '$.Q16.Q15') - ELSE JSON_VALUE(DATJSON, '$.Q15.Q15') - END AS div + , JSON_VALUE(DATJSON, '$.Q16.Q16') AS div FROM Kon.dbo.DATA WHERE SURVEY_TYPE != 'TEST' AND Status = 10 @@ -56,6 +52,19 @@