diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanPageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanPageReqVO.java index 895dcf487..2fcbcc14f 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanPageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/veneer/vo/VeneerPlanPageReqVO.java @@ -24,6 +24,6 @@ public class VeneerPlanPageReqVO extends PageParam { @Schema(description = "排单状态:0-未开料/新单,1-已优化,2-开料中,3-已开料") private List status; - @Schema(description = "是否已投入生产:false-未投入,true-已投入", defaultValue = "false") - private Boolean isScheduled = false; + @Schema(description = "是否已投入生产:false-未投入,true-已投入;不传则查询全部") + private Boolean isScheduled; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerPlanMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerPlanMapper.xml index f5812852b..8feffb6c5 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerPlanMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerPlanMapper.xml @@ -34,14 +34,9 @@ #{status} - - - AND ovp.is_scheduled = true - - - AND ovp.is_scheduled = false - - + + AND ovp.is_scheduled = #{req.isScheduled} + ORDER BY ovp.id DESC