|
|
@ -62,7 +62,6 @@ public class CtrCntrlQueryRepository{ |
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
log.info("시작 날짜와 종료 날짜가 동일합니다"); |
|
|
|
|
|
|
|
Calendar std = Calendar.getInstance(); |
|
|
|
Calendar std = Calendar.getInstance(); |
|
|
|
std.setTime(DateUtils.stringToDate(rq.getStDate())); |
|
|
|
std.setTime(DateUtils.stringToDate(rq.getStDate())); |
|
|
|
std.add(Calendar.DATE, -1); |
|
|
|
std.add(Calendar.DATE, -1); |
|
|
@ -73,9 +72,12 @@ public class CtrCntrlQueryRepository{ |
|
|
|
Date endDate = end.getTime(); |
|
|
|
Date endDate = end.getTime(); |
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); |
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(stDate)); |
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
} else { |
|
|
|
} |
|
|
|
|
|
|
|
else if (rq.getStDate() != null) { |
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
} |
|
|
|
|
|
|
|
else if(rq.getEndDate() != null) { |
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.before(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() + "%")); |
|
|
@ -182,7 +184,6 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
log.info("시작 날짜와 종료 날짜가 동일합니다"); |
|
|
|
|
|
|
|
Calendar std = Calendar.getInstance(); |
|
|
|
Calendar std = Calendar.getInstance(); |
|
|
|
std.setTime(DateUtils.stringToDate(rq.getStDate())); |
|
|
|
std.setTime(DateUtils.stringToDate(rq.getStDate())); |
|
|
|
std.add(Calendar.DATE, -1); |
|
|
|
std.add(Calendar.DATE, -1); |
|
|
|