diff --git a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java index f77c08c..347fad2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java @@ -44,5 +44,12 @@ public class checkResultRequest { @ApiModelProperty(value = "0:未检查 1:已检查") private Integer checkStatus; + /** + * 0:草稿 1:正式 + */ + @ApiModelProperty(value = "0:草稿 1:正式") + private Integer status ; + + } diff --git a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml index 01cffce..0cd043c 100644 --- a/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml @@ -150,6 +150,9 @@ and a.planned_year =#{req.plannedYear} + + and a.status =#{req.status} + and a.enterprise_name like concat('%', #{req.enterpriseName}, '%')