Merge branch 'main' of http://39.101.188.84:8000/suzhou-jichuang-lanhai/Suzhouyingji3Java into zhangtao

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 ;
+
+
 
 }

ruoyi-system/src/main/resources/mapper/yingji/BPlanEnterpriseMapper.xml

@@ -150,6 +150,9 @@
             <if test="req.plannedYear !=null and req.plannedYear !=''">
                 and a.planned_year =#{req.plannedYear}
             </if>
+            <if test="req.status !=null and req.status !=''">
+                and a.status =#{req.status}
+            </if>
             <if test="req.enterpriseName !=null and req.enterpriseName !=''">
                 and a.enterprise_name like concat('%', #{req.enterpriseName}, '%')
             </if>