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 getStationList() { List list = this.queryList(new DeviceInfoBo());