|
|
@ -850,6 +850,128 @@ public class FltPlanQueryRepository { |
|
|
|
return laancPlanDtos; |
|
|
|
return laancPlanDtos; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public List<LaancPlanDto> findAllAprvListBySearch2(LaancAprvSearchDto search) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QFltPlanBas bas = QFltPlanBas.fltPlanBas; |
|
|
|
|
|
|
|
QFltPlanArea area = QFltPlanArea.fltPlanArea; |
|
|
|
|
|
|
|
QFltPlanArcrft arcrft = QFltPlanArcrft.fltPlanArcrft; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// serach
|
|
|
|
|
|
|
|
BooleanBuilder builder = new BooleanBuilder(); |
|
|
|
|
|
|
|
if(search != null){ |
|
|
|
|
|
|
|
if(StringUtils.hasText(search.getMemberName())){ |
|
|
|
|
|
|
|
builder.and(bas.memberName.contains(search.getMemberName())); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(search.getCreateDate() != null){ |
|
|
|
|
|
|
|
Instant createStDate = InstantUtils.toDate(search.getCreateDate()); |
|
|
|
|
|
|
|
Instant createEndDate = createStDate.plus(Duration.ofDays(1)); |
|
|
|
|
|
|
|
builder.and(bas.createDt.goe(createStDate).and(bas.createDt.lt(createEndDate))); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(search.getCreateStDate() != null) { |
|
|
|
|
|
|
|
Instant createStDate = InstantUtils.toDate(search.getCreateStDate()); |
|
|
|
|
|
|
|
builder.and(bas.createDt.goe(createStDate)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(search.getCreateEndDate() != null){ |
|
|
|
|
|
|
|
Instant createEndDate = InstantUtils.toDate(search.getCreateEndDate()).plus(Duration.ofDays(1)); |
|
|
|
|
|
|
|
builder.and(bas.createDt.lt(createEndDate)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(search.getSchFltStDate() != null){ |
|
|
|
|
|
|
|
Instant schFltStDate = InstantUtils.toDate(search.getSchFltStDate()); |
|
|
|
|
|
|
|
builder.and(bas.schFltStDt.goe(schFltStDate)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
if(search.getSchFltEndDate() != null){ |
|
|
|
|
|
|
|
Instant schFltEndDate = InstantUtils.toDate(search.getSchFltEndDate()).plus(Duration.ofDays(1)); |
|
|
|
|
|
|
|
builder.and(bas.schFltEndDt.lt(schFltEndDate)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JPAQuery<?> jpaQuery = query.from(bas) |
|
|
|
|
|
|
|
.leftJoin(area) |
|
|
|
|
|
|
|
.on(bas.planSno.eq(area.planSno)) |
|
|
|
|
|
|
|
.leftJoin(arcrft) |
|
|
|
|
|
|
|
.on(bas.planSno.eq(arcrft.planSno)) |
|
|
|
|
|
|
|
.where(builder); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<LaancPlanDto> list = jpaQuery.transform( |
|
|
|
|
|
|
|
GroupBy.groupBy(bas.planSno) |
|
|
|
|
|
|
|
.list(Projections.bean( |
|
|
|
|
|
|
|
LaancPlanDto.class, |
|
|
|
|
|
|
|
bas.planSno, |
|
|
|
|
|
|
|
bas.groupId, |
|
|
|
|
|
|
|
bas.cstmrSno, |
|
|
|
|
|
|
|
bas.memberName, |
|
|
|
|
|
|
|
bas.email, |
|
|
|
|
|
|
|
bas.hpno, |
|
|
|
|
|
|
|
bas.clncd, |
|
|
|
|
|
|
|
bas.addr, |
|
|
|
|
|
|
|
bas.addrDtlCn, |
|
|
|
|
|
|
|
bas.zip, |
|
|
|
|
|
|
|
bas.schFltStDt, |
|
|
|
|
|
|
|
bas.schFltEndDt, |
|
|
|
|
|
|
|
bas.fltPurpose, |
|
|
|
|
|
|
|
bas.aprvlYn, |
|
|
|
|
|
|
|
bas.delYn, |
|
|
|
|
|
|
|
bas.createUserId, |
|
|
|
|
|
|
|
bas.createDt, |
|
|
|
|
|
|
|
bas.updateUserId, |
|
|
|
|
|
|
|
bas.updateDt, |
|
|
|
|
|
|
|
bas.corpRegYn, |
|
|
|
|
|
|
|
bas.serviceType, |
|
|
|
|
|
|
|
GroupBy.list(Projections.bean( |
|
|
|
|
|
|
|
LaancPlanAreaDto.class, |
|
|
|
|
|
|
|
area.planAreaSno, |
|
|
|
|
|
|
|
area.planSno, |
|
|
|
|
|
|
|
area.areaType, |
|
|
|
|
|
|
|
area.fltMethod, |
|
|
|
|
|
|
|
area.fltAreaAddr, |
|
|
|
|
|
|
|
area.bufferZone, |
|
|
|
|
|
|
|
area.fltElev, |
|
|
|
|
|
|
|
area.createUserId, |
|
|
|
|
|
|
|
area.createDt, |
|
|
|
|
|
|
|
area.updateUserId, |
|
|
|
|
|
|
|
area.updateDt, |
|
|
|
|
|
|
|
area.fltMothoeRm |
|
|
|
|
|
|
|
).skipNulls()).as("areaList"), |
|
|
|
|
|
|
|
GroupBy.list(Projections.bean( |
|
|
|
|
|
|
|
LaancPlanArcrftDto.class, |
|
|
|
|
|
|
|
arcrft.planArcrftSno, |
|
|
|
|
|
|
|
arcrft.planSno, |
|
|
|
|
|
|
|
arcrft.arcrftSno, |
|
|
|
|
|
|
|
arcrft.idntfNum, |
|
|
|
|
|
|
|
arcrft.groupNm, |
|
|
|
|
|
|
|
arcrft.prdctNum, |
|
|
|
|
|
|
|
arcrft.arcrftTypeCd, |
|
|
|
|
|
|
|
arcrft.arcrftModelNm, |
|
|
|
|
|
|
|
arcrft.prdctCmpnNm, |
|
|
|
|
|
|
|
arcrft.prdctDate, |
|
|
|
|
|
|
|
arcrft.arcrftLngth, |
|
|
|
|
|
|
|
arcrft.arcrftWdth, |
|
|
|
|
|
|
|
arcrft.arcrftHght, |
|
|
|
|
|
|
|
arcrft.arcrftWght, |
|
|
|
|
|
|
|
arcrft.arcrftWghtCd, |
|
|
|
|
|
|
|
arcrft.wghtTypeCd, |
|
|
|
|
|
|
|
arcrft.imageUrl, |
|
|
|
|
|
|
|
arcrft.takeoffWght, |
|
|
|
|
|
|
|
arcrft.useYn, |
|
|
|
|
|
|
|
arcrft.cameraYn, |
|
|
|
|
|
|
|
arcrft.insrncYn, |
|
|
|
|
|
|
|
arcrft.ownerNm, |
|
|
|
|
|
|
|
arcrft.createUserId, |
|
|
|
|
|
|
|
arcrft.createDt, |
|
|
|
|
|
|
|
arcrft.updateUserId, |
|
|
|
|
|
|
|
arcrft.updateDt, |
|
|
|
|
|
|
|
arcrft.acrftInsuranceYn, |
|
|
|
|
|
|
|
arcrft.insuranceExperiod, |
|
|
|
|
|
|
|
arcrft.corporationNm |
|
|
|
|
|
|
|
).skipNulls()).as("arcrftList") |
|
|
|
|
|
|
|
).skipNulls()) |
|
|
|
|
|
|
|
); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return list; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// laanc 승인 상세
|
|
|
|
// laanc 승인 상세
|
|
|
|
public LaancPlanDto findAprvById(Integer planSno) { |
|
|
|
public LaancPlanDto findAprvById(Integer planSno) { |
|
|
|
QFltPlanBas bas = QFltPlanBas.fltPlanBas; |
|
|
|
QFltPlanBas bas = QFltPlanBas.fltPlanBas; |
|
|
|