비행이력목록 날짜검색조건 수정

src/main/java/com/palnet/biz/api/anls/hstry/service/AnlsHstryService.java

@@ -78,19 +78,8 @@ public class AnlsHstryService {
 		ComnPagingRs<AnlsHstryRsModel> response = new ComnPagingRs<>();
 		List<AnlsHstryRsModel> returnList = new ArrayList<>();
 		
-		//당일만 검색할 시 나오지 않는 오류 방지용으로 끝나는 날짜에 1일 더함
-		Calendar end = Calendar.getInstance();
-		end.setTime(DateUtils.stringToDate(rq.getEndDate()));
-		end.add(Calendar.DATE, 1);
-		Date stDate = DateUtils.stringToDate(rq.getStDate());
-		Date endDate = end.getTime();
 
 		Pageable pageable = PageRequest.of(rq.getPage()-1, rq.getRecord());
-		String idntfNum = rq.getSearch1();
-		
-		if(rq.getSearch1() == null) {
-			idntfNum = "";
-		}
 		
 		PageImpl<AnlsHstryRsModel> result = query.listCntrlBasRs(rq, userAccount, pageable);
 		

src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java

@@ -190,13 +190,19 @@ public class CtrCntrlQueryRepository{
 		
 		BooleanBuilder builder = new BooleanBuilder();
 		
+	
+		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(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
-		builder.and(qCntrlBasEntity.cntrlStDt.goe(DateUtils.stringToDate(rq.getStDate())));
 			builder.and(qCntrlBasEntity.cntrlEndDt.loe(endDate));
+		}else {
+			builder.and(qCntrlBasEntity.cntrlEndDt.loe(DateUtils.stringToDate(rq.getEndDate())));
+		}
 		
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));