排程添加排程时间过滤条件

hx-mes/src/main/java/com/fjhx/mes/entity/production/dto/ProductionSchedulingSelectDto.java

@@ -1,9 +1,12 @@
 package com.fjhx.mes.entity.production.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.domain.BaseSelectDto;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.Date;
+
 /**
  * 生产排程列表查询入参实体
  *
@@ -24,5 +27,10 @@ public class ProductionSchedulingSelectDto extends BaseSelectDto {
      */
     private Long processesId;
 
+    /**
+     * 排程时间
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    private Date schedulingDate;
 
 }

hx-mes/src/main/java/com/fjhx/mes/service/production/impl/ProductionSchedulingServiceImpl.java

@@ -54,6 +54,11 @@ public class ProductionSchedulingServiceImpl extends ServiceImpl<ProductionSched
         wrapper.in("po", ProductionOrder::getCompanyId, SecurityUtils.getCompanyIds());
         wrapper.eq("po", ProductionOrder::getCompanyId, dto.getCompanyId());
 
+        //排程日期过滤
+        wrapper.eq("ps", ProductionScheduling::getSchedulingDate, dto.getSchedulingDate());
+
+        wrapper.orderByDesc("ps.scheduling_date");
+
         Page<ProductionSchedulingVo> page = baseMapper.getPage(dto.getPage(), wrapper);
         List<ProductionSchedulingVo> records = page.getRecords();
         if (ObjectUtil.isEmpty(records)) {