사원 등록 오류 수정

This commit is contained in:
nevermoregb 2025-04-10 23:00:10 +09:00
parent ac8d637dc2
commit 0d6448bfbf
5 changed files with 39 additions and 4 deletions

View File

@ -76,4 +76,11 @@ public class MainController {
long memberSeq = map.getInt("memberSeq");
return mainService.rejectMember(memberSeq);
}
@Member
@ParameterCheck
@PostMapping("/getUserLeaveRecord")
public ApiResponse<MapDto> getUserLeaveRecord(@ReqMap MapDto map) {
return mainService.getUserLeaveRecord(map);
}
}

View File

@ -36,5 +36,7 @@ public interface CommutersMapper {
// int updateCommuterProject(MapDto map);
int deleteCommuters(MapDto map);
MapDto selectUserLeaveWorkList(MapDto map);
}

View File

@ -20,6 +20,8 @@ import java.util.List;
import org.springframework.stereotype.Service;
import io.company.localhost.common.annotation.ReqMap;
import io.company.localhost.common.dto.ApiResponse;
import io.company.localhost.common.dto.MapDto;
import io.company.localhost.mapper.CommutersMapper;
import lombok.RequiredArgsConstructor;
@ -106,5 +108,16 @@ public class CommutersService {
* public boolean updateCommuterProject(MapDto map) { return
* commutersMapper.updateCommuterProject(map) > 0; }
*/
/**
* 사용자의 퇴근 기록 조회
*
* @return
*/
public ApiResponse<MapDto> selectUserLeaveWorkList(@ReqMap MapDto map) {
map.put("currentDate", LocalDateTime.now());
return ApiResponse.ok(commutersMapper.selectUserLeaveWorkList(map));
}
}

View File

@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
import io.company.localhost.common.dto.ApiResponse;
import io.company.localhost.common.dto.MapDto;
import io.company.localhost.utils.AuthUtil;
import io.company.localhost.vo.MemberVo;
import lombok.RequiredArgsConstructor;
@ -32,6 +33,7 @@ public class MainService {
private final NetmemberService netmemberService;
private final localvacaService localvacaService;
private final LocalevntService localevntService;
private final CommutersService commutersService;
/**
@ -104,9 +106,10 @@ public class MainService {
* @return
*/
public ApiResponse<String> registerMember(long memberSeq) {
MemberVo user = netmemberService.getUserInfoById(memberSeq);
Long loginUserId = AuthUtil.getUser().getId();
MemberVo user = netmemberService.getUserInfoById(loginUserId);
if(user.getId() != memberSeq || !"ROLE_ADMIN".equals(user.getRole())) {
if(user.getId() != loginUserId || !"ROLE_ADMIN".equals(user.getRole())) {
return ApiResponse.error(HttpStatus.FORBIDDEN, "사용 권한 없음");
}
@ -121,15 +124,20 @@ public class MainService {
* @return
*/
public ApiResponse<String> rejectMember(long memberSeq) {
MemberVo user = netmemberService.getUserInfoById(memberSeq);
Long loginUserId = AuthUtil.getUser().getId();
MemberVo user = netmemberService.getUserInfoById(loginUserId);
if(user.getId() != memberSeq || !"ROLE_ADMIN".equals(user.getRole())) {
if(user.getId() != loginUserId || !"ROLE_ADMIN".equals(user.getRole())) {
return ApiResponse.error(HttpStatus.UNAUTHORIZED, "사용 권한 없음");
}
int result = netmemberService.rejectMember(memberSeq);
return result == 1 ? ApiResponse.ok("미승인 대상자 등록") : ApiResponse.ok("미승인 대상자 등록 실패");
}
public ApiResponse<MapDto> getUserLeaveRecord(MapDto map) {
return commutersService.selectUserLeaveWorkList(map);
}

View File

@ -100,4 +100,9 @@
<delete id="deleteCommuters" parameterType="int">
DELETE FROM commuters WHERE PROJCTSEQ = #{projctSeq}
</delete>
<select id="selectUserLeaveWorkList">
/* 금일 퇴근 조회 */
SELECT * FROM COMMUTERS WHERE MEMBERSEQ = #{memberSeq} AND COMMUTDAY = DATE_FORMAT(#{currentDate}, '%Y-%m-%d')
</select>
</mapper>