Merge branch 'master' of http://gitea.palntour.com/pav/pav-server

src/main/java/com/palnet/biz/api/anls/hstry/controller/AnlsHstryController.java

@@ -41,7 +41,6 @@ public class AnlsHstryController {
 		List<AnlsHstryRsModel> result = null;
 		
 		log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq));
-		
 		log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate());
 		
 		//입력값 검증
@@ -86,7 +85,6 @@ public class AnlsHstryController {
 	@GetMapping(value = "/log/{id}")
 	public ResponseEntity<? extends BasicResponse> log(@PathVariable String id) {
 		List<AnlsHstryDetailModel> result = null;
-		
         try {
         	result = service.hstryList(id);
 			

src/main/java/com/palnet/biz/api/anls/smlt/controller/AnlsSmltController.java

@@ -45,6 +45,7 @@ public class AnlsSmltController {
 		List<AnlsHstryModel> result = null;
 		
 		log.debug("JSON>>>>>>>>" , JsonUtils.toJson(rq));
+		log.info("test");
 		log.debug("Param" + rq.getStDate() + "::" + rq.getEndDate());
 		
 		//입력값 검증

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

@@ -1,6 +1,8 @@
 package com.palnet.biz.jpa.repository.ctr;
 
 import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 import com.palnet.biz.api.acnt.cstmr.model.AcntCstmrGroupModel;
@@ -59,11 +61,12 @@ public class CtrCntrlQueryRepository{
 		
 		builder.and(qCntrlBasEntity.statusCd.eq("99"));
 		log.debug("Params ===> " +rq.toString());
-		
+		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.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate())));
+		builder.and(qCntrlBasEntity.cntrlEndDt.before(endDate));
-		
 		if(!StringUtils.isEmpty(rq.getSearch1())) {
 			builder.and(qCntrlBasEntity.idntfNum.like("%" + rq.getSearch1() + "%"));
 		}
@@ -114,7 +117,7 @@ public class CtrCntrlQueryRepository{
 				.leftJoin(qPtyCstmrGroupEntity)
 				.on(qFltPlanBasEntity.groupId.eq(qPtyCstmrGroupEntity.groupId))
 				.where(builder)
-				.orderBy(qCntrlBasEntity.cntrlStDt.desc())
+				.orderBy(qCntrlBasEntity.cntrlStDt.asc())
 				.fetch();
 		
 		for(AnlsHstryModel model: queryList) {
@@ -167,12 +170,14 @@ public List<AnlsHstryRsModel> listCntrlBasRs(AnlsHstryGroupModel rq, int cstmrSn
 		} else {
 			builder.and(qComArcrftBasEntity.groupId.eq(rq.getGroupId()));
 		}
-		if(rq.getStDate() != null) {
+		
-		builder.and(qCntrlBasEntity.cntrlStDt.after(DateUtils.stringToDate(rq.getStDate())));
+			Calendar end = Calendar.getInstance(); 
-		}
+			end.setTime(DateUtils.stringToDate(rq.getEndDate()));
-		if(rq.getEndDate() != null) {
+			end.add(Calendar.DATE, 1);
-		builder.and(qCntrlBasEntity.cntrlStDt.before(DateUtils.stringToDate(rq.getEndDate())));
+			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() + "%"));
 		}

src/main/java/com/palnet/biz/jpa/repository/flt/FltPlanQueryRepository.java

@@ -2,6 +2,7 @@ package com.palnet.biz.jpa.repository.flt;
 
 import com.palnet.biz.api.bas.flight.model.*;
 import com.palnet.biz.jpa.entity.*;
+import com.palnet.comn.utils.DateUtils;
 import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.group.GroupBy;
 import com.querydsl.core.types.Predicate;
@@ -12,6 +13,7 @@ import lombok.extern.log4j.Log4j2;
 
 import org.springframework.stereotype.Repository;
 
+
 import java.util.List;
 
 @Log4j2
@@ -41,12 +43,9 @@ public class FltPlanQueryRepository {
         	}
         }
 
-        if (rq.getSchFltEndDt() != null) {
+		builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
-            builder.and(bas.schFltStDt.goe(rq.getSchFltStDt()));
+		builder.and(bas.schFltStDt.before(rq.getSchFltEndDt()));
-        }
+
-        if (rq.getSchFltStDt() != null) {
-            builder.and(bas.schFltEndDt.loe(rq.getSchFltEndDt()));
-        }
 //        if ("Y".equals(rq.getAprvlYn()) || "N".equals(rq.getAprvlYn())) {
 //            builder.and(bas.aprvlYn.eq(rq.getAprvlYn()));
 //        }