统计调试

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

@@ -879,6 +879,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 List<BilletDetailsInfo> billetDetailsInfoList = new ArrayList<>();
 		 LambdaQueryWrapper<BilletOriginalProductRecord> queryWrapper = new LambdaQueryWrapper<>();
 		 queryWrapper.eq(BilletOriginalProductRecord::getCcmNo, ccmNo);
+		 Boolean search = true; // 定义未传任何条件
 		 if(oConvertUtils.isNotEmpty(changeShiftId)) { // 班组为空取班组时间
 			 // 根据铸机号、交班记录ID，获取交班记录中的班别、班次、创建时间
 			 LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
@@ -895,13 +896,16 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 queryWrapper.eq(BilletOriginalProductRecord::getShift, shift);
 			 queryWrapper.eq(BilletOriginalProductRecord::getShiftGroup, shiftGroup);
 			 queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTime, endTime);
+			 search = false;
 		 } else if(oConvertUtils.isNotEmpty(startTimes) && oConvertUtils.isNotEmpty(endTimes)){ // 时间范围
 			 queryWrapper.between(BilletOriginalProductRecord::getCreateTime, startTimes, endTimes);
-		 } else if (oConvertUtils.isNotEmpty(queryDate)) { // 独立时间处理
-			 String queryDateTime = queryDate + " 00:00:00";
-			 Date date = DateUtils.parseDatetime(queryDateTime);
-			 Date startTime = DateUtils.getStartOfDayByDate(date);
-			 Date endTime = DateUtils.getEndOfDayByDate(date);
+			 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);
 		 }
 		 // 炉号查询
@@ -951,7 +955,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 info.setCounts(grandTotalCount);
 			 info.setTotalWeight(grandTotalWeight);
 			 List<BilletStatisticsDetail> detailsList = new ArrayList<>(statisticsMap.values());
-			 info.setRollClubOneStatisticsList(detailsList);
+			 info.setBilletStatisticList(detailsList);
 			 billetDetailsInfoList.add(info);
 		 }
 		 return billetDetailsInfoList;
@@ -970,6 +974,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 queryWrapper.eq(StorageBillPrint::getCcmNo, ccmNo)
 				 .eq(StorageBillPrint::getDestination, destination)
 				 .orderByDesc(StorageBillPrint::getArrivalTime);
+		 Boolean search = true; // 定义未传任何条件
 		 if(oConvertUtils.isNotEmpty(changeShiftId)) { // 班组为空取班组时间
 			 // 根据铸机号、交班记录ID，获取交班记录中的班别、班次、创建时间
 			 LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
@@ -985,13 +990,16 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 Date endTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
 			 String shiftAndShiftGroup = shift + "/" + shiftGroup;
 			 queryWrapper.between(StorageBillPrint::getArrivalTime, startTime, endTime).eq(StorageBillPrint::getClasses, shiftAndShiftGroup);
+			 search = false;
 		 } else if(oConvertUtils.isNotEmpty(startTimes) && oConvertUtils.isNotEmpty(endTimes)){ // 时间范围
 			 queryWrapper.between(StorageBillPrint::getArrivalTime, startTimes, endTimes);
-		 } else if (oConvertUtils.isNotEmpty(queryDate)) { // 独立时间处理
-			 String queryDateTime = queryDate + " 00:00:00";
-			 Date date = DateUtils.parseDatetime(queryDateTime);
-			 Date startTime = DateUtils.getStartOfDayByDate(date);
-			 Date endTime = DateUtils.getEndOfDayByDate(date);
+			 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(StorageBillPrint::getArrivalTime, startTime, endTime);
 		 }
 		 // 炉号查询
@@ -1049,7 +1057,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 }
 
 		 // 设置统计结果到BilletDetailsInfo对象
-		 billetDetailsInfo.setRollClubTwoStatisticsList(statisticsDetails);
+		 billetDetailsInfo.setBilletStatisticList(statisticsDetails);
 
 		 // 计算并设置总车次、总支数和总重量
 		 billetDetailsInfo.setAllCarNum(storageBillPrintList.size()); // 总车次为记录数

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/vo/BilletDetailsInfo.java

@@ -25,13 +25,7 @@ public class BilletDetailsInfo {
     @ApiModelProperty(value = "班别")
     private String shift;
 
-    @ApiModelProperty(value = "棒一统计明细")
-    private List<BilletStatisticsDetail> rollClubOneStatisticsList;
-    @ApiModelProperty(value = "棒二统计明细")
-    private List<BilletStatisticsDetail> rollClubTwoStatisticsList;
-    @ApiModelProperty(value = "棒三统计明细")
-    private List<BilletStatisticsDetail> rollClubThreeStatisticsList;
-    @ApiModelProperty(value = "上若统计明细")
-    private List<BilletStatisticsDetail> rollOutShippStatisticsList;
+    @ApiModelProperty(value = "统计明细")
+    private List<BilletStatisticsDetail> billetStatisticList;
 
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillPrintController.java

@@ -132,6 +132,7 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
         queryWrapper.eq("ccm_no", ccmNo);
         // 目的地
         queryWrapper.eq("destination", storageBillPrint.getDestination());
+        Boolean search = true; // 定义未传任何条件
         if(oConvertUtils.isNotEmpty(changeShiftId)) { // 班组取班组时间
             // 根据铸机号、交班记录ID，获取交班记录中的班别、班次、创建时间
             LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
@@ -147,11 +148,17 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
             // 修改时间范围查询条件为 >= startTime 且 <= endTime
             queryWrapper.ge("arrival_time", startChnageTime)  // 大于等于开始时间
                     .le("arrival_time", endChnageTime);   // 小于等于结束时间
+            search = false;
         }else if(oConvertUtils.isNotEmpty(startTime) && oConvertUtils.isNotEmpty(endTime)){ // 时间范围
             // 修改时间范围查询条件为 >= startTime 且 <= endTime
             queryWrapper.ge("arrival_time", startTime)  // 大于等于开始时间
                     .le("arrival_time", endTime);   // 小于等于结束时间
-        } else if(oConvertUtils.isNotEmpty(queryDate)){ // 具体时间
+            search = false;
+        }
+        // 如果什么条件都没有默认当日
+        if(oConvertUtils.isNotEmpty(queryDate) || search == true){ // 具体时间
+            // 获取当前年月日
+            queryDate = oConvertUtils.isNotEmpty(queryDate) ? queryDate : DateUtils.getDate("yyyy-MM-dd");
             Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
             // 结束时间 减一个小时
             Date endArrivalTime = DateUtils.getEndOfDayByDate(startArrivalTime);