From 66acc1a3181568c386a381674abff5591f933647 Mon Sep 17 00:00:00 2001
From: lizhicheng <lizhicheng2@hisense.com>
Date: Wed, 2 Nov 2022 16:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=AF=A6=E6=83=85=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=B5=84=E6=BA=90=E5=90=8D=E7=A7=B0=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/renren/common/controller/CensusController.java    | 2 ++
 .../src/main/resources/mapper/resource/ResourceDao.xml   | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
index 7a7f18b9..8b1b3b22 100644
--- a/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
+++ b/renren-admin/src/main/java/io/renren/common/controller/CensusController.java
@@ -474,6 +474,7 @@ public class CensusController {
             @ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "type", value = "资源类型", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "deptId", value = "所属部门", paramType = "query", dataType = "long"),
+            @ApiImplicitParam(name = "resourceName", value = "资源名称", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "approveStatus", value = "审核状态，可选值(通过、审核中)", paramType = "query", dataType = "String"),
     })
     public Result selectCensusResourceTable(@RequestParam Map<String, Object> params) {
@@ -557,6 +558,7 @@ public class CensusController {
             @ApiImplicitParam(name = "endDate", value = "结束时间", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "type", value = "资源类型", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "deptId", value = "所属部门", paramType = "query", dataType = "long"),
+            @ApiImplicitParam(name = "resourceName", value = "资源名称", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "approveStatus", value = "审核状态，可选值(通过、审核中)", paramType = "query", dataType = "String"),
     })
     public Result selectCensusApplyTable(@RequestParam Map<String, Object> params) {
diff --git a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
index 95346ade..693acfb8 100644
--- a/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
+++ b/renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
@@ -1941,6 +1941,9 @@
         <if test="region != null and region != ''">
             AND sd.district = #{region}
         </if>
+        <if test="resourceName != null and resourceName != ''">
+            AND tdr.name LIKE CONCAT( '%', #{resourceName}, '%' )
+        </if>
         <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
             AND SUBSTR(tdr.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
@@ -1997,6 +2000,9 @@
         <if test="region != null and region != ''">
             AND sd.district = #{region}
         </if>
+        <if test="resourceName != null and resourceName != ''">
+            AND tdr.name LIKE CONCAT( '%', #{resourceName}, '%' )
+        </if>
         <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
             AND SUBSTR(taa.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
         </if>
@@ -2032,6 +2038,9 @@
             <if test="deptId != null and deptId != ''">
                 AND tmb.dept = #{deptId}
             </if>
+            <if test="resourceName != null and resourceName != ''">
+                AND tm.name LIKE CONCAT( '%', #{resourceName}, '%' )
+            </if>
             <if test="startDate != null and startDate != '' and endDate != null and endDate != ''">
                 AND SUBSTR(tmb.create_date, 1, 10) BETWEEN #{startDate} AND #{endDate}
             </if>