|
|
|
@ -1,5 +1,8 @@
|
|
|
|
|
package com.palnet.biz.jpa.repository.ctr; |
|
|
|
|
|
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
import java.time.LocalDateTime; |
|
|
|
|
import java.time.LocalTime; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Calendar; |
|
|
|
|
import java.util.Date; |
|
|
|
@ -44,6 +47,7 @@ import com.querydsl.core.types.dsl.StringTemplate;
|
|
|
|
|
import com.querydsl.jpa.JPAExpressions; |
|
|
|
|
import com.querydsl.jpa.impl.JPAQueryFactory; |
|
|
|
|
|
|
|
|
|
import io.netty.handler.codec.http.multipart.HttpPostRequestDecoder.EndOfDataDecoderException; |
|
|
|
|
import lombok.RequiredArgsConstructor; |
|
|
|
|
import lombok.extern.log4j.Log4j2; |
|
|
|
|
|
|
|
|
@ -199,19 +203,15 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
QCtrCntrlHstryArea qCntrlHstryAreaEntity = QCtrCntrlHstryArea.ctrCntrlHstryArea; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
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(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); |
|
|
|
|
}else { |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
} |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate)); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
|