|
|
|
@ -489,7 +489,7 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
* @param rq |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
public List<BasGroupUserModel> userList(BasGroupUserListModel rq){ |
|
|
|
|
public PageImpl<BasGroupUserModel> userList(BasGroupUserListModel rq, Pageable pageable){ |
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
|
QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; |
|
|
|
|
QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; |
|
|
|
@ -555,6 +555,8 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
.where(builder) |
|
|
|
|
|
|
|
|
|
.orderBy(bas.createDt.desc()) |
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
|
List<BasGroupUserModel> result = new ArrayList<BasGroupUserModel>(); |
|
|
|
|
if(!(rq.getMemberName() == null) && !StringUtils.isEmpty(rq.getMemberName())) { |
|
|
|
@ -565,7 +567,7 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return result; |
|
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
@ -574,9 +576,102 @@ public class PtyGroupQueryRepository{
|
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
return result; |
|
|
|
|
return new PageImpl<>(result, pageable, result.size()); |
|
|
|
|
} |
|
|
|
|
public long userCount(BasGroupUserListModel rq){ |
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
|
QPtyCstmrGroup dtl = QPtyCstmrGroup.ptyCstmrGroup; |
|
|
|
|
QPtyCstmrBas cstmr = QPtyCstmrBas.ptyCstmrBas; |
|
|
|
|
QPtyCstmrDtl cstmrDtl = QPtyCstmrDtl.ptyCstmrDtl; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
builder.and(bas.useYn.eq("Y")); |
|
|
|
|
builder.and(dtl.joinYn.eq("Y")); |
|
|
|
|
builder.and(dtl.aprvlYn.eq("Y")); |
|
|
|
|
builder.and(bas.groupId.eq(rq.getGroupId())); |
|
|
|
|
// if(appAuth.equals("USER") || appAuth.equals("ROLE_USER")) {
|
|
|
|
|
// builder.and(bas.groupId.in(
|
|
|
|
|
// JPAExpressions
|
|
|
|
|
// .select(bas.groupId)
|
|
|
|
|
// .from(bas)
|
|
|
|
|
// .leftJoin(dtl)
|
|
|
|
|
// .on(bas.groupId.eq(dtl.groupId))
|
|
|
|
|
// .where(bas.useYn.eq("Y"))
|
|
|
|
|
// .where(dtl.cstmrSno.eq(rq.getCstmrSno()))
|
|
|
|
|
// .where(dtl.groupAuthCd.eq("MASTER").or(dtl.groupAuthCd.eq("LEADER")))
|
|
|
|
|
//
|
|
|
|
|
// ));
|
|
|
|
|
// }
|
|
|
|
|
// if(!StringUtils.isEmpty(rq.getGroupNm())) {
|
|
|
|
|
// 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(dtl.aprvlYn.eq(rq.getAprvYn()));
|
|
|
|
|
// }
|
|
|
|
|
//
|
|
|
|
|
|
|
|
|
|
List<BasGroupUserModel> queryResult = |
|
|
|
|
query.select(Projections.bean(BasGroupUserModel.class , |
|
|
|
|
bas.groupId, |
|
|
|
|
bas.groupNm, |
|
|
|
|
bas.groupTypeCd, |
|
|
|
|
bas.updateDt, |
|
|
|
|
bas.createDt, |
|
|
|
|
dtl.cstmrGroupSno, |
|
|
|
|
dtl.cstmrSno, |
|
|
|
|
dtl.joinDt, |
|
|
|
|
dtl.joinYn, |
|
|
|
|
dtl.aprvlDt, |
|
|
|
|
dtl.groupAuthCd, |
|
|
|
|
cstmrDtl.memberName, |
|
|
|
|
cstmr.userId |
|
|
|
|
)).from(bas) |
|
|
|
|
.leftJoin(dtl) |
|
|
|
|
.on(bas.groupId.eq(dtl.groupId)) |
|
|
|
|
.leftJoin(cstmr) |
|
|
|
|
.on(dtl.cstmrSno.eq(cstmr.cstmrSno)) |
|
|
|
|
.on(cstmr.cstmrStatusCd.eq("A")) |
|
|
|
|
.leftJoin(cstmrDtl) |
|
|
|
|
.on(cstmr.cstmrSno.eq(cstmrDtl.cstmrSno)) |
|
|
|
|
.where(builder) |
|
|
|
|
|
|
|
|
|
.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 = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
|
if(memberName.contains(rq.getMemberName())) { |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel list : result) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel model : queryResult) { |
|
|
|
|
if(!(model.getMemberName() == null)) { |
|
|
|
|
String memberName = EncryptUtils.decrypt(model.getMemberName()); |
|
|
|
|
model.setMemberName(memberName); |
|
|
|
|
result.add(model); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
for(BasGroupUserModel list : result) { |
|
|
|
|
cnt++; |
|
|
|
|
} |
|
|
|
|
return cnt; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public List<BasGroupModel> groupTop3(int cstmrSno){ |
|
|
|
|
|
|
|
|
|
QPtyGroupBas bas = QPtyGroupBas.ptyGroupBas; |
|
|
|
|