|
|
|
@ -32,6 +32,7 @@ import org.springframework.data.domain.PageImpl;
|
|
|
|
|
import org.springframework.data.domain.Pageable; |
|
|
|
|
import org.springframework.stereotype.Repository; |
|
|
|
|
|
|
|
|
|
import java.time.Instant; |
|
|
|
|
import java.util.ArrayList; |
|
|
|
|
import java.util.Calendar; |
|
|
|
|
import java.util.Date; |
|
|
|
@ -59,15 +60,17 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
QFltPlanCtrCntrlRel qFltPlanCtrCntrlRel = QFltPlanCtrCntrlRel.fltPlanCtrCntrlRel; |
|
|
|
|
QFltPlanBas qFltPlanBas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
builder.and(qFltPlanBas.aprvlYn.eq("Y")); |
|
|
|
|
|
|
|
|
@ -163,11 +166,11 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(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)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(groupId)); |
|
|
|
|
if(!StringUtils.isEmpty(rq.getSearch1())) { |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%")); |
|
|
|
@ -263,13 +266,13 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder pilotBuilder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
|
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
|
|
|
|
|
@ -393,11 +396,11 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder pilotBuilder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(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)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
|
|
|
|
@ -517,11 +520,11 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(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)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
|
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
builder.and(qCntrlBasEntity.idntfNum.eq(idntfNum)); |
|
|
|
@ -617,13 +620,13 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder pilotBuilder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
|
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.groupId.eq(rq.getGroupId())); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate()))); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
|
|
|
|
@ -714,11 +717,11 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder pilotBuilder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(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)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
|
|
|
|
@ -808,11 +811,11 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(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)); |
|
|
|
|
builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate.toInstant())); |
|
|
|
|
|
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.planSno.eq(planSno)); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
@ -904,12 +907,12 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.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.toInstant())); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
|
|
|
|
@ -946,12 +949,12 @@ public class CtrCntrlQueryRepository{
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
end.setTime(DateUtils.stringToDate(rq.getEndDate())); |
|
|
|
|
end.setTime(Date.from(DateUtils.stringToDate(rq.getEndDate()))); |
|
|
|
|
end.add(Calendar.DATE, 1); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qFltPlanCtrCntrlRelEntity.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.toInstant())); |
|
|
|
|
builder.and(qFltPlanBasEntity.aprvlYn.eq("Y")); |
|
|
|
|
builder.and(qCntrlBasEntity.statusCd.eq("99")); |
|
|
|
|
|
|
|
|
@ -1206,9 +1209,9 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
|
|
|
|
|
Calendar end = Calendar.getInstance(); |
|
|
|
|
Date now = DateUtils.nowDate(); |
|
|
|
|
end.setTime(now); |
|
|
|
|
Date endDate = end.getTime(); |
|
|
|
|
builder.and(qFltPlanBas.schFltStDt.loe(now)); |
|
|
|
|
builder.and(qFltPlanBas.schFltEndDt.goe(now)); |
|
|
|
|
|
|
|
|
|
builder.and(qFltPlanBas.schFltStDt.loe(Instant.now())); |
|
|
|
|
builder.and(qFltPlanBas.schFltEndDt.goe(Instant.now())); |
|
|
|
|
|
|
|
|
|
builder.and(qFltPlanBas.planSno.eq(planSno)); |
|
|
|
|
|
|
|
|
|