bug fix

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/BKeyEnterprise.java

@@ -40,12 +40,6 @@ public class BKeyEnterprise implements Serializable {
     @ApiModelProperty(value = "企业代码")
     private String entCode;
 
-    /**
-     * 大类
-     */
-    @ApiModelProperty(value = "大类")
-    @Excel(name = "大类")
-    private String type;
 
     /**
      * 年份
@@ -116,12 +110,6 @@ public class BKeyEnterprise implements Serializable {
     @Excel(name = "企业名称")
     private String enterpriseName;
 
-    /**
-     * 企业名称
-     */
-    @ApiModelProperty(value = "区划代码")
-    @Excel(name = "区划代码")
-    private String district;
 
 
 }

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

@@ -35,8 +35,8 @@ public class BKeyEnterprisePageRequest implements Serializable {
     /**
      * 年份
      */
-    @ApiModelProperty("区划代码")
+    @ApiModelProperty("企业名称")
-    private String district;
+    private String enterpriseName;
 
     /**
      * size

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

@@ -10,21 +10,17 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="entCode != null">ent_code,</if>
             <if test="year != null">year,</if>
-            <if test="type != null">type,</if>
             <if test="enterpriseName != null">enterprise_name,</if>
-            <if test="district != null">district,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="entCode != null">#{entCode},</if>
             <if test="year != null">#{year},</if>
-            <if test="type != null">#{type},</if>
             <if test="enterpriseName != null">#{enterpriseName},</if>
-            <if test="district != null">#{district},</if>
         </trim>
 
     </insert>
     <select id="page" resultType="com.ruoyi.programManagement.entity.BKeyEnterprise">
-        select id,ent_code as entCode, type ,year,enterprise_name as enterpriseName from b_key_enterprise
+        select id,ent_code as entCode ,year,enterprise_name as enterpriseName from b_key_enterprise
         <where>
             <if test=" req.year !=null">
                 and year = #{req.year}
@@ -32,8 +28,8 @@
             <if test=" req.entCode !=null">
                 and ent_code = #{req.entCode}
             </if>
-            <if test=" req.district !=null">
+            <if test=" req.enterpriseName !=null">
-                and district = #{req.district}
+                and enterprise_name = #{req.enterpriseName}
             </if>
         </where>
         order by id desc