From 4847e1d0aad4693f86257434eb15e0f3cd0b64fe Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 16 Nov 2021 15:45:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B1=E5=BB=BA=E8=81=94=E7=9B=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/volunteer/dao/VolunteerUnionDao.java  |  5 +++++
 .../service/impl/VolunteerUnionServiceImpl.java   | 13 ++++++++-----
 .../mapper/volunteer/VolunteerUnionDao.xml        | 15 +++++++++++++++
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerUnionDao.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerUnionDao.java
index 69f8e8f0..08c77711 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerUnionDao.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/dao/VolunteerUnionDao.java
@@ -20,8 +20,12 @@ package com.elink.esua.epdc.modules.volunteer.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.modules.volunteer.entity.VolunteerUnionEntity;
+import com.elink.esua.epdc.volunteer.VolunteerUnionDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 共建联盟
  *
@@ -31,4 +35,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface VolunteerUnionDao extends BaseDao<VolunteerUnionEntity> {
 
+    List<VolunteerUnionDTO> getPageList(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerUnionServiceImpl.java b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerUnionServiceImpl.java
index e99370db..4181b683 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerUnionServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/java/com/elink/esua/epdc/modules/volunteer/service/impl/VolunteerUnionServiceImpl.java
@@ -51,11 +51,14 @@ public class VolunteerUnionServiceImpl extends BaseServiceImpl<VolunteerUnionDao
 
     @Override
     public PageData<VolunteerUnionDTO> page(Map<String, Object> params) {
-        IPage<VolunteerUnionEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, VolunteerUnionDTO.class);
+//        IPage<VolunteerUnionEntity> page = baseDao.selectPage(
+//                getPage(params, FieldConstant.CREATED_TIME, false),
+//                getWrapper(params)
+//        );
+//        return getPageData(page, VolunteerUnionDTO.class);
+        IPage<VolunteerUnionDTO> page = getPage(params);
+        List<VolunteerUnionDTO> list = baseDao.getPageList(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionDao.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionDao.xml
index 8679a7f4..5347d71d 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionDao.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/mapper/volunteer/VolunteerUnionDao.xml
@@ -16,6 +16,21 @@
         <result property="updatedTime" column="UPDATED_TIME"/>
         <result property="delFlag" column="DEL_FLAG"/>
     </resultMap>
+    <select id="getPageList" resultType="com.elink.esua.epdc.volunteer.VolunteerUnionDTO">
+        SELECT *
+        FROM `epdc_volunteer_union`
+        where DEL_FLAG='0'
+        <if test="unionName != null and unionName != ''">
+            and UNION_NAME like '%${unionName}%'
+        </if>
+        <if test="contacts != null and contacts != ''">
+            and CONTACTS like '%${contacts}%'
+        </if>
+        <if test="phone != null and phone != ''">
+            and PHONE like '%${phone}%'
+        </if>
+        order by CREATED_TIME desc
+    </select>
 
 
 </mapper>