|
|
@ -190,13 +190,19 @@ public class CtrCntrlQueryRepository{ |
|
|
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
Date endDate = end.getTime(); |
|
|
|
Date endDate = end.getTime(); |
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); |
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); |
|
|
|
|
|
|
|
}else { |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|