11

nngkxxdp/src/main/java/com/example/nngkxxdp/query/SelectionAddrQuery.java

@@ -6,5 +6,13 @@ import lombok.Data;
 @Data
 public class SelectionAddrQuery extends BaseQuery {
     private Long parkId;
-    private String keyword;
+    //服务行业
+    private String productModule;
+    //载体类型
+    private String application;
+    //租赁情况
+    //所属园区
+    private String belong;
+
+
 }

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/HandleBusinessServiceImpl.java

@@ -115,7 +115,7 @@ public class HandleBusinessServiceImpl implements HandleBusinessService{
         }
         // 计算总页数
         int totalPages = (int) Math.ceil((double) total / query.getPageSize());
-        map.put("handleMatter", handleMatter);
+        map.put("handleMatters", handleMatter);
         map.put("handleBusiness", handleBusiness);
         map.put("handleDepts", handleDepts);
         map.put("total", total);

nngkxxdp/src/main/java/com/example/nngkxxdp/service/impl/SellBuildServiceImpl.java

@@ -2,7 +2,6 @@ package com.example.nngkxxdp.service.impl;
 
 import com.example.nngkxxdp.base.BusinessException;
 import com.example.nngkxxdp.dao.SellBuildDao;
-import com.example.nngkxxdp.entity.SelectionAddr;
 import com.example.nngkxxdp.entity.SellBuild;
 import com.example.nngkxxdp.query.SelectionAddrQuery;
 import com.example.nngkxxdp.query.SellBuildQuery;

nngkxxdp/src/main/resources/mapper/SellBuildDao.xml

@@ -109,14 +109,14 @@
         from t_sell_build sb
         left join t_park_data pd on pd.id = sb.belong
         <where>
-            <if test="parkId != null">
-                and sb.belong = #{parkId}
+            <if test="productModule != null and productModule != ''">
+                and product_module like concat('%', #{productModule}, '%')
             </if>
-            <if test="application != null and application != ''">
-                and sb.application like  concat('%', #{application}, '%')
+            <if test="belong != null and belong != ''">
+                and belong like concat('%', #{belong}, '%')
             </if>
-            <if test="spaceMin != null and spaceMin != '' and spaceMax != null and spaceMax != ''">
-                and sb.space &gt;= #{spaceMin} and sb.space &lt;= #{spaceMax}
+            <if test="application != null and application != ''">
+                and application like concat('%', #{application}, '%')
             </if>
         </where>
         limit #{begin}, #{pageSize}
@@ -124,20 +124,28 @@
     <select id="queryCountByAddr" resultType="java.lang.Integer">
         select count(*) from t_sell_build
         <where>
-            <if test="keyword != null and keyword != ''">
-                and (product_module like concat('%', #{keyword}, '%')
-                or belong like concat('%', #{keyword}, '%')
-                or application like concat('%', #{keyword}, '%'))
+            <if test="productModule != null and productModule != ''">
+                and product_module like concat('%', #{productModule}, '%')
+            </if>
+            <if test="belong != null and belong != ''">
+                and belong like concat('%', #{belong}, '%')
+            </if>
+            <if test="application != null and application != ''">
+                and application like concat('%', #{application}, '%')
             </if>
         </where>
     </select>
     <select id="queryDataByAddr" resultType="com.example.nngkxxdp.entity.SellBuild">
         select * from t_sell_build
         <where>
-            <if test="keyword != null and keyword != ''">
-                and (product_module like concat('%', #{keyword}, '%')
-                or belong like concat('%', #{keyword}, '%')
-                or application like concat('%', #{keyword}, '%'))
+            <if test="productModule != null and productModule != ''">
+                and product_module like concat('%', #{productModule}, '%')
+            </if>
+            <if test="belong != null and belong != ''">
+                and belong like concat('%', #{belong}, '%')
+            </if>
+            <if test="application != null and application != ''">
+                and application like concat('%', #{application}, '%')
             </if>
         </where>
         limit #{begin}, #{pageSize}