diff --git a/src/main/java/kr/co/kr/vo/TransmissionVo.java b/src/main/java/kr/co/kr/vo/TransmissionVo.java index 363d7a1..797022b 100644 --- a/src/main/java/kr/co/kr/vo/TransmissionVo.java +++ b/src/main/java/kr/co/kr/vo/TransmissionVo.java @@ -44,6 +44,8 @@ public class TransmissionVo{ private String sect_03; private String sect_04; private String sect_07; + private String sect_08; + private String sect_09; private String sect_05; private String sect_06; private String sect_11; @@ -51,6 +53,8 @@ public class TransmissionVo{ private String sect_13; private String sect_14; private String sect_17; + private String sect_18; + private String sect_19; private String sect_15; private String sect_16; private String sect_21; @@ -58,6 +62,8 @@ public class TransmissionVo{ private String sect_23; private String sect_24; private String sect_27; + private String sect_28; + private String sect_29; private String sect_25; private String sect_26; private String sect_91; diff --git a/src/main/resources/mapper/transmission_mapper.xml b/src/main/resources/mapper/transmission_mapper.xml index 7353ba0..ba1dafd 100644 --- a/src/main/resources/mapper/transmission_mapper.xml +++ b/src/main/resources/mapper/transmission_mapper.xml @@ -167,23 +167,55 @@ ( SELECT area_cd, cluster, cand_party, sect, cand_party_cd, sum_cnt, cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY - WHERE option_cd = '02' UNION ALL + WHERE option_cd = '02' + UNION ALL + -- 남자/여자 60대 이상 SELECT area_cd, cluster, cand_party, LEFT(sect, 1) + '7' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE sect IN ('15','16','25','26') AND option_cd = '02' - GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '7', cand_party_cd UNION ALL + GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '7', cand_party_cd + UNION ALL + -- 남자/여자 40대50대 + SELECT area_cd, cluster, cand_party, LEFT(sect, 1) + '8' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt + FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY + WHERE sect IN ('13','14','23','24') AND option_cd = '02' + GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '8', cand_party_cd + UNION ALL + -- 남자/여자 30대이하 + SELECT area_cd, cluster, cand_party, LEFT(sect, 1) + '9' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt + FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY + WHERE sect IN ('11','12','21','22') AND option_cd = '02' + GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '9', cand_party_cd + UNION ALL + --남자/여자 SELECT area_cd, cluster, cand_party, LEFT(sect, 1) + '0' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE option_cd = '02' - GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '0', cand_party_cd UNION ALL + GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '0', cand_party_cd + UNION ALL + --20대/30대/40대/50대/60대/70대이상 SELECT area_cd, cluster, cand_party, '0' + RIGHT(sect, 1) AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE option_cd = '02' - GROUP BY area_cd, cluster, cand_party, '0' + RIGHT(sect, 1), cand_party_cd UNION ALL + GROUP BY area_cd, cluster, cand_party, '0' + RIGHT(sect, 1), cand_party_cd + UNION ALL + -- 60대이상 SELECT area_cd, cluster, cand_party, '07' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE sect IN ('15','16','25','26') AND option_cd = '02' GROUP BY area_cd, cluster, cand_party, cand_party_cd + UNION ALL + -- 40대50대(40세~59세) + SELECT area_cd, cluster, cand_party, '08' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt + FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY + WHERE sect IN ('13','14','23','24') AND option_cd = '02' + GROUP BY area_cd, cluster, cand_party, cand_party_cd + UNION ALL + -- 30대이하(39세이하) + SELECT area_cd, cluster, cand_party, '09' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt + FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY + WHERE sect IN ('11','12','21','22') AND option_cd = '02' + GROUP BY area_cd, cluster, cand_party, cand_party_cd ) ST LEFT JOIN exitpoll_2022le.dbo.F_Weight W ON ST.area_cd = W.area_cd AND ST.cluster = W.cluster GROUP BY ST.area_cd, cand_party, sect, cand_party_cd UNION ALL @@ -223,9 +255,9 @@ WHEN rank_1 - rank_2 <= PE.err_limit * 2 THEN CASE WHEN ROW_NUMBER() OVER(PARTITION BY FOF.area_cd, FOF.cand_party ORDER BY CONVERT(NUMERIC(4,1), vote_rate) DESC) <= 2 THEN 2 ELSE 0 END END,0) AS cand_result, - [10] as sect_10, [20] as sect_20, [01] as sect_01, [02] as sect_02, [03] as sect_03, [04] as sect_04, [07] as sect_07, [05] as sect_05, [06] as sect_06, - [11] as sect_11, [12] as sect_12, [13] as sect_13, [14] as sect_14, [17] as sect_17, [15] as sect_15, [16] as sect_16, - [21] as sect_21, [22] as sect_22, [23] as sect_23, [24] as sect_24, [27] as sect_27, [25] as sect_25, [26] as sect_26, + [10] as sect_10, [20] as sect_20, [01] as sect_01, [02] as sect_02, [03] as sect_03, [04] as sect_04, [07] as sect_07, [08] as sect_08, [09] as sect_09, [05] as sect_05, [06] as sect_06, + [11] as sect_11, [12] as sect_12, [13] as sect_13, [14] as sect_14, [17] as sect_17, [18] as sect_18, [19] as sect_19, [15] as sect_15, [16] as sect_16, + [21] as sect_21, [22] as sect_22, [23] as sect_23, [24] as sect_24, [27] as sect_27, [28] as sect_28, [29] as sect_29, [25] as sect_25, [26] as sect_26, [91] as sect_91, [92] as sect_92, [93] as sect_93, [94] as sect_94, [95] as sect_95, [96] as sect_96, [97] as sect_97, [98] as sect_98, FORMAT(pre_rate, '00.0') AS pre_rate, FORMAT(dd_rate, '00.0') AS dd_rate @@ -256,9 +288,9 @@ ) RK ON FOF.area_cd = RK.area_cd AND FOF.cand_party = RK.cand_party LEFT JOIN ( SELECT U.area_cd, U.cand_party, U.cand_party_cd, dd_rate, - [10], [20], [01], [02], [03], [04], [07], [05], [06], - [11], [12], [13], [14], [17], [15], [16], - [21], [22], [23], [24], [27], [25], [26], + [10], [20], [01], [02], [03], [04], [07], [08], [09], [05], [06], + [11], [12], [13], [14], [17], [18], [19], [15], [16], + [21], [22], [23], [24], [27], [28], [29], [25], [26], ISNULL([91], '00.0') as [91], ISNULL([92], '00.0') as [92], ISNULL([93], '00.0') as [93], @@ -284,9 +316,9 @@ PIVOT ( MAX(sect_rate) FOR sect IN ( - [10], [20], [01], [02], [03], [04], [07], [05], [06], - [11], [12], [13], [14], [17], [15], [16], - [21], [22], [23], [24], [27], [25], [26], + [10], [20], [01], [02], [03], [04], [07], [08], [09], [05], [06], + [11], [12], [13], [14], [17], [18], [19], [15], [16], + [21], [22], [23], [24], [27], [28], [29], [25], [26], [91], [92], [93], [94], [95], [96], [97], [98] ) ) U @@ -313,23 +345,40 @@ ( SELECT area_cd, cluster, cand_party, sect, cand_party_cd, sum_cnt, cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY - WHERE option_cd = '02' UNION ALL + WHERE option_cd = '02' + UNION ALL SELECT area_cd, cluster, cand_party, LEFT(sect, 1) + '7' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE sect IN ('15','16','25','26') AND option_cd = '02' - GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '7', cand_party_cd UNION ALL + GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '7', cand_party_cd + UNION ALL SELECT area_cd, cluster, cand_party, LEFT(sect, 1) + '0' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE option_cd = '02' - GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '0', cand_party_cd UNION ALL + GROUP BY area_cd, cluster, cand_party, LEFT(sect, 1) + '0', cand_party_cd + UNION ALL SELECT area_cd, cluster, cand_party, '0' + RIGHT(sect, 1) AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE option_cd = '02' - GROUP BY area_cd, cluster, cand_party, '0' + RIGHT(sect, 1), cand_party_cd UNION ALL + GROUP BY area_cd, cluster, cand_party, '0' + RIGHT(sect, 1), cand_party_cd + UNION ALL + -- 60대이상 SELECT area_cd, cluster, cand_party, '07' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY WHERE sect IN ('15','16','25','26') AND option_cd = '02' GROUP BY area_cd, cluster, cand_party, cand_party_cd + UNION ALL + -- 40대50대(40세~59세) + SELECT area_cd, cluster, cand_party, '08' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt + FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY + WHERE sect IN ('13','14','23','24') AND option_cd = '02' + GROUP BY area_cd, cluster, cand_party, cand_party_cd + UNION ALL + -- 30대이하(39세이하) + SELECT area_cd, cluster, cand_party, '09' AS sect, cand_party_cd, SUM(sum_cnt) AS sum_cnt, SUM(cnt) AS cnt + FROM exitpoll_2022le.dbo.TMP_OUTPUT_DDAY + WHERE sect IN ('11','12','21','22') AND option_cd = '02' + GROUP BY area_cd, cluster, cand_party, cand_party_cd ) ST LEFT JOIN exitpoll_2022le.dbo.F_Weight W ON ST.area_cd = W.area_cd AND ST.cluster = W.cluster GROUP BY ST.area_cd, cand_party, sect, cand_party_cd UNION ALL @@ -367,7 +416,7 @@ WHEN rank_1 - rank_2 <= PE.err_limit * 2 THEN CASE WHEN ROW_NUMBER() OVER(PARTITION BY FOF.area_cd, FOF.cand_party ORDER BY CONVERT(NUMERIC(4,1), vote_rate) DESC) <= 2 THEN 2 ELSE 0 END END AS cand_result, - [10] as sect_10, [20] as sect_20, [01] as sect_01, [02] as sect_02, [03] as sect_03, [04] as sect_04, [07] as sect_07, [05] as sect_05, [06] as sect_06, + [10] as sect_10, [20] as sect_20, [01] as sect_01, [02] as sect_02, [03] as sect_03, [04] as sect_04, [07] as sect_07, [05] as sect_05, [06] as sect_06, [08] as sect_08, [09] as sect_09, FORMAT(pre_rate, '00.0') AS pre_rate, FORMAT(dd_rate, '00.0') AS dd_rate FROM exitpoll_2022le.dbo.F_output_final FOF LEFT JOIN exitpoll_2022le.dbo.F_area FA ON FOF.area_cd = FA.area_cd @@ -392,7 +441,7 @@ ) RK ON FOF.area_cd = RK.area_cd AND FOF.cand_party = RK.cand_party LEFT JOIN ( SELECT U.area_cd, U.cand_party, U.cand_party_cd, dd_rate, - [10], [20], [01], [02], [03], [04], [07], [05], [06], + [10], [20], [01], [02], [03], [04], [07], [08], [09], [05], [06], [11], [12], [13], [14], [17], [15], [16], [21], [22], [23], [24], [27], [25], [26], ISNULL([91], '00.0') as [91], @@ -420,7 +469,7 @@ PIVOT ( MAX(sect_rate) FOR sect IN ( - [10], [20], [01], [02], [03], [04], [07], [05], [06], + [10], [20], [01], [02], [03], [04], [07], [08], [09], [05], [06], [11], [12], [13], [14], [17], [15], [16], [21], [22], [23], [24], [27], [25], [26], [91], [92], [93], [94], [95], [96], [97], [98] diff --git a/src/main/webapp/WEB-INF/jsp/contents/transmission.jsp b/src/main/webapp/WEB-INF/jsp/contents/transmission.jsp index bd9bde1..d21f176 100644 --- a/src/main/webapp/WEB-INF/jsp/contents/transmission.jsp +++ b/src/main/webapp/WEB-INF/jsp/contents/transmission.jsp @@ -128,7 +128,7 @@ tmpHtml += ""; tmpHtml += ""; $.each(keys, function(idx, k){ - if(",후보득표율,남자,여자,20대,30대,40대,50대,60대이상,60대,70대이상,남자20대,남자30대,남자40대,남자50대,남자60대이상,남자60대,남자70대이상,여자20대,여자30대,여자40대,여자50대,여자60대이상,여자60대,여자70대이상,1층,2층,3층,4층,5층,6층,7층,8층,사전투표득표율,당일투표득표율,".indexOf(","+k+",") > -1){ + if(",후보득표율,남자,여자,20대,30대,40대,50대,60대,70대이상,60대이상,40대50대,30대이하,남자20대,남자30대,남자40대,남자50대,남자60대,남자70대이상,남자60대이상,남자40대50대,남자30대이하,여자20대,여자30대,여자40대,여자50대,여자60대,여자70대이상,여자60대이상,여자40대50대,여자30대이하,1층,2층,3층,4층,5층,6층,7층,8층,사전투표득표율,당일투표득표율,".indexOf(","+k+",") > -1){ var tmpVal = $.grep(tmpDataList, function(obj){ return obj["분류코드"] +"|"+ obj["지역코드"] == codeDiv; }).map(function(d){ return Number(d[k]); }).reduce(function(a,b){ return a+b; }); tmpHtml += "" + tmpVal.toFixed(1) + ""; }else{ @@ -147,7 +147,7 @@ tmpHtml += ""; $.each(keys, function(idx, k){ - if(",남자,여자,20대,30대,40대,50대,60대이상,60대,70대이상,남자20대,남자30대,남자40대,남자50대,남자60대이상,남자60대,남자70대이상,여자20대,여자30대,여자40대,여자50대,여자60대이상,여자60대,여자70대이상,1층,2층,3층,4층,5층,6층,7층,8층,사전투표득표율,당일투표득표율,".indexOf(","+k+",") > -1){ + if(",남자,여자,20대,30대,40대,50대,60대,70대이상,60대이상,40대50대,30대이하,남자20대,남자30대,남자40대,남자50대,남자60대이상,남자40대50대,남자30대이하,남자60대,남자70대이상,여자20대,여자30대,여자40대,여자50대,여자60대이상,여자40대50대,여자30대이하,여자60대,여자70대이상,1층,2층,3층,4층,5층,6층,7층,8층,사전투표득표율,당일투표득표율,".indexOf(","+k+",") > -1){ if(",남자,여자,".indexOf(","+k+",") > -1){ if(Number(o["남자"]) >= Number(o["후보득표율"]) && Number(o["후보득표율"]) >= Number(o["여자"]) || Number(o["여자"]) >= Number(o["후보득표율"]) && Number(o["후보득표율"]) >= Number(o["남자"])){ @@ -172,7 +172,7 @@ tmpHtml += ""; $.each(keys, function(idx, k){ - if(",후보득표율,남자,여자,20대,30대,40대,50대,60대이상,60대,70대이상,남자20대,남자30대,남자40대,남자50대,남자60대이상,남자60대,남자70대이상,여자20대,여자30대,여자40대,여자50대,여자60대이상,여자60대,여자70대이상,1층,2층,3층,4층,5층,6층,7층,8층,사전투표득표율,당일투표득표율,".indexOf(","+k+",") > -1){ + if(",후보득표율,남자,여자,20대,30대,40대,50대,60대,70대이상,60대이상,40대50대,30대이하,남자20대,남자30대,남자40대,남자50대,남자60대이상,남자40대50대,남자30대이하,남자60대,남자70대이상,여자20대,여자30대,여자40대,여자50대,여자60대이상,여자40대50대,여자30대이하,여자60대,여자70대이상,1층,2층,3층,4층,5층,6층,7층,8층,사전투표득표율,당일투표득표율,".indexOf(","+k+",") > -1){ var tmpVal = $.grep(tmpDataList, function(obj){ return obj["분류코드"] +"|"+ obj["지역코드"] == codeDiv; }).map(function(d){ return Number(d[k]); }).reduce(function(a,b){ return a+b; }); tmpHtml += "" + tmpVal.toFixed(1) + ""; }else{ @@ -397,23 +397,29 @@ "30대":obj.sect_02, "40대":obj.sect_03, "50대":obj.sect_04, - "60대이상":obj.sect_07, "60대":obj.sect_05, "70대이상":obj.sect_06, + "60대이상":obj.sect_07, + "40대50대":obj.sect_08, + "30대이하":obj.sect_09, "남자20대":obj.sect_11, "남자30대":obj.sect_12, "남자40대":obj.sect_13, "남자50대":obj.sect_14, - "남자60대이상":obj.sect_17, "남자60대":obj.sect_15, "남자70대이상":obj.sect_16, + "남자60대이상":obj.sect_17, + "남자40대50대":obj.sect_18, + "남자30대이하":obj.sect_19, "여자20대":obj.sect_21, "여자30대":obj.sect_22, "여자40대":obj.sect_23, "여자50대":obj.sect_24, - "여자60대이상":obj.sect_27, "여자60대":obj.sect_25, "여자70대이상":obj.sect_26, + "여자60대이상":obj.sect_27, + "여자40대50대":obj.sect_28, + "여자30대이하":obj.sect_29, "1층":obj.sect_91, "2층":obj.sect_92, "3층":obj.sect_93, @@ -477,9 +483,11 @@ "30대":obj.sect_02, "40대":obj.sect_03, "50대":obj.sect_04, - "60대이상":obj.sect_07, "60대":obj.sect_05, "70대이상":obj.sect_06, + "60대이상":obj.sect_07, + "40대50대":obj.sect_08, + "30대이하":obj.sect_09, "사전투표득표율":obj.pre_rate, "당일투표득표율":obj.dd_rate }