Merge branch 'khj' into main
This commit is contained in:
commit
741fc0260e
@ -37,16 +37,13 @@ public class VoteBoardController {
|
||||
@ParameterCheck
|
||||
@GetMapping("getVoteList")
|
||||
public ApiResponse<PageInfo<MapDto>> selectVoteList(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
|
||||
|
||||
//userId
|
||||
Long userId = AuthUtil.getUser().getId();
|
||||
map.put("userId", userId);
|
||||
PageInfo<MapDto> VoteList = localvoteservice.selectVoteList(map);
|
||||
|
||||
|
||||
return ApiResponse.ok(VoteList);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 투표 등록
|
||||
* @param title 제목 ,endDate 종료날짜 ,itemList 항목리스트(항목,링크) ,addvoteIs 항목추가여부, votemMltiIs 다중투표 허용여부
|
||||
@ -55,14 +52,11 @@ public class VoteBoardController {
|
||||
@Member
|
||||
@PostMapping("insertWord")
|
||||
public ApiResponse<Long> insertWord(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
|
||||
|
||||
//userId
|
||||
Long userId = AuthUtil.getUser().getId();
|
||||
map.put("userId", userId);
|
||||
Long result = localvoteservice.insertVote(map);
|
||||
return ApiResponse.ok(result);
|
||||
}
|
||||
|
||||
/**
|
||||
* 투표 선택
|
||||
* @param title 제목 ,endDate 종료날짜 ,itemList 항목리스트(항목,링크) ,addvoteIs 항목추가여부, votemMltiIs 다중투표 허용여부
|
||||
@ -71,12 +65,10 @@ public class VoteBoardController {
|
||||
@Member
|
||||
@PostMapping("insertCheckedNums")
|
||||
public ApiResponse<Long> insertCheckedNums(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
|
||||
|
||||
Long userId = AuthUtil.getUser().getId();
|
||||
map.put("userId", userId);
|
||||
return ApiResponse.ok(localvoteservice.insertCheckedNums(map));
|
||||
}
|
||||
|
||||
/**
|
||||
* 투표 종료
|
||||
* @param endVoteId 투표번호
|
||||
@ -85,21 +77,26 @@ public class VoteBoardController {
|
||||
@Member
|
||||
@PatchMapping("updateEndData")
|
||||
public ApiResponse<Long> updateEndData(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
|
||||
|
||||
Long userId = AuthUtil.getUser().getId();
|
||||
map.put("userId", userId);
|
||||
return ApiResponse.ok(localvoteservice.updateEndData(map));
|
||||
}
|
||||
/**
|
||||
* 투표 삭제
|
||||
* @param endVoteId 투표번호
|
||||
* @return
|
||||
*/
|
||||
@Member
|
||||
@PatchMapping("updateDeleteData")
|
||||
public ApiResponse<Long> updateDeleteData(@AuthenticationPrincipal MemberVo memberVo,@ReqMap MapDto map) {
|
||||
return ApiResponse.ok(localvoteservice.updateDeleteData(map));
|
||||
}
|
||||
/**
|
||||
* 투표 랜덤뽑기
|
||||
* @param randomList 랜덤리스트 ,voteid 투표 번호
|
||||
* @return
|
||||
*/
|
||||
|
||||
@Member
|
||||
@PostMapping("randomList")
|
||||
public ApiResponse<Long> randomList(@ReqMap MapDto map) {
|
||||
return ApiResponse.ok(localvoteservice.updateRandomResult(map));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -19,5 +19,7 @@ public interface localvoteMapper {
|
||||
|
||||
Long updateRandomResult(MapDto selectedItem);
|
||||
|
||||
Long updateDeleteData(MapDto map);
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -4,14 +4,12 @@ import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Random;
|
||||
|
||||
import org.springframework.http.HttpStatus;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
|
||||
import io.company.localhost.common.dto.ApiResponse;
|
||||
import io.company.localhost.common.dto.MapDto;
|
||||
import io.company.localhost.mapper.VotDetailMapper;
|
||||
import io.company.localhost.mapper.VotMemberMapper;
|
||||
@ -51,6 +49,7 @@ public class localvoteService {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public PageInfo<MapDto> selectVoteList(MapDto map) {
|
||||
//투표 목록조회
|
||||
int page = map.getString("page") != null ? Integer.parseInt(map.getString("page")) : 1;
|
||||
@ -66,6 +65,7 @@ public class localvoteService {
|
||||
Integer locvotSeq = (Integer) vote.get("LOCVOTSEQ");
|
||||
//투표 항목조회
|
||||
List<MapDto> voteDetails = votdetailmapper.selectVoteDetails(locvotSeq);
|
||||
|
||||
//투표 가능 멤버 조회
|
||||
List<MapDto> voteMembers = votmembermapper.selectVoteMember(locvotSeq);
|
||||
//투표 결과 조회
|
||||
@ -119,4 +119,8 @@ public class localvoteService {
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public Long updateDeleteData(MapDto map) {
|
||||
return localvotemapper.updateDeleteData(map);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,7 +1,19 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
||||
<mapper namespace="io.company.localhost.mapper.localvoteMapper">
|
||||
|
||||
<sql id="searchConditions">
|
||||
<if test="voteset != null and voteset != ''">
|
||||
<choose>
|
||||
<when test='voteset == "1"'>
|
||||
AND a.LOCVOTDDT IS NOT NULL
|
||||
</when>
|
||||
<when test='voteset == "2"'>
|
||||
AND a.LOCVOTDDT IS NULL
|
||||
AND a.LOCVOTDEL IS NULL
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
</sql>
|
||||
<insert id="insertVote" parameterType="map" useGeneratedKeys="true" keyProperty="voteId">
|
||||
insert into localvote
|
||||
(
|
||||
@ -23,24 +35,40 @@
|
||||
)
|
||||
</insert>
|
||||
<select id="selectVoteList" parameterType="map">
|
||||
select
|
||||
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.*
|
||||
,c.CMNCODNAM usercolor
|
||||
from
|
||||
localvote a
|
||||
LEFT JOIN
|
||||
netmember b
|
||||
on
|
||||
a.LOCVOTREG = b.MEMBERSEQ
|
||||
left join
|
||||
commoncod c
|
||||
on
|
||||
b.MEMBERCOL = c.CMNCODVAL
|
||||
order by
|
||||
a.LOCVOTRDT desc
|
||||
SELECT * FROM (
|
||||
SELECT
|
||||
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.*,
|
||||
c.CMNCODNAM AS usercolor,
|
||||
CASE
|
||||
WHEN EXISTS (
|
||||
SELECT 1
|
||||
FROM votrecord v
|
||||
WHERE v.LOCVOTSEQ = a.LOCVOTSEQ
|
||||
AND v.VOTRECMEM = #{userId}
|
||||
) THEN 'Y'
|
||||
ELSE 'N'
|
||||
END AS myvoted
|
||||
FROM
|
||||
localvote a
|
||||
LEFT JOIN
|
||||
netmember b ON a.LOCVOTREG = b.MEMBERSEQ
|
||||
LEFT JOIN
|
||||
commoncod c ON b.MEMBERCOL = c.CMNCODVAL
|
||||
WHERE 1=1
|
||||
<include refid="searchConditions"/>
|
||||
) AS subquery
|
||||
WHERE 1=1
|
||||
<if test="myVote != null and myVote != ''">
|
||||
<choose>
|
||||
<when test='myVote == "1"'>
|
||||
AND myvoted = 'Y'
|
||||
</when>
|
||||
</choose>
|
||||
</if>
|
||||
ORDER BY formatted_LOCVOTRDT DESC
|
||||
</select>
|
||||
<update id="updateEndData" parameterType="map">
|
||||
UPDATE
|
||||
@ -49,6 +77,13 @@
|
||||
LOCVOTDDT = now()
|
||||
WHERE LOCVOTSEQ = #{endVoteId}
|
||||
</update>
|
||||
<update id="updateDeleteData" parameterType="map">
|
||||
UPDATE
|
||||
localvote
|
||||
SET
|
||||
LOCVOTDEL = now()
|
||||
WHERE LOCVOTSEQ = #{deleteVoteId}
|
||||
</update>
|
||||
<update id="updateRandomResult" parameterType="map">
|
||||
UPDATE
|
||||
localvote
|
||||
|
||||
Loading…
Reference in New Issue
Block a user