|
|
|
@ -161,7 +161,6 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
|
|
|
|
|
if(userAccount.equals("USER")) { |
|
|
|
|
builder.and(qFltPlanBasEntity.cstmrSno.eq(cstmrSno)); |
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
@ -225,7 +224,7 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
.leftJoin(qPtyCstmrGroupEntity) |
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.desc()) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.asc()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
for(AnlsHstryRsModel model: queryList) { |
|
|
|
|