|
|
|
@ -562,10 +562,9 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
// builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getMemberName())) {
|
|
|
|
|
// String memberName = EncryptUtils.encrypt(rq.getMemberName());
|
|
|
|
|
// builder.and(cstmrDtl.memberName.eq(memberName));
|
|
|
|
|
// }
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
builder.and(cstmrDtl.memberName.like("%" + rq.getMemberName() + "%")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getMemberName())) {
|
|
|
|
@ -598,39 +597,15 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
// .offset(pageable.getOffset())
|
|
|
|
|
// .limit(pageable.getPageSize())
|
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
String memberName = model.getMemberName(); |
|
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} else{ |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
|
String memberName = model.getMemberName(); |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
int startIndex = (int) (pageable.getOffset()); |
|
|
|
|
int endIndex = (int) (pageable.getPageSize() + pageable.getOffset() - 1); |
|
|
|
|
log.info("{}/{}", startIndex,endIndex); |
|
|
|
|
List<BasGroupUserModel> resultPaging = new ArrayList<>(); |
|
|
|
|
for(int i = startIndex; i <=endIndex; i++ ) { |
|
|
|
|
if(result.size() <= i) break; |
|
|
|
|
resultPaging.add(result.get(i)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return new PageImpl<>(resultPaging, pageable, resultPaging.size()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return new PageImpl<>(queryResult, pageable, queryResult.size()); |
|
|
|
|
} |
|
|
|
|
public long userCount(BasGroupUserListModel rq){ |
|
|
|
|
public long userCount(BasGroupUserListModel rq, Pageable pageable){ |
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
|
QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; |
|
|
|
|
QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; |
|
|
|
@ -659,10 +634,9 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
// builder.and(bas.groupNm.like("%" + rq.getGroupNm() + "%"));
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getMemberName())) {
|
|
|
|
|
// String memberName = EncryptUtils.encrypt(rq.getMemberName());
|
|
|
|
|
// builder.and(cstmrDtl.memberName.eq(memberName));
|
|
|
|
|
// }
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
builder.and(cstmrDtl.memberName.like("%" + rq.getMemberName() + "%")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getMemberName())) {
|
|
|
|
@ -694,35 +668,16 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.leftJoin(cstmrDtl) |
|
|
|
|
.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) |
|
|
|
|
.where(builder) |
|
|
|
|
|
|
|
|
|
// .offset(pageable.getOffset())
|
|
|
|
|
// .limit(pageable.getPageSize())
|
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.fetch(); |
|
|
|
|
long cnt = 0; |
|
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
String memberName = model.getMemberName(); |
|
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel list : result) { |
|
|
|
|
|
|
|
|
|
for(BasGroupUserModel list : queryResult) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
|
String memberName = model.getMemberName(); |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel list : result) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
public List<BasGroupModel> groupTop3(int cstmrSno){ |
|
|
|
|
|
|
|
|
|