From 0a85eb9a64eabe823e5da2cb3e24a2ee15f2e0ad Mon Sep 17 00:00:00 2001
From: dongdingding <207595406@qq.com>
Date: Fri, 22 Dec 2023 16:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E6=B3=95=E7=BB=93=E6=9E=9C=E8=AF=A6?=
=?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../entity/request/checkResultRequest.java | 7 +++++++
.../main/resources/mapper/yingji/BPlanEnterpriseMapper.xml | 3 +++
2 files changed, 10 insertions(+)
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}, '%')