From 3ecb8c6fd65e14864117b458e6fa4c8c896a6007 Mon Sep 17 00:00:00 2001
From: gjh <1421wake>
Date: Tue, 1 Jul 2025 14:42:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=94=9F=E4=BA=A7=E6=97=A5?=
 =?UTF-8?q?=E6=9C=9F-=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/dromara/demo/domain/DeviceInfo.java   | 12 ++++++++++++
 .../org/dromara/demo/domain/bo/DeviceInfoBo.java   | 11 +++++++++++
 .../demo/service/impl/DeviceInfoServiceImpl.java   | 14 ++++++++++++++
 3 files changed, 37 insertions(+)

diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java
index 579b4e4..8f168ba 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/DeviceInfo.java
@@ -6,6 +6,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
 
@@ -80,5 +81,16 @@ public class DeviceInfo extends TenantEntity {
     @TableLogic
     private Long delFlag;
 
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
 
+    /**
+     * 结束日期
+     */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
 }
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java
index 61b819f..e812d57 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/DeviceInfoBo.java
@@ -86,4 +86,15 @@ public class DeviceInfoBo extends BaseEntity {
     private String status;
 
 
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    /**
+     * 结束日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
+
 }
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java
index 2290482..cfccc58 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/DeviceInfoServiceImpl.java
@@ -81,6 +81,16 @@ public class DeviceInfoServiceImpl implements IDeviceInfoService {
         lqw.eq(StringUtils.isNotBlank(bo.getNumber()), DeviceInfo::getNumber, bo.getNumber());
         lqw.eq(StringUtils.isNotBlank(bo.getTestSubstance()), DeviceInfo::getTestSubstance, bo.getTestSubstance());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), DeviceInfo::getStatus, bo.getStatus());
+
+        // 对 生产日期 进行范围查询
+        lqw.between(
+            bo.getStartDate() != null && bo.getEndDate() != null,
+            DeviceInfo::getManufactureDate,
+            bo.getStartDate(),
+            bo.getEndDate()
+        );
+        // 添加按创建时间降序排序
+        lqw.orderByDesc(DeviceInfo::getCreateTime);
         return lqw;
     }
 
@@ -136,6 +146,10 @@ public class DeviceInfoServiceImpl implements IDeviceInfoService {
         return baseMapper.deleteByIds(ids) > 0;
     }
 
+    /**
+     * 获取站点名称下拉框列表
+     * @return
+     */
     @Override
     public List<StationSelectVo> getStationList() {
         List<DeviceInfoVo> list = this.queryList(new DeviceInfoBo());