|
|
|
@ -8,8 +8,11 @@ import java.util.List;
|
|
|
|
|
import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel; |
|
|
|
|
import com.palnet.biz.jpa.entity.*; |
|
|
|
|
import com.palnet.comn.model.GPHistoryModel; |
|
|
|
|
import com.querydsl.core.QueryResults; |
|
|
|
|
import com.querydsl.core.Tuple; |
|
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
|
import org.springframework.data.domain.PageImpl; |
|
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
|
import org.springframework.stereotype.Repository; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.anls.hstry.model.AnlsHstryDetailModel; |
|
|
|
@ -151,7 +154,7 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
return result; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno , String userAccount){ |
|
|
|
|
public PageImpl<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSno , String userAccount, Pageable pageable){ |
|
|
|
|
|
|
|
|
|
QCtrCntrlBas qCntrlBasEntity = QCtrCntrlBas.ctrCntrlBas; |
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
@ -171,19 +174,17 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
ArrayList<AnlsHstryRsModel> result = new ArrayList<AnlsHstryRsModel>(); |
|
|
|
|
|
|
|
|
|
List<AnlsHstryRsModel> queryList = query.select( |
|
|
|
|
Projections.bean(AnlsHstryRsModel.class , |
|
|
|
|
qCntrlBasEntity.cntrlId, |
|
|
|
@ -230,8 +231,31 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.orderBy(qCntrlBasEntity.cntrlStDt.asc()) |
|
|
|
|
.offset(pageable.getOffset()) |
|
|
|
|
.limit(pageable.getPageSize()) |
|
|
|
|
.fetch(); |
|
|
|
|
|
|
|
|
|
// 전체 카운트
|
|
|
|
|
long count = query |
|
|
|
|
.select( |
|
|
|
|
qCntrlBasEntity |
|
|
|
|
) |
|
|
|
|
.from(qCntrlBasEntity) |
|
|
|
|
.leftJoin(qCntrlHstryAreaEntity) |
|
|
|
|
.on(qCntrlBasEntity.cntrlId.eq(qCntrlHstryAreaEntity.cntrlId)) |
|
|
|
|
.on(qCntrlHstryAreaEntity.actnType.eq("01")) |
|
|
|
|
.leftJoin(qComIdntfBasEntity) |
|
|
|
|
.on(qCntrlBasEntity.idntfNum.eq(qComIdntfBasEntity.idntfNum)) |
|
|
|
|
.leftJoin(qComArcrftBasEntity) |
|
|
|
|
.on(qComIdntfBasEntity.arcrftSno.eq(qComArcrftBasEntity.arcrftSno)) |
|
|
|
|
.leftJoin(qFltPlanBasEntity) |
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qFltPlanBasEntity.groupId)) |
|
|
|
|
.leftJoin(qPtyCstmrGroupEntity) |
|
|
|
|
.on(qComArcrftBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId)) |
|
|
|
|
.where(builder) |
|
|
|
|
.fetchCount(); |
|
|
|
|
|
|
|
|
|
List<AnlsHstryRsModel> result = new ArrayList<>(); |
|
|
|
|
for(AnlsHstryRsModel model: queryList) { |
|
|
|
|
String addr = ""; |
|
|
|
|
|
|
|
|
@ -260,7 +284,7 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return result; |
|
|
|
|
return new PageImpl<>(result, pageable, count); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|