|
|
|
@ -183,24 +183,13 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
|
Calendar std = Calendar.getInstance(); |
|
|
|
|
std.setTime(DateUtils.stringToDate(rq.getStDate())); |
|
|
|
|
std.add(Calendar.DATE, -1); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date stDate = std.getTime(); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
} |
|
|
|
|
else if (rq.getStDate() != null) { |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
} |
|
|
|
|
else if(rq.getEndDate() != null) { |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
} |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
|
} |
|
|
|
|