261105_01_FIX: 리스트 헤더 생성·저장·비교 시 Trim 적용
This commit is contained in:
@@ -23,7 +23,7 @@ public final class ContactConstant {
|
|||||||
public static final int OUTSOURCE_USER_ROLE = 4000;
|
public static final int OUTSOURCE_USER_ROLE = 4000;
|
||||||
public static final int FIELDWORK_USER_ROLE = 9000;
|
public static final int FIELDWORK_USER_ROLE = 9000;
|
||||||
public static final StreamingReadOptions UPPER_CASE_HEADER_OPTIONS =
|
public static final StreamingReadOptions UPPER_CASE_HEADER_OPTIONS =
|
||||||
new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.toUpperCase(
|
new StreamingReadOptions(null, 0, 1, header -> header == null ? null : header.trim().toUpperCase(
|
||||||
Locale.ROOT));
|
Locale.ROOT));
|
||||||
|
|
||||||
public static final String LIST_HEADER_ACCEPT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$";
|
public static final String LIST_HEADER_ACCEPT_REGEX = "^[가-힣a-zA-Z0-9()_\\-\\[\\] ]+$";
|
||||||
|
|||||||
@@ -60,6 +60,14 @@ public class ListHeaderDto {
|
|||||||
@Schema(description = "면접원 수정가능 여부")
|
@Schema(description = "면접원 수정가능 여부")
|
||||||
private Boolean useIntrvwerEdit = false;
|
private Boolean useIntrvwerEdit = false;
|
||||||
|
|
||||||
|
public String getListHderNm() {
|
||||||
|
return listHderNm == null ? null : listHderNm.trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setListHderNm(String listHderNm) {
|
||||||
|
this.listHderNm = listHderNm == null ? null : listHderNm.trim();
|
||||||
|
}
|
||||||
|
|
||||||
public static ListHeaderDto fromEntity(TListHeaderEntity entity) {
|
public static ListHeaderDto fromEntity(TListHeaderEntity entity) {
|
||||||
return ListHeaderDto.builder()
|
return ListHeaderDto.builder()
|
||||||
.prjctIdx(entity.getPrjctIdx())
|
.prjctIdx(entity.getPrjctIdx())
|
||||||
@@ -96,7 +104,7 @@ public class ListHeaderDto {
|
|||||||
.listHderId(headerId)
|
.listHderId(headerId)
|
||||||
.listHderOrder((short) headerId)
|
.listHderOrder((short) headerId)
|
||||||
.listHderGrad(ListHeaderGrade.COMMON)
|
.listHderGrad(ListHeaderGrade.COMMON)
|
||||||
.listHderNm(headerName)
|
.listHderNm(headerName == null ? null : headerName.trim())
|
||||||
.listHderTy(type)
|
.listHderTy(type)
|
||||||
.useFilter(true)
|
.useFilter(true)
|
||||||
.useColView(true)
|
.useColView(true)
|
||||||
@@ -109,13 +117,13 @@ public class ListHeaderDto {
|
|||||||
return Objects.equals(listHderId, dto.listHderId) &&
|
return Objects.equals(listHderId, dto.listHderId) &&
|
||||||
Objects.equals(listHderOrder, dto.listHderOrder) &&
|
Objects.equals(listHderOrder, dto.listHderOrder) &&
|
||||||
Objects.equals(listHderGrad, dto.listHderGrad) &&
|
Objects.equals(listHderGrad, dto.listHderGrad) &&
|
||||||
Objects.equals(listHderNm, dto.listHderNm) &&
|
Objects.equals(getListHderNm(), dto.getListHderNm()) &&
|
||||||
Objects.equals(listHderTy, dto.listHderTy);
|
Objects.equals(listHderTy, dto.listHderTy);
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isEqualSimple(ListHeaderDto dto) {
|
public boolean isEqualSimple(ListHeaderDto dto) {
|
||||||
return Objects.equals(listHderId, dto.listHderId) &&
|
return Objects.equals(listHderId, dto.listHderId) &&
|
||||||
Objects.equals(listHderGrad, dto.listHderGrad) &&
|
Objects.equals(listHderGrad, dto.listHderGrad) &&
|
||||||
Objects.equals(listHderNm, dto.listHderNm);
|
Objects.equals(getListHderNm(), dto.getListHderNm());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -101,7 +101,7 @@ public class TListHeaderEntity {
|
|||||||
.id(TListHeaderEntityId.create(prjctIdx, src.getListHderId()))
|
.id(TListHeaderEntityId.create(prjctIdx, src.getListHderId()))
|
||||||
.listHderOrder(src.getListHderOrder())
|
.listHderOrder(src.getListHderOrder())
|
||||||
.listHderGrad(src.getListHderGrad())
|
.listHderGrad(src.getListHderGrad())
|
||||||
.listHderNm(src.getListHderNm())
|
.listHderNm(src.getListHderNm() == null ? null : src.getListHderNm().trim())
|
||||||
.listHderTy(src.getListHderTy())
|
.listHderTy(src.getListHderTy())
|
||||||
.useFilter(src.getUseFilter())
|
.useFilter(src.getUseFilter())
|
||||||
.useColView(src.getUseColView())
|
.useColView(src.getUseColView())
|
||||||
|
|||||||
@@ -116,6 +116,10 @@ public class ListHeaderService {
|
|||||||
return List.of();
|
return List.of();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
excelHeaders = excelHeaders.stream()
|
||||||
|
.map(name -> name == null ? null : name.trim())
|
||||||
|
.toList();
|
||||||
|
|
||||||
List<ListHeaderDto> defaultHeaders = listHeaderRepository.findDefaultHeader().stream()
|
List<ListHeaderDto> defaultHeaders = listHeaderRepository.findDefaultHeader().stream()
|
||||||
.map(ListHeaderDto::fromEntity)
|
.map(ListHeaderDto::fromEntity)
|
||||||
.sorted(Comparator.comparing(ListHeaderDto::getListHderId))
|
.sorted(Comparator.comparing(ListHeaderDto::getListHderId))
|
||||||
@@ -340,7 +344,7 @@ public class ListHeaderService {
|
|||||||
Map<String, Integer> headerIdByName = createHeaderIdByNameMap(getHeader(prjctIdx));
|
Map<String, Integer> headerIdByName = createHeaderIdByNameMap(getHeader(prjctIdx));
|
||||||
if (!ignoreUnknownHeaders) {
|
if (!ignoreUnknownHeaders) {
|
||||||
Set<String> missingHeaderNames = contentsByHeaderName.keySet().stream()
|
Set<String> missingHeaderNames = contentsByHeaderName.keySet().stream()
|
||||||
.filter(name -> !headerIdByName.containsKey(name))
|
.filter(name -> !headerIdByName.containsKey(name == null ? null : name.trim()))
|
||||||
.collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll);
|
.collect(LinkedHashSet::new, LinkedHashSet::add, LinkedHashSet::addAll);
|
||||||
|
|
||||||
if (!missingHeaderNames.isEmpty()) {
|
if (!missingHeaderNames.isEmpty()) {
|
||||||
@@ -351,7 +355,7 @@ public class ListHeaderService {
|
|||||||
|
|
||||||
Map<Integer, String> contentsByHeaderId = new LinkedHashMap<>();
|
Map<Integer, String> contentsByHeaderId = new LinkedHashMap<>();
|
||||||
contentsByHeaderName.forEach((name, value) -> {
|
contentsByHeaderName.forEach((name, value) -> {
|
||||||
Integer headerId = headerIdByName.get(name);
|
Integer headerId = headerIdByName.get(name == null ? null : name.trim());
|
||||||
if (headerId != null) {
|
if (headerId != null) {
|
||||||
contentsByHeaderId.put(headerId, value);
|
contentsByHeaderId.put(headerId, value);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user