修改大屏搜索等

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

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(){
+    public Result<List<IcSeedNewsDTO>> seedNewsScreenList(String title){
-        List<IcSeedNewsDTO> result = icSeedNewsService.seedNewsScreenList();
+        List<IcSeedNewsDTO> result = icSeedNewsService.seedNewsScreenList(title);
         return new Result<List<IcSeedNewsDTO>>().ok(result);
     }
 

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);
 }

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);
 }

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() {
+    public List<IcSeedNewsDTO> seedNewsScreenList(String title) {
-        List<IcSeedNewsEntity> result = baseDao.seedNewsScreenList();
+        List<IcSeedNewsEntity> result = baseDao.seedNewsScreenList(title);
         return ConvertUtils.sourceToTarget(result, IcSeedNewsDTO.class);
     }
 

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