emm

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java

@@ -2847,9 +2847,9 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			ProjectDistributionAnalysisLeftResultDTO dto = new ProjectDistributionAnalysisLeftResultDTO();
 			dto.setTime(intervalTimeList.get(i));
 			dto.setCategoryList(ConvertUtils.sourceToTarget(listResult,CategoryListDTO.class));
-			String concat = date.concat(" ").concat(intervalTimeList.get(i)).concat(":00");
-			long end = DateUtils.stringToDate(DateUtils.DATE_TIME_PATTERN, concat).getTime();
 			if (i == NumConstant.ZERO){
+				String concat = date.concat(" ").concat(intervalTimeList.get(i)).concat(":00");
+				long end = DateUtils.stringToDate(concat,DateUtils.DATE_TIME_PATTERN).getTime();
 				dto.getCategoryList().forEach(cate -> {
 					AtomicReference<Integer> count = new AtomicReference<>(cate.getCount());
 					groupByCode.forEach((k,v) -> {
@@ -2862,17 +2862,27 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 						}
 					});
 				});
-			}else if (i == intervalTimeList.size() - NumConstant.ONE){
-				break;
 			}else {
+				String concat = date.concat(" ").concat(intervalTimeList.get(i)).concat(":00");
+				long end = NumConstant.ZERO_L;
+				if (intervalTimeList.get(i).equals("00:00")){
+					Calendar c = new GregorianCalendar();
+					Date endDate = DateUtils.stringToDate(concat,DateUtils.DATE_TIME_PATTERN);
+					c.setTime(endDate);
+					c.add(Calendar.DATE,NumConstant.ONE);
+					end = c.getTime().getTime();
+				}else {
+					end = DateUtils.stringToDate(concat,DateUtils.DATE_TIME_PATTERN).getTime();
+				}
 				String startStr = date.concat(" ").concat(intervalTimeList.get(i - NumConstant.ONE)).concat(":00");
-				long start = DateUtils.stringToDate(DateUtils.DATE_TIME_PATTERN, startStr).getTime();
+				long start = DateUtils.stringToDate(startStr,DateUtils.DATE_TIME_PATTERN).getTime();
+				long finalEnd = end;
 				dto.getCategoryList().forEach(cate -> {
 					AtomicReference<Integer> count = new AtomicReference<>(cate.getCount());
 					groupByCode.forEach((k,v) -> {
 						if (cate.getCategoryCode().equals(k)){
 							v.forEach(l -> {
-								if (l.getCreatedTime().getTime() < end && l.getCreatedTime().getTime() >= start){
+								if (l.getCreatedTime().getTime() < finalEnd && l.getCreatedTime().getTime() >= start){
 									cate.setCount(count.getAndSet(count.get() + NumConstant.ONE));
 								}
 							});
@@ -2912,8 +2922,6 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 			}
 
 		}
-		list.remove(list.size() - NumConstant.ONE);
-		list.add(list.size(),"24:00");
 		list.remove(NumConstant.ZERO);
 		return list;
 	}