bug fix

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

@@ -25,7 +25,11 @@ public class PlanMxRequest {
     @ApiModelProperty(value = "计划年份")
     private String plannedYear;
 
-
+    /**
+     * 企业名称
+     */
+    @ApiModelProperty(value = "企业名称")
+    private String enterpriseName;
     /**
      * size
      */
@@ -38,5 +42,7 @@ public class PlanMxRequest {
      */
     @ApiModelProperty("num")
     private int pageNum;
+
+
 }
 

ruoyi-admin/src/main/java/com/ruoyi/programManagement/entity/response/PlanMxResponse.java

@@ -136,5 +136,5 @@ public class PlanMxResponse {
      * 企业名称
      */
     @ApiModelProperty(value = "企业名称")
-    private String entprName;
+    private String enterpriseName;
 }

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

@@ -122,7 +122,7 @@
                 and s.checkStatus =#{req.checkStatus}
             </if>
             <if test="req.enterpriseName !=null and req.enterpriseName !=''">
-                and s.enterpriseName =#{req.enterpriseName}
+                and s.enterpriseName  like concat('%', #{req.enterpriseName}, '%')
             </if>
             and s.rn = 1
         </where>
@@ -177,11 +177,11 @@
     <select id="getPlanMx" resultType="com.ruoyi.programManagement.entity.response.PlanMxResponse">
         SELECT
         a.*,
-        b.institution_name AS institutionName,
-        c.ENTERPRISE_NAME as entprName
+        b.DISTRICT_NAME AS institutionName,
+        c.ENTERPRISE_NAME as enterpriseName
         FROM
         b_plan_enterprise a
-        LEFT JOIN b_administrative b ON a.district = b.subdistrict
+        LEFT JOIN szs_administrative_division b ON a.district = b.DISTRICT_CODE
         LEFT JOIN szs_enterprise_information c ON a.enterprise_id = c.UUIT_NO
         <where>
             <if test="req.district !=null and req.district!='' ">
@@ -190,6 +190,10 @@
             <if test="req.plannedYear !=null and req.plannedYear!='' ">
                 and a.planned_year =#{req.plannedYear}
             </if>
+            <if test="req.enterpriseName !=null and req.enterpriseName!='' ">
+                and c.ENTERPRISE_NAME  like concat('%', #{req.enterpriseName}, '%')
+            </if>
+
         </where>
         group by a.id   order by a.id desc
     </select>