From c29023115a444229da7138e8b8c0d45ba0d0134d Mon Sep 17 00:00:00 2001
From: lichao <326994889@qq.com>
Date: Tue, 25 Jun 2024 09:06:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=A7=E5=B1=8F=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml   | 2 +-
 .../partymember/controller/YiFengScreenController.java        | 4 ++--
 .../java/com/epmet/modules/partymember/dao/IcSeedNewsDao.java | 3 ++-
 .../epmet/modules/partymember/service/IcSeedNewsService.java  | 2 +-
 .../partymember/service/impl/IcSeedNewsServiceImpl.java       | 4 ++--
 .../src/main/resources/mapper/partymember/IcSeedNewsDao.xml   | 4 ++++
 6 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
index ecd3385145..b2d312e44c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml
@@ -1022,7 +1022,7 @@
     </select>
     <select id="yifengHouseListByGroup" resultType="com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO">
 
-        select ID as houseId, FULL_NAME as houseName
+        select ID as houseId, concat(house_group,DOOR_NAME,'户') as houseName
         from ic_house
         where CUSTOMER_ID = '1739891126105206785'
         and
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
index cd9d8e6f12..c946762bb9 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/YiFengScreenController.java
@@ -229,8 +229,8 @@ public class YiFengScreenController {
      * @Date: 2024/3/28 16:55
      */
     @GetMapping("seedNewsScreenList")
-    public Result<List<IcSeedNewsDTO>> seedNewsScreenList(){
-        List<IcSeedNewsDTO> result = icSeedNewsService.seedNewsScreenList();
+    public Result<List<IcSeedNewsDTO>> seedNewsScreenList(String title){
+        List<IcSeedNewsDTO> result = icSeedNewsService.seedNewsScreenList(title);
         return new Result<List<IcSeedNewsDTO>>().ok(result);
     }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedNewsDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedNewsDao.java
index 4ba8138748..0a45feeb2e 100755
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedNewsDao.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcSeedNewsDao.java
@@ -20,6 +20,7 @@ package com.epmet.modules.partymember.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.IcSeedNewsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -32,5 +33,5 @@ import java.util.List;
 @Mapper
 public interface IcSeedNewsDao extends BaseDao<IcSeedNewsEntity> {
 
-    List<IcSeedNewsEntity> seedNewsScreenList();
+    List<IcSeedNewsEntity> seedNewsScreenList(@Param("title") String title);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedNewsService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedNewsService.java
index 0b3ac34f7e..69aa3aecd2 100755
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedNewsService.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcSeedNewsService.java
@@ -94,5 +94,5 @@ public interface IcSeedNewsService extends BaseService<IcSeedNewsEntity> {
      */
     void delete(String[] ids);
 
-    List<IcSeedNewsDTO> seedNewsScreenList();
+    List<IcSeedNewsDTO> seedNewsScreenList(String title);
 }
\ No newline at end of file
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java
index 8cccedbd41..e0b86b01c1 100755
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcSeedNewsServiceImpl.java
@@ -100,8 +100,8 @@ public class IcSeedNewsServiceImpl extends BaseServiceImpl<IcSeedNewsDao, IcSeed
     }
 
     @Override
-    public List<IcSeedNewsDTO> seedNewsScreenList() {
-        List<IcSeedNewsEntity> result = baseDao.seedNewsScreenList();
+    public List<IcSeedNewsDTO> seedNewsScreenList(String title) {
+        List<IcSeedNewsEntity> result = baseDao.seedNewsScreenList(title);
         return ConvertUtils.sourceToTarget(result, IcSeedNewsDTO.class);
     }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedNewsDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedNewsDao.xml
index 487d7c8e7e..de39332c3b 100755
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedNewsDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcSeedNewsDao.xml
@@ -25,6 +25,10 @@
         select ID,TITLE,AUTHOR,PUBLISH_TIME
         from ic_seed_news
         where DEL_FLAG = 0
+        <if test="title != null and title != ''">
+            and
+            TITLE like concat('%',#{title},'%')
+        </if>
         order by SORT