zhang

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

@@ -25,16 +25,37 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectBEnterpriseNewVo">
-        select id, enterprise_id, enterprise_name, district, SUPERVISION_LARGE, RISK_LEVEL, STAND_LEVEL, EXAMINE_END_TIME, create_id, create_by, create_time, update_id, update_by, update_time, remark, user_id, dept_id from b_enterprise_new
+        select id,
+               enterprise_id,
+               enterprise_name,
+               district,
+               SUPERVISION_LARGE,
+               RISK_LEVEL,
+               STAND_LEVEL,
+               EXAMINE_END_TIME,
+               create_id,
+               create_by,
+               create_time,
+               update_id,
+               update_by,
+               update_time,
+               remark,
+               user_id,
+               dept_id
+        from b_enterprise_new
     </sql>
 
     <select id="selectBEnterpriseNewList" parameterType="BEnterpriseNew" resultMap="BEnterpriseNewResult">
         <include refid="selectBEnterpriseNewVo"/>
         <where>
             <if test="enterpriseId != null  and enterpriseId != ''">and enterprise_id = #{enterpriseId}</if>
-            <if test="enterpriseName != null  and enterpriseName != ''"> and enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name like concat('%',
-            <if test="district != null  and district != ''"> and district = #{district}</if>
+                #{enterpriseName}, '%')
-            <if test="supervisionLarge != null  and supervisionLarge != ''"> and SUPERVISION_LARGE = #{supervisionLarge}</if>
+            </if>
+            <if test="district != null  and district != ''">and district like concat('%', #{district}, '%')</if>
+            <if test="supervisionLarge != null  and supervisionLarge != ''">and SUPERVISION_LARGE =
+                #{supervisionLarge}
+            </if>
             <if test="riskLevel != null  and riskLevel != ''">and RISK_LEVEL = #{riskLevel}</if>
             <if test="standLevel != null  and standLevel != ''">and STAND_LEVEL = #{standLevel}</if>
             <if test="examineEndTime != null ">and EXAMINE_END_TIME = #{examineEndTime}</if>
@@ -114,7 +135,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteBEnterpriseNewById" parameterType="Long">
-        delete from b_enterprise_new where id = #{id}
+        delete
+        from b_enterprise_new
+        where id = #{id}
     </delete>
 
     <delete id="deleteBEnterpriseNewByIds" parameterType="String">

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

@@ -37,8 +37,6 @@
                dept_id,
                district,
                planned_year,
-               plan_name,
-               plan_content,
                is_point,
                enterprise_name,
                law_sort,
@@ -66,7 +64,9 @@
             <if test="planName != null  and planName != ''">and plan_name like concat('%', #{planName}, '%')</if>
             <if test="planContent != null  and planContent != ''">and plan_content = #{planContent}</if>
             <if test="isPoint != null ">and is_point = #{isPoint}</if>
-            <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name  like concat('%',#{enterpriseName}, '%')</if>
+            <if test="enterpriseName != null  and enterpriseName != ''">and enterprise_name like
+                concat('%',#{enterpriseName}, '%')
+            </if>
         </where>
     </select>
     <delete id="deleteByPlanId">