251222_01_FIX : 변수명 변경 및 Entity 생성 모두 빌더 타입으로 교체

This commit is contained in:
2025-12-22 14:29:59 +09:00
parent 3dab40c0b2
commit f929c4fb00
28 changed files with 212 additions and 233 deletions

View File

@@ -3,7 +3,7 @@ package com.kri.contact.server.service;
import com.kri.common.datetime.DateTimeUtil;
import com.kri.common.excel.ExcelMapper;
import com.kri.common.web.BusinessException;
import com.kri.contact.server.common.consts.AppConstant;
import com.kri.contact.server.common.consts.ContactConstant;
import com.kri.contact.server.common.external.intranet.IntranetExtensionApiClient;
import com.kri.contact.server.common.util.ExcelUploadResultUtil;
import com.kri.contact.server.dto.DataVerificationDto;
@@ -164,10 +164,10 @@ public class UserService {
public List<UserInfoDto> getFieldworkUserListWithCmpn(String searchCmpn){
List<TUserEntity> userList;
if(searchCmpn == null || searchCmpn.isBlank()){
userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(AppConstant.FIELDWORK_USER_ROLE);
userList = userRepository.findByUserRoleGreaterThanEqualAndDelFalse(ContactConstant.FIELDWORK_USER_ROLE);
}
else{
userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn, AppConstant.FIELDWORK_USER_ROLE);
userList = userRepository.findByUserCmpnAndUserRoleGreaterThanEqualAndDelFalse(searchCmpn, ContactConstant.FIELDWORK_USER_ROLE);
}
return userList.stream()
@@ -177,8 +177,8 @@ public class UserService {
public List<UserInfoDto> getOutsourceList(){
List<TUserEntity> userList = userRepository.findByRoleRangeAndDelFalse(
AppConstant.OUTSOURCE_USER_ROLE,
AppConstant.OUTSOURCE_USER_ROLE + 1000
ContactConstant.OUTSOURCE_USER_ROLE,
ContactConstant.OUTSOURCE_USER_ROLE + 1000
);
return userList.stream()