Merge remote-tracking branch 'origin/develop' into develop

10 months ago · 8ede6560f4
1 changed files with 1 additions and 0 deletions
--- a/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
+++ b/pav-server/src/main/java/com/palnet/biz/jpa/repository/ctr/CtrCntrlQueryRepository.java
@ -2669,6 +2669,7 @@ public List<AnlsHstryDetailModel> listCntrlHstry(String id){
 						ccb.statusCd.eq("99"),
 						ccb.cntrlEndDt.between(start,end)
 				)
+				.groupBy(fpccr.planSno)
 				.fetch();

 	}