修改棒一工作台统计过滤条件为棒一时间字段

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

@@ -2659,10 +2659,19 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			Date endTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
 			queryWrapper.eq(BilletOriginalProductRecord::getShift, shift);
 			queryWrapper.eq(BilletOriginalProductRecord::getShiftGroup, shiftGroup);
-			queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+			// 动态按字段加时间条件
+			if ("5".equals(ccmNo)) {
+				queryWrapper.between(BilletOriginalProductRecord::getRollClubOneTime, startTime, endTime);
+			} else {
+				queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+			}
 			search = false;
 		} else if(oConvertUtils.isNotEmpty(startTimes) && oConvertUtils.isNotEmpty(endTimes)){ // 时间范围
-			queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTimes, endTimes);
+			if ("5".equals(ccmNo)) {
+				queryWrapper.between(BilletOriginalProductRecord::getRollClubOneTime, startTimes, endTimes);
+			} else {
+				queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTimes, endTimes);
+			}
 			search = false;
 		}
 		// 只在未拼接过时间范围时才判断 queryDate
@@ -2675,12 +2684,21 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				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);
+				Date compareTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getCreateTime()) ? billetHotsendChangeShift.getCreateTime() : startOneTime;
+				if ("5".equals(ccmNo)) {
+					queryWrapper.ge(BilletOriginalProductRecord::getRollClubOneTime, compareTime);
+				} else {
+					queryWrapper.ge(BilletOriginalProductRecord::getCreateTime, compareTime);
+				}
 			}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 ("5".equals(ccmNo)) {
+					queryWrapper.between(BilletOriginalProductRecord::getRollClubOneTime, startTime, endTime);
+				} else {
+					queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+				}
 			}
 		}
 		// 炉号查询