|
|
|
@ -1,6 +1,8 @@
|
|
|
|
|
package com.palnet.biz.jpa.repository.ctr; |
|
|
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Calendar; |
|
|
|
|
import java.util.Date; |
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; |
|
|
|
@ -59,11 +61,22 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
log.debug("Params ===> " +rq.toString()); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
|
log.info("시작 날짜와 종료 날짜가 동일합니다"); |
|
|
|
|
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 { |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
} |
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
|
} |
|
|
|
@ -114,7 +127,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
.leftJoin(qPtyCstmrGroupEntity) |
|
|
|
|
.on(qFltPlanBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.desc()) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.asc()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
for(AnlsHstryModel model: queryList) { |
|
|
|
@ -167,10 +180,24 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
} else { |
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
} |
|
|
|
|
if(rq.getStDate() != null) { |
|
|
|
|
|
|
|
|
|
if(rq.getStDate().equals(rq.getEndDate())) { |
|
|
|
|
log.info("시작 날짜와 종료 날짜가 동일합니다"); |
|
|
|
|
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()))); |
|
|
|
|
} |
|
|
|
|
if(rq.getEndDate() != null) { |
|
|
|
|
else if(rq.getEndDate() != null) { |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
} |
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|