|
|
|
@ -305,10 +305,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.contains(memberName));
|
|
|
|
|
// }
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
builder.and(cstmrDtl.memberName.like("%" + rq.getMemberName() + "%")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
|
|
|
|
|
// builder.and(bas.groupId.in(
|
|
|
|
@ -361,43 +360,14 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
// .where(dtl.groupAuthCd.ne("CREATER"))
|
|
|
|
|
.where(dtl.groupAuthCd.ne("MASTER")) |
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
// .offset(pageable.getOffset())
|
|
|
|
|
// .limit(pageable.getPageSize())
|
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
|
String memberName = model.getMemberName(); |
|
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
|
|
|
|
// for(BasGroupAprvModel model : queryResult) {
|
|
|
|
|
// model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
|
|
|
|
|
// result.add(model);
|
|
|
|
|
// }
|
|
|
|
|
} |
|
|
|
|
// 0 10 - 0-9, 10-19, 20-29
|
|
|
|
|
// start index = size * page
|
|
|
|
|
// end index = (size * (page + 1)) - 1
|
|
|
|
|
|
|
|
|
|
int startIndex = (int) (pageable.getOffset()); |
|
|
|
|
int endIndex = (int) (pageable.getPageSize() + pageable.getOffset() - 1); |
|
|
|
|
log.info("{}/{}", startIndex,endIndex); |
|
|
|
|
List<BasGroupAprvModel> 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 aprvCount(BasGroupAprvRqModel rq){ |
|
|
|
|
public long aprvCount(BasGroupAprvRqModel rq, Pageable pageable){ |
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
|
QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; |
|
|
|
|
QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; |
|
|
|
@ -411,10 +381,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(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
|
|
|
|
|
// builder.and(bas.groupId.in(
|
|
|
|
@ -469,25 +438,8 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.fetch(); |
|
|
|
|
long cnt = 0; |
|
|
|
|
List<BasGroupAprvModel> result = new ArrayList<BasGroupAprvModel>(); |
|
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
|
for(BasGroupAprvModel model : queryResult) { |
|
|
|
|
String memberName = model.getMemberName(); |
|
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
for(BasGroupAprvModel list : result) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
// for(BasGroupAprvModel model : queryResult) {
|
|
|
|
|
// model.setMemberName(EncryptUtils.decrypt(model.getMemberName()));
|
|
|
|
|
// result.add(model);
|
|
|
|
|
// }
|
|
|
|
|
for(BasGroupAprvModel list : result) { |
|
|
|
|
|
|
|
|
|
for(BasGroupAprvModel list : queryResult) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|