调整查询 棒三 棒一 工作台

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

@@ -892,7 +892,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 																			   @RequestParam(name="heatNo", required = false, defaultValue = "") String heatNo,
 																			   @RequestParam(name="licensePlate", required = false, defaultValue = "") String licensePlate) {
 		 List<BilletDetailsInfo> billetDetailsInfoList = new ArrayList<>();
-		 if (queryType.equals("1") && oConvertUtils.isNotEmpty(queryDate)){
+		 if (queryType.equals("1")){
 			 // 查询棒一，指定日期的统计明细
 			 billetDetailsInfoList = queryRollClubOneStatistics(ccmNo,  changeShiftId, queryDate, heatNo, startTime, endTime);
 		 }else if(queryType.equals("2")){ // 查询棒二，指定班次的统计明细
@@ -1267,6 +1267,13 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 List<BilletOriginalProductRecord> billetOriginalProductRecordList = billetOriginalProductRecordService.list(queryWrapper);
 		 if (oConvertUtils.listIsEmpty(billetOriginalProductRecordList)){
 			 log.info("{}{}", "查询数据为空！");
+			 BilletDetailsInfo info = new BilletDetailsInfo();
+			 info.setCcmNo(ccmNo);
+			 info.setCounts(0);
+			 info.setTotalWeight(0.00);
+			 List<BilletStatisticsDetail> detailsList = new ArrayList<>();
+			 info.setBilletStatisticList(detailsList);
+			 billetDetailsInfoList.add(info);
 			 return billetDetailsInfoList;
 		 }
 		 Map<String, BilletStatisticsDetail> statisticsMap = new HashMap<>();

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/service/impl/RollClubOneServiceImpl.java

@@ -254,7 +254,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
         List<RollClubOneVO> resultList = new ArrayList<>();
         LambdaQueryWrapper<BilletOriginalProductRecord> oneQueryWrapper = new LambdaQueryWrapper<>();
         oneQueryWrapper.eq(BilletOriginalProductRecord::getCcmNo, queryDTO.getCcmNo());
-
+        Boolean search = true; // 定义未传任何条件
         if(oConvertUtils.isNotEmpty(queryDTO.getChangeShiftId())) { // 班组取班组时间
             // 根据铸机号、交班记录ID，获取交班记录中的班别、班次、创建时间
             LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
@@ -270,12 +270,16 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
             oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startChnageTime, endChnageTime);
         }else if(oConvertUtils.isNotEmpty(queryDTO.getStartTime()) && oConvertUtils.isNotEmpty(queryDTO.getEndTime())){ // 时间范围
             oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime,queryDTO.getStartTime(), queryDTO.getEndTime());
-        } else if(oConvertUtils.isNotEmpty(queryDTO.getQueryDate())){ // 具体时间
-            Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDTO.getQueryDate()));
+        }
+
+        if(oConvertUtils.isNotEmpty(queryDTO.getQueryDate())  || search == true){ // 具体时间
+            // 获取当前年月日
+            Date queryDate = oConvertUtils.isNotEmpty(queryDTO.getQueryDate()) ? queryDTO.getQueryDate() : DateUtils.getDate() ;
+            Date startTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
             // 结束时间
-            Date endArrivalTime = DateUtils.getEndOfDayByDate(startArrivalTime);
-            log.info("查询时间范围：startTime={}, endTime={}", startArrivalTime, endArrivalTime);
-            oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startArrivalTime, endArrivalTime);
+            Date endTime = DateUtils.getEndOfDayByDate(startTime);
+            log.info("查询时间范围：startTime={}, endTime={}", startTime, endTime);
+            oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
         }
         // 炉号查询
         if (oConvertUtils.isNotEmpty(queryDTO.getHeatNo())) {