棒一工作台 统计

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -1566,11 +1566,21 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 search = false;
 		 }
 		 if (oConvertUtils.isNotEmpty(queryDate) || search == true) { // 独立时间处理
-			 // 获取当前年月日
-			 queryDate = oConvertUtils.isNotEmpty(queryDate) ? queryDate : DateUtils.getDate("yyyy-MM-dd");
-			 Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
-			 Date endTime = DateUtils.getEndOfDayByDate(startTime);
-			 queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+			 // 如果时间给了空
+			 if(oConvertUtils.isEmpty(queryDate)) { // 查询最后一个班次
+				 String nowDate = DateUtils.getDate("yyyy-MM-dd");
+				 Date startOneTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(nowDate));
+				 // 查询最后一次交班记录时间
+				 LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
+				 changeQueryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo).orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1");
+				 BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
+				 queryWrapper.ge(BilletOriginalProductRecord::getCreateTime, oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startOneTime);
+			 }else{
+				 queryDate = oConvertUtils.isNotEmpty(queryDate) ? queryDate : DateUtils.getDate("yyyy-MM-dd");
+				 Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
+				 Date endTime = DateUtils.getEndOfDayByDate(startTime);
+				 queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+			 }
 		 }
 		 // 炉号查询
 		 if (oConvertUtils.isNotEmpty(heatNo)) {