wenhongquan 2 年之前
父節點
當前提交
711eb0e3a9

+ 19 - 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TblFacilitiesController.java

@@ -39,13 +39,30 @@ public class TblFacilitiesController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:facilities:list')")
     @GetMapping("/list")
-    public TableDataInfo list(TblFacilities tblFacilities)
+    public TableDataInfo list(TblFacilities tblFacilities )
     {
         startPage();
-        List<TblFacilities> list = tblFacilitiesService.selectTblFacilitiesList(tblFacilities);
+        List<TblFacilities> list = null;
+
+        list = tblFacilitiesService.selectTblFacilitiesList(tblFacilities);
+
+
         return getDataTable(list);
     }
 
+
+    @PreAuthorize("@ss.hasPermi('system:facilities:list')")
+    @PostMapping("/list")
+    public TableDataInfo list1(@RequestBody(required = false) TblFacilities tblFacilities1)
+    {
+        startPage();
+        List<TblFacilities> list = null;
+
+        list= tblFacilitiesService.selectTblFacilitiesList(tblFacilities1);
+
+
+        return getDataTable(list);
+    }
     /**
      * 导出设施列表
      */

+ 10 - 0
ruoyi-system/src/main/resources/mapper/system/TblFacilitiesMapper.xml

@@ -38,6 +38,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="exId1 != null  and exId1 != ''"> and ex_id_1 = #{exId1}</if>
             <if test="fLength != null  and fLength != ''"> and fLength = #{f_length}</if>
             <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
+            <if test="params.keyword != null  and params.keyword != ''">
+                and ( ext1->'$.tz_ssly' like '%${params.keyword}%' or  ext1->'$.tz_ss_dn' like '%${params.keyword}%')
+            </if>
+            <if test="params.ext1 != null  and params.ext1 != ''">
+                <foreach collection="params.ext1.entrySet()" open=" " separator=" " close=" " index="key" item="val">
+                   <if test="val !=null and val != '' ">
+                    and (ext1->'$.${key}'= #{val} or JSON_CONTAINS( ext1->'$.${key}',JSON_ARRAY(#{val})))
+                   </if>
+                </foreach>
+            </if>
         </where>
     </select>