From 6f137f38ed482d91e822627143156e1b1ce49a20 Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 12 May 2020 14:25:07 +0800
Subject: [PATCH 1/2] =?UTF-8?q?new=E6=A8=A1=E5=9D=97=E5=8E=BB=E6=8E=89sql?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=89=8D=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/NewsCategoryDao.xml         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml
index c1c609f4..15400f96 100644
--- a/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml
+++ b/esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NewsCategoryDao.xml
@@ -20,7 +20,7 @@
     SELECT
 	COUNT(CATEGORY_CODE) AS codeCount
     FROM
-	esua_epdc_news.epdc_news_category
+	epdc_news_category
     WHERE
 	CATEGORY_CODE = #{categoryCode}
         <if test="id!=null and id!=''">
@@ -32,7 +32,7 @@
     SELECT
 	COUNT(CATEGORY_NAME) AS codeCount
     FROM
-	esua_epdc_news.epdc_news_category
+	epdc_news_category
     WHERE
 	CATEGORY_NAME = #{categoryName}
         <if test="id!=null and id!=''">
@@ -41,6 +41,6 @@
         AND  DEL_FLAG= '0'
     </select>
     <select id="selectListCategory" resultType="Map">
-        SELECT ID as id,CATEGORY_NAME as name FROM esua_epdc_news.epdc_news_category where DEL_FLAG= '0'
+        SELECT ID as id,CATEGORY_NAME as name FROM epdc_news_category where DEL_FLAG= '0'
     </select>
-</mapper>
\ No newline at end of file
+</mapper>

From 8025ea3259c9d51f5e6839582ebf706b62a47c2c Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Tue, 12 May 2020 16:19:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=BF=97=E6=84=BF=E8=80=85=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../elink/esua/epdc/dao/PointsLogsDao.java    | 13 +++++++++++-
 .../service/impl/PointsLogsServiceImpl.java   |  8 +++----
 .../main/resources/mapper/PointsLogsDao.xml   | 21 +++++++++++++++++++
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
index 0fa2575e..f1c0f9e8 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java
@@ -18,9 +18,9 @@
 package com.elink.esua.epdc.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.PointsLogsDTO;
 import com.elink.esua.epdc.dto.form.PointsLogsFormDTO;
 import com.elink.esua.epdc.dto.result.PointsLogsResultDTO;
-import com.elink.esua.epdc.dto.result.PointsLogsSumResultDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppPointsRankingFormDTO;
 import com.elink.esua.epdc.dto.form.EpdcAppPointsRecordFormDTO;
 import com.elink.esua.epdc.dto.result.EpdcAppPointsRankingResultDTO;
@@ -29,6 +29,7 @@ import com.elink.esua.epdc.entity.PointsLogsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 积分记录表 积分记录表
@@ -90,4 +91,14 @@ public interface PointsLogsDao extends BaseDao<PointsLogsEntity> {
      * @Date: 2020-04-30
      */
     List<EpdcAppPointsRankingResultDTO> selectListPointsRanking(EpdcAppPointsRankingFormDTO formDto);
+
+    /**
+     * 志愿者管理 积分记录页面分页查询
+     * @param params
+     *  param   userId    必选  用户ID
+     * @return java.util.List<com.elink.esua.epdc.dto.PointsLogsDTO>
+     * @Author zhangyong
+     * @Date 15:31 2020-05-12
+     **/
+    List<PointsLogsDTO> selectListVolunteerPointsLog(Map<String, Object> params);
 }
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
index 4490e13b..263e72a0 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java
@@ -77,11 +77,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
 
     @Override
     public PageData<PointsLogsDTO> page(Map<String, Object> params) {
-        IPage<PointsLogsEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                getWrapper(params)
-        );
-        return getPageData(page, PointsLogsDTO.class);
+        IPage<PointsLogsDTO> page = getPage(params);
+        List<PointsLogsDTO> list = baseDao.selectListVolunteerPointsLog(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
diff --git a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
index db188f0b..53fc1ce1 100755
--- a/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
+++ b/esua-epdc/epdc-module/epdc-points/epdc-points-server/src/main/resources/mapper/PointsLogsDao.xml
@@ -107,4 +107,25 @@
         ) tab ORDER BY (tab.totalPointsAdd - tab.totalPointsDeducted) DESC
         LIMIT #{pageIndex}, #{pageSize}
     </select>
+
+    <select id="selectListVolunteerPointsLog" resultType="com.elink.esua.epdc.dto.PointsLogsDTO">
+        SELECT
+            l.OPERATION_DESC operationDesc,
+            b.BEHAVIOR_DESC behaviorCode,
+            l.OPERATION_TIME operationTime,
+            l.POINTS points,
+            l.OPERATION_TYPE operationType,
+            l.LAVE_POINTS lavePoints
+        FROM
+            epdc_points_logs l
+            LEFT JOIN epdc_points_behavior b ON l.BEHAVIOR_CODE = b.BEHAVIOR_CODE AND b.DEL_FLAG = 0
+        WHERE
+            l.DEL_FLAG = 0
+            AND l.USER_ID = #{userId}
+            <if test="behaviorCode != null and behaviorCode != ''">
+                AND l.BEHAVIOR_CODE = #{behaviorCode}
+            </if>
+        ORDER BY
+            l.CREATED_TIME DESC
+    </select>
 </mapper>