目的地统计 条件计算

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

@@ -891,12 +891,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 String shift = billetHotsendChangeShift.getShift();
 			 String shiftGroup = billetHotsendChangeShift.getShiftGroup();
 			 Date startTime = billetHotsendChangeShift.getCreateTime();
-			 Date endTime;
-			 if (oConvertUtils.isEmpty(billetHotsendChangeShift.getChangeShiftTime())) {
-				 endTime = new Date();
-			 } else {
-				 endTime = billetHotsendChangeShift.getChangeShiftTime();
-			 }
+			 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);
@@ -987,12 +982,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 String shift = billetHotsendChangeShift.getShift();
 			 String shiftGroup = billetHotsendChangeShift.getShiftGroup();
 			 Date startTime = billetHotsendChangeShift.getCreateTime();
-			 Date endTime;
-			 if (oConvertUtils.isEmpty(billetHotsendChangeShift.getChangeShiftTime())) {
-				 endTime = new Date();
-			 } else {
-				 endTime = billetHotsendChangeShift.getChangeShiftTime();
-			 }
+			 Date endTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
 			 String shiftAndShiftGroup = shift + "/" + shiftGroup;
 			 queryWrapper.between(StorageBillPrint::getArrivalTime, startTime, endTime).eq(StorageBillPrint::getClasses, shiftAndShiftGroup);
 		 } else if(oConvertUtils.isNotEmpty(startTimes) && oConvertUtils.isNotEmpty(endTimes)){ // 时间范围

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubOne/dto/RollClubOneQueryDTO.java

@@ -15,6 +15,8 @@ public class RollClubOneQueryDTO {
 
     private String heatsCode;
 
+    private String heatNo;
+
     /**
      * 当前日期
      */
@@ -26,6 +28,15 @@ public class RollClubOneQueryDTO {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date storageTimeEnd;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date startTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date endTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date queryDate;
+
     /**
      * 班组
      */
@@ -44,4 +55,5 @@ public class RollClubOneQueryDTO {
     private Integer pageNo;
 
     private Integer pageSize;
+
 }

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

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
 import org.jeecg.modules.actualControl.billetActual.billetActual.mapper.BilletRulerConfigMapper;
@@ -243,28 +245,36 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
 
     @Override
     public List<RollClubOneVO> rollClubOneList(RollClubOneQueryDTO queryDTO) {
+        // 2. 遍历所有炉号，构建最终返回列表
+        List<RollClubOneVO> resultList = new ArrayList<>();
         LambdaQueryWrapper<BilletOriginalProductRecord> oneQueryWrapper = new LambdaQueryWrapper<>();
-        if (StringUtils.isNotBlank(queryDTO.getCcmNo())) {
-            oneQueryWrapper.eq(BilletOriginalProductRecord::getCcmNo, queryDTO.getCcmNo());
-        }
-        if (StringUtils.isNotBlank(queryDTO.getHeatsCode())) {
-            oneQueryWrapper.eq(BilletOriginalProductRecord::getHeatNo, queryDTO.getHeatsCode());
-        }
-        if (StringUtils.isNotBlank(queryDTO.getShift())) {
-            oneQueryWrapper.eq(BilletOriginalProductRecord::getShift, queryDTO.getShift());
-        }
-        if (StringUtils.isNotBlank(queryDTO.getShiftGroup())) {
-            oneQueryWrapper.eq(BilletOriginalProductRecord::getShiftGroup, queryDTO.getShiftGroup());
-        }
+        oneQueryWrapper.eq(BilletOriginalProductRecord::getCcmNo, queryDTO.getCcmNo());
 
-        Date beginDate = queryDTO.getStorageTimeBegin();
-        Date endDate = queryDTO.getStorageTimeEnd();
-
-        if (beginDate != null) {
-            oneQueryWrapper.ge(BilletOriginalProductRecord::getCreateTime, beginDate);
+        if(oConvertUtils.isNotEmpty(queryDTO.getChangeShiftId())) { // 班组取班组时间
+            // 根据铸机号、交班记录ID，获取交班记录中的班别、班次、创建时间
+            LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
+            changeQueryWrapper.eq(BilletHotsendChangeShift::getId, queryDTO.getChangeShiftId()).eq(BilletHotsendChangeShift::getCcmNo, queryDTO.getCcmNo());
+            BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
+            if (billetHotsendChangeShift == null){
+                return resultList;
+            }
+            Date startChnageTime = billetHotsendChangeShift.getCreateTime();
+            oneQueryWrapper.eq(BilletOriginalProductRecord::getShift, billetHotsendChangeShift.getShift());
+            oneQueryWrapper.eq(BilletOriginalProductRecord::getShiftGroup, billetHotsendChangeShift.getShiftGroup());
+            Date endChnageTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
+            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()));
+            // 结束时间
+            Date endArrivalTime = DateUtils.getEndOfDayByDate(startArrivalTime);
+            log.info("查询时间范围：startTime={}, endTime={}", startArrivalTime, endArrivalTime);
+            oneQueryWrapper.between(BilletOriginalProductRecord::getCreateTime, startArrivalTime, endArrivalTime);
         }
-        if (endDate != null) {
-            oneQueryWrapper.le(BilletOriginalProductRecord::getCreateTime, endDate);
+        // 炉号查询
+        if (oConvertUtils.isNotEmpty(queryDTO.getHeatNo())) {
+            oneQueryWrapper.eq(BilletOriginalProductRecord::getHeatNo, queryDTO.getHeatNo());
         }
 
         oneQueryWrapper.orderByAsc(BilletOriginalProductRecord::getCreateTime);
@@ -284,8 +294,7 @@ public class RollClubOneServiceImpl extends ServiceImpl<RollClubOneMapper, RollC
 
         }
 
-        // 2. 遍历所有炉号，构建最终返回列表
-        List<RollClubOneVO> resultList = new ArrayList<>();
+
         Set<String> allHeatNos = new HashSet<>();
         allHeatNos.addAll(rollOneMap.keySet());
 

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

@@ -24,6 +24,9 @@ import org.jeecg.common.util.SpringContextUtils;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletRulerConfig;
 import org.jeecg.modules.actualControl.billetActual.billetActual.mapper.BilletRulerConfigMapper;
+import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
+import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
+import org.jeecg.modules.billet.billetOriginalProductRecord.entity.BilletOriginalProductRecord;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
 import org.jeecg.modules.billet.rollClubTwo.entity.RollClubTwoDetails;
@@ -91,6 +94,9 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
     @Autowired
     private IStorageBillService storageBillService;
 
+    @Autowired
+    private IBilletHotsendChangeShiftService billetHotsendChangeShiftService;
+
     @Autowired
     BilletRulerConfigMapper billetRulerConfigMapper;
     @Autowired
@@ -111,29 +117,56 @@ public class StorageBillPrintController extends JeecgController<StorageBillPrint
     public Result<IPage<StorageBillPrint>> queryPageList(StorageBillPrint storageBillPrint,
                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                          @RequestParam(name = "pageSize", defaultValue = "20") Integer pageSize,
+                                                         @RequestParam(name = "ccmNo") String ccmNo,
+                                                         @RequestParam(name = "changeShiftId", required = false, defaultValue = "") String changeShiftId,
+                                                         @RequestParam(name = "queryDate", required = false, defaultValue = "") String queryDate,
+                                                         @RequestParam(name = "startTime", required = false, defaultValue = "") String startTime,
+                                                         @RequestParam(name = "endTime", required = false, defaultValue = "") String endTime,
+                                                         @RequestParam(name = "heatNo", required = false, defaultValue = "") String heatNo,
+                                                         @RequestParam(name = "licensePlate", required = false, defaultValue = "") String licensePlate,
                                                          HttpServletRequest req) {
 //        QueryWrapper<StorageBillPrint> queryWrapper = QueryGenerator.initQueryWrapper(storageBillPrint, req.getParameterMap());
         QueryWrapper<StorageBillPrint> queryWrapper = new QueryWrapper<StorageBillPrint>();
         Page<StorageBillPrint> page = new Page<StorageBillPrint>(pageNo, pageSize);
         // 铸机号查询条件
-        queryWrapper.eq("ccm_no", storageBillPrint.getCcmNo());
+        queryWrapper.eq("ccm_no", ccmNo);
         // 目的地
         queryWrapper.eq("destination", storageBillPrint.getDestination());
-        // 时间查询
-        if(oConvertUtils.isNotEmpty(storageBillPrint.getArrivalTime())){
-            // 开始时间
-            Date startTime = storageBillPrint.getArrivalTime();
-            startTime = DateUtils.getStartOfDayByDate(startTime);
-            // 结束时间 减一个小时
-            Date endTime = DateUtils.getEndOfDayByDate(startTime);
-            log.info("查询时间范围：startTime={}, endTime={}", startTime, endTime);
+        if(oConvertUtils.isNotEmpty(changeShiftId)) { // 班组取班组时间
+            // 根据铸机号、交班记录ID，获取交班记录中的班别、班次、创建时间
+            LambdaQueryWrapper<BilletHotsendChangeShift> changeQueryWrapper = new LambdaQueryWrapper<>();
+            changeQueryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
+            BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(changeQueryWrapper);
+            if (billetHotsendChangeShift == null){
+                return Result.OK();
+            }
+            Date startChnageTime = billetHotsendChangeShift.getCreateTime();
+            String classes = billetHotsendChangeShift.getShift() + "/" + billetHotsendChangeShift.getShiftGroup();
+            queryWrapper.eq("classes", classes);
+            Date endChnageTime = oConvertUtils.isNotEmpty(billetHotsendChangeShift.getChangeShiftTime()) ? billetHotsendChangeShift.getChangeShiftTime() : new Date();
+            // 修改时间范围查询条件为 >= startTime 且 <= endTime
+            queryWrapper.ge("arrival_time", startChnageTime)  // 大于等于开始时间
+                    .le("arrival_time", endChnageTime);   // 小于等于结束时间
+        }else if(oConvertUtils.isNotEmpty(startTime) && oConvertUtils.isNotEmpty(endTime)){ // 时间范围
             // 修改时间范围查询条件为 >= startTime 且 <= endTime
             queryWrapper.ge("arrival_time", startTime)  // 大于等于开始时间
                     .le("arrival_time", endTime);   // 小于等于结束时间
+        } else if(oConvertUtils.isNotEmpty(queryDate)){ // 具体时间
+            Date startArrivalTime = DateUtils.getStartOfDayByDate(DateUtils.getStartOfDay(queryDate));
+            // 结束时间 减一个小时
+            Date endArrivalTime = DateUtils.getEndOfDayByDate(startArrivalTime);
+            log.info("查询时间范围：startTime={}, endTime={}", startTime, endTime);
+            // 修改时间范围查询条件为 >= startTime 且 <= endTime
+            queryWrapper.ge("arrival_time", startArrivalTime)  // 大于等于开始时间
+                    .le("arrival_time", endArrivalTime);   // 小于等于结束时间
+        }
+        // 炉号查询
+        if (oConvertUtils.isNotEmpty(heatNo)) {
+            queryWrapper.like("heat_no", heatNo);
         }
-        // 班次信息like 查询条件
-        if (storageBillPrint.getClasses() != null && !storageBillPrint.getClasses().isEmpty() && storageBillPrint.getClasses() != null && !storageBillPrint.getClasses().isEmpty()) {
-            queryWrapper.like("classes", storageBillPrint.getClasses());
+        // 车辆查询
+        if (oConvertUtils.isNotEmpty(licensePlate)) {
+            queryWrapper.like("license_plate", licensePlate);
         }
         // 根据到站时间排序
         queryWrapper.orderByDesc("arrival_time");