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/BPlanEnterprise.java

@@ -184,9 +184,6 @@ public class BPlanEnterprise extends BaseEntity {
 
 
 
-
-
-
     /**
      * 0：未检查 1：已检查
      */

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/request/checkResultRequest.java

@@ -1,5 +1,6 @@
 package com.ruoyi.programManagement.entity.request;
 
+import com.ruoyi.common.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.models.auth.In;
 import lombok.Data;
@@ -29,7 +30,19 @@ public class checkResultRequest {
     @ApiModelProperty(value = "行政区划")
     private  String district;
 
+    /**
+     * 企业名称
+     */
+    @Excel(name = "企业名称")
+    @ApiModelProperty(value = "企业名称")
+    private String enterpriseName;
+
 
+    /**
+     * 0：未检查 1：已检查
+     */
+    @ApiModelProperty(value = "0：未检查 1：已检查")
+    private Integer checkStatus;
 
 
 }

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

@@ -76,6 +76,12 @@
             <if test="enterpriseName != null  and enterpriseName != ''">and s.enterprise_name like concat('%',
                 #{enterpriseName}, '%')
             </if>
+            <if test="district != '' and district.length==3">
+                and s.district like concat('%',#{district}, '%')
+            </if>
+            <if test="district != '' and district.length==6">
+                and s.district like concat('%',#{district}, '%')
+            </if>
             <if test="district != null and district != ''">
                 and s.district in
                 <foreach item="item" index="index" collection="district.split(',')" open="(" separator="," close=")">

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

@@ -76,6 +76,12 @@
             <if test="updateId != null ">and a.update_id = #{updateId}</if>
             <if test="userId != null ">and a.user_id = #{userId}</if>
             <if test="deptId != null ">and a.dept_id = #{deptId}</if>
+            <if test="district != '' and district.length==3">
+                and a.district like concat('%',#{district}, '%')
+            </if>
+            <if test="district != '' and district.length==6">
+                and a.district like concat('%',#{district}, '%')
+            </if>
             <if test="district != null and district != ''">
                 and a.district in
                 <foreach item="item" index="index" collection="district.split(',')" open="(" separator="," close=")">
@@ -108,7 +114,7 @@
 
     <select id="getZhifa" resultType="com.ruoyi.programManagement.entity.response.BPlanEnterpriseZhifaResponse">
 
-        SELECT DISTINCT
+        SELECT
         a.id,
         a.enterprise_id,
         a.create_id,
@@ -145,6 +151,12 @@
             <if test="req.plannedYear !=null and req.plannedYear !=''">
                 and a.planned_year =#{req.plannedYear}
             </if>
+            <if test="req.enterpriseName !=null and req.enterpriseName !=''">
+                and a.enterprise_name =#{req.enterpriseName}
+            </if>
+            <if test="req.checkStatus !=null and req.checkStatus !=''">
+                and a.check_status =#{req.checkStatus}
+            </if>
             <if test="req.district !=null and req.district !=''">
                 and a.district like concat('%', #{req.district}, '%')
             </if>