From 269c80eb95d2e7785039c10ea9fd6f2af08f8cd7 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Fri, 7 Mar 2025 13:33:05 +0900 Subject: [PATCH 1/2] Merge branch 'khj' into main --- src/main/resources/mapper/worddictyMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mapper/worddictyMapper.xml b/src/main/resources/mapper/worddictyMapper.xml index fe296b9..a4e3920 100644 --- a/src/main/resources/mapper/worddictyMapper.xml +++ b/src/main/resources/mapper/worddictyMapper.xml @@ -137,7 +137,7 @@ - + and w.WRDDICCAT = #{category} From 2a9fc778fba2272fd49b24542f2ba4df8c3feeb7 Mon Sep 17 00:00:00 2001 From: khj0414 Date: Fri, 7 Mar 2025 16:19:11 +0900 Subject: [PATCH 2/2] =?UTF-8?q?=EC=BD=94=EB=93=9C=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../localhost/mapper/VotDetailMapper.java | 2 +- .../localhost/mapper/VotRecordMapper.java | 2 -- .../localhost/mapper/VotchoiceMapper.java | 3 --- .../localhost/mapper/localvoteMapper.java | 2 ++ .../localhost/service/localvoteService.java | 25 ++++++------------ src/main/resources/mapper/VotDetailMapper.xml | 26 +++++++++++++------ src/main/resources/mapper/VotMemberMapper.xml | 6 +++-- src/main/resources/mapper/VotRecordMapper.xml | 9 ------- src/main/resources/mapper/VotchoiceMapper.xml | 17 ------------ src/main/resources/mapper/localvoteMapper.xml | 5 +++- 10 files changed, 37 insertions(+), 60 deletions(-) diff --git a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java index 76b321d..f3bafdc 100644 --- a/src/main/java/io/company/localhost/mapper/VotDetailMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotDetailMapper.java @@ -11,6 +11,6 @@ public interface VotDetailMapper { Long insertdetail(MapDto map); - List selectVoteDetails(int locvotSeq); + List selectVoteDetailsResult(MapDto map); } diff --git a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java index 29e28a4..7f07618 100644 --- a/src/main/java/io/company/localhost/mapper/VotRecordMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotRecordMapper.java @@ -7,8 +7,6 @@ import io.company.localhost.common.dto.MapDto; @Mapper public interface VotRecordMapper { - int selectYesVotetotal(MapDto map); - Long insertCheckedNums(MapDto map); } diff --git a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java index 44ca86a..b0940bf 100644 --- a/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java +++ b/src/main/java/io/company/localhost/mapper/VotchoiceMapper.java @@ -1,7 +1,5 @@ package io.company.localhost.mapper; -import java.util.List; - import org.apache.ibatis.annotations.Mapper; import io.company.localhost.common.dto.MapDto; @@ -11,6 +9,5 @@ public interface VotchoiceMapper { void insertChoice(MapDto map); - List selectVoteResult(Integer locvotSeq); } diff --git a/src/main/java/io/company/localhost/mapper/localvoteMapper.java b/src/main/java/io/company/localhost/mapper/localvoteMapper.java index c9c871c..fb3b4bc 100644 --- a/src/main/java/io/company/localhost/mapper/localvoteMapper.java +++ b/src/main/java/io/company/localhost/mapper/localvoteMapper.java @@ -21,5 +21,7 @@ public interface localvoteMapper { Long updateDeleteData(MapDto map); + List selectVoteListWithDetails(MapDto map); + } diff --git a/src/main/java/io/company/localhost/service/localvoteService.java b/src/main/java/io/company/localhost/service/localvoteService.java index cb95106..cbcc217 100644 --- a/src/main/java/io/company/localhost/service/localvoteService.java +++ b/src/main/java/io/company/localhost/service/localvoteService.java @@ -55,39 +55,30 @@ public class localvoteService { int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1; PageHelper.startPage(page, 10); PageInfo localvote = PageUtil.redefineNavigation(new PageInfo<>(localvotemapper.selectVoteList(map),10)); - List resultList = new ArrayList<>(); - + + List resultList = new ArrayList<>(); List voteList = localvote.getList(); - for (MapDto vote : voteList) { + for (MapDto vote : voteList) { MapDto voteMap = new MapDto(); voteMap.put("localVote", vote); Integer locvotSeq = (Integer) vote.get("LOCVOTSEQ"); - //투표 항목조회 - List voteDetails = votdetailmapper.selectVoteDetails(locvotSeq); - + //투표 항목조회 + 결과 조회 + 투표여부 + map.put("locvotSeq", locvotSeq); + List voteDetails = votdetailmapper.selectVoteDetailsResult(map); //투표 가능 멤버 조회 List voteMembers = votmembermapper.selectVoteMember(locvotSeq); - //투표 결과 조회 - List voteResult = votchoicemapper.selectVoteResult(locvotSeq); voteMap.put("voteDetails", voteDetails); voteMap.put("voteMembers", voteMembers); - voteMap.put("voteResult", voteResult); - - map.put("id",locvotSeq); - //투표 여부 - int yesVotetotal = votrecordmapper.selectYesVotetotal(map); - voteMap.put("yesVotetotal", yesVotetotal); - + resultList.add(voteMap); } localvote.setList(resultList); - return localvote; } - + public Long insertCheckedNums(MapDto map) { Long result = votrecordmapper.insertCheckedNums(map); if(result == 1) { diff --git a/src/main/resources/mapper/VotDetailMapper.xml b/src/main/resources/mapper/VotDetailMapper.xml index 472a3e5..74b3dcc 100644 --- a/src/main/resources/mapper/VotDetailMapper.xml +++ b/src/main/resources/mapper/VotDetailMapper.xml @@ -16,13 +16,23 @@ ) - + SELECT + d.*, + COALESCE(COUNT(c.VOTDETSEQ), 0) AS VOTE_COUNT, + (SELECT COUNT(*) + FROM votrecord + WHERE LOCVOTSEQ = d.LOCVOTSEQ + AND VOTRECMEM = #{userId}) AS yesvote + FROM + votdetail d + LEFT JOIN + votchoice c ON d.LOCVOTSEQ = c.LOCVOTSEQ AND d.VOTDETSEQ = c.VOTDETSEQ + WHERE + d.LOCVOTSEQ = #{locvotSeq} + GROUP BY + d.VOTDETSEQ, d.LOCVOTCON + ORDER BY + VOTE_COUNT DESC - diff --git a/src/main/resources/mapper/VotMemberMapper.xml b/src/main/resources/mapper/VotMemberMapper.xml index a9393cd..31600b3 100644 --- a/src/main/resources/mapper/VotMemberMapper.xml +++ b/src/main/resources/mapper/VotMemberMapper.xml @@ -13,8 +13,10 @@ - select count(*) as yesvote - from - votrecord - where - LOCVOTSEQ = #{id} - and - VOTRECMEM = #{userId} - INSERT INTO votrecord ( diff --git a/src/main/resources/mapper/VotchoiceMapper.xml b/src/main/resources/mapper/VotchoiceMapper.xml index 9838833..5b6dc01 100644 --- a/src/main/resources/mapper/VotchoiceMapper.xml +++ b/src/main/resources/mapper/VotchoiceMapper.xml @@ -15,21 +15,4 @@ ) - - diff --git a/src/main/resources/mapper/localvoteMapper.xml b/src/main/resources/mapper/localvoteMapper.xml index cc8ebab..acce4bb 100644 --- a/src/main/resources/mapper/localvoteMapper.xml +++ b/src/main/resources/mapper/localvoteMapper.xml @@ -40,7 +40,10 @@ a.*, DATE_FORMAT(a.LOCVOTRDT, '%Y-%m-%d %H:%i') AS formatted_LOCVOTRDT, DATE_FORMAT(a.LOCVOTEDT, '%Y-%m-%d %H:%i') AS formatted_LOCVOTEDT, - b.*, + b.MEMBERSEQ, + b.MEMBERNAM, + b.MEMBERCOL, + b.MEMBERPRF, c.CMNCODNAM AS usercolor, CASE WHEN EXISTS (