棒线工作台增加根据日期查询当天装运数据接口

zgztBus/jeecg-boot-base-core/src/main/java/org/jeecg/common/util/DateUtils.java

@@ -8,9 +8,8 @@ import java.sql.Timestamp;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
-import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
+import java.time.*;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
@@ -840,4 +839,15 @@ public class DateUtils extends PropertyEditorSupport {
         cal.add(Calendar.DAY_OF_YEAR, -days);
         return cal.getTime();
     }
+
+    public static Date getStartOfDay(String dateStr) {
+        LocalDate localDate = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+    }
+
+    public static Date getEndOfDay(String dateStr) {
+        LocalDate localDate = LocalDate.parse(dateStr, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+        return Date.from(localDate.atTime(LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant());
+    }
+
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/controller/RollClubThreeDetailsController.java

@@ -165,9 +165,10 @@ public class RollClubThreeDetailsController extends JeecgController<RollClubThre
 
 	 @ApiOperation(value = "轧钢棒三工作台信息", notes = "轧钢棒三工作台信息")
 	 @GetMapping(value = "/rollClubThreeWorkbenches")
-	 public Result<RollOnDutyDataVo> rollClubThreeWorkbenches(@RequestParam(name = "ccmNo") String ccmNo) {
+	 public Result<RollOnDutyDataVo> rollClubThreeWorkbenches(@RequestParam(name = "ccmNo") String ccmNo,
+															  @RequestParam(name="currentDate", required = false) String currentDate) {
 
-		 RollOnDutyDataVo rollOnDutyVo = rollClubThreeDetailsService.queryOnDutyRecord(ccmNo);
+		 RollOnDutyDataVo rollOnDutyVo = rollClubThreeDetailsService.queryOnDutyRecord(ccmNo,currentDate);
 		 return Result.OK(rollOnDutyVo);
 	 }
 
@@ -180,4 +181,7 @@ public class RollClubThreeDetailsController extends JeecgController<RollClubThre
 		 return Result.OK(rollChargeDetailsVO);
 	 }
 
+
+
+
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/IRollClubThreeDetailsService.java

@@ -6,16 +6,17 @@ import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.storageBill.dto.RollDetailQueryDTO;
 import org.jeecg.modules.billet.storageBill.vo.RollChargeDetailsVO;
 import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
+import org.jeecg.modules.billet.storageBill.vo.RollOnDutyRecordVo;
 
 /**
  * @Description: 棒三明细信息
  * @Author: jeecg-boot
- * @Date:   2024-11-20
+ * @Date: 2024-11-20
  * @Version: V1.0
  */
 public interface IRollClubThreeDetailsService extends IService<RollClubThreeDetails> {
 
-    RollOnDutyDataVo queryOnDutyRecord(String ccmNo);
+    RollOnDutyDataVo queryOnDutyRecord(String ccmNo,String currentDate);
 
     RollChargeDetailsVO queryWorkbenchesDetail(RollDetailQueryDTO queryDTO);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/impl/RollClubThreeDetailsServiceImpl.java

@@ -48,7 +48,7 @@ public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDe
     private StorageBillMapper storageBillMapper;
 
     @Override
-    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo) {
+    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo,String currentDate) {
         RollOnDutyDataVo rollOnDutyVo = new RollOnDutyDataVo();
 
         // 1. 从 Redis 获取班次信息
@@ -71,10 +71,16 @@ public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDe
 
         // 3. 查询当班装运单信息
         LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+
         billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
-                .eq(StorageBill::getDestination,"棒三")
-                .gt(StorageBill::getAmountTotal, 0)
-                .between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+                .eq(StorageBill::getDestination, "棒三")
+                .gt(StorageBill::getAmountTotal, 0);
+
+        if (oConvertUtils.isEmpty(currentDate)) {
+            billQueryWrapper.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+        } else {
+            billQueryWrapper.between(StorageBill::getCreateTime, DateUtils.getStartOfDay(currentDate), DateUtils.getEndOfDay(currentDate));
+        }
 
         List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
         if (oConvertUtils.listIsEmpty(storageBillList)) {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/controller/RollClubTwoDetailsController.java

@@ -165,9 +165,10 @@ public class RollClubTwoDetailsController extends JeecgController<RollClubTwoDet
 
     @ApiOperation(value = "轧钢棒二工作台信息", notes = "轧钢棒二工作台信息")
     @GetMapping(value = "/rollClubTwoWorkbenches")
-    public Result<RollOnDutyDataVo> rollClubTwoWorkbenches(@RequestParam(name = "ccmNo") String ccmNo) {
+    public Result<RollOnDutyDataVo> rollClubTwoWorkbenches(@RequestParam(name = "ccmNo") String ccmNo,
+                                                           @RequestParam(name="currentDate", required = false) String currentDate) {
 
-        RollOnDutyDataVo rollOnDutyVo = rollClubTwoDetailsService.queryOnDutyRecord(ccmNo);
+        RollOnDutyDataVo rollOnDutyVo = rollClubTwoDetailsService.queryOnDutyRecord(ccmNo,currentDate);
         return Result.OK(rollOnDutyVo);
     }
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/service/IRollClubTwoDetailsService.java

@@ -14,7 +14,7 @@ import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
  */
 public interface IRollClubTwoDetailsService extends IService<RollClubTwoDetails> {
 
-    RollOnDutyDataVo queryOnDutyRecord(String ccmNo);
+    RollOnDutyDataVo queryOnDutyRecord(String ccmNo,String currentDate);
 
     RollChargeDetailsVO queryWorkbenchesDetail(RollDetailQueryDTO queryDTO);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/service/impl/RollClubTwoDetailsServiceImpl.java

@@ -47,7 +47,7 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
     private StorageBillMapper storageBillMapper;
 
     @Override
-    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo) {
+    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo,String currentDate) {
         RollOnDutyDataVo rollOnDutyVo = new RollOnDutyDataVo();
 
         // 1. 从 Redis 获取班次信息
@@ -70,10 +70,16 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
 
         // 3. 查询当班装运单信息
         LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+
         billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
-                .eq(StorageBill::getDestination,"棒二")
-                .gt(StorageBill::getAmountTotal, 0)
-                .between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+                .eq(StorageBill::getDestination, "棒二")
+                .gt(StorageBill::getAmountTotal, 0);
+
+        if (oConvertUtils.isEmpty(currentDate)) {
+            billQueryWrapper.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+        } else {
+            billQueryWrapper.between(StorageBill::getCreateTime, DateUtils.getStartOfDay(currentDate), DateUtils.getEndOfDay(currentDate));
+        }
 
         List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
         if (oConvertUtils.listIsEmpty(storageBillList)) {

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/controller/RollOutShippDetailsController.java

@@ -164,9 +164,10 @@ public class RollOutShippDetailsController extends JeecgController<RollOutShippD
 
 	 @ApiOperation(value = "轧钢外运工作台信息", notes = "轧钢外运工作台信息")
 	 @GetMapping(value = "/rollOutShippWorkbenches")
-	 public Result<RollOnDutyDataVo> rollOutShippWorkbenches(@RequestParam(name = "ccmNo") String ccmNo) {
+	 public Result<RollOnDutyDataVo> rollOutShippWorkbenches(@RequestParam(name = "ccmNo") String ccmNo,
+															 @RequestParam(name="currentDate", required = false) String currentDate) {
 
-		 RollOnDutyDataVo rollOnDutyVo = rollOutShippDetailsService.queryOnDutyRecord(ccmNo);
+		 RollOnDutyDataVo rollOnDutyVo = rollOutShippDetailsService.queryOnDutyRecord(ccmNo,currentDate);
 		 return Result.OK(rollOnDutyVo);
 	 }
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/IRollOutShippDetailsService.java

@@ -14,7 +14,7 @@ import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
  */
 public interface IRollOutShippDetailsService extends IService<RollOutShippDetails> {
 
-    RollOnDutyDataVo queryOnDutyRecord(String ccmNo);
+    RollOnDutyDataVo queryOnDutyRecord(String ccmNo,String currentDate);
 
     RollChargeDetailsVO queryWorkbenchesDetail(RollDetailQueryDTO queryDTO);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/impl/RollOutShippDetailsServiceImpl.java

@@ -46,7 +46,7 @@ public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDeta
     private StorageBillMapper storageBillMapper;
 
     @Override
-    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo) {
+    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo,String currentDate) {
         RollOnDutyDataVo rollOnDutyVo = new RollOnDutyDataVo();
 
         // 1. 从 Redis 获取班次信息
@@ -69,10 +69,16 @@ public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDeta
 
         // 3. 查询当班装运单信息
         LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+
         billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
-                .eq(StorageBill::getDestination,"上若")
-                .gt(StorageBill::getAmountTotal, 0)
-                .between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+                .eq(StorageBill::getDestination, "上若")
+                .gt(StorageBill::getAmountTotal, 0);
+
+        if (oConvertUtils.isEmpty(currentDate)) {
+            billQueryWrapper.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+        } else {
+            billQueryWrapper.between(StorageBill::getCreateTime, DateUtils.getStartOfDay(currentDate), DateUtils.getEndOfDay(currentDate));
+        }
 
         List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
         if (oConvertUtils.listIsEmpty(storageBillList)) {