From 043f03ad42647d9dc8db3b5f39d9e70c36c50044 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 18 May 2020 15:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9=E6=94=B9?=
 =?UTF-8?q?=E5=8A=A8-point=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc/modules/logs/dao/PointsLogsDao.java  | 12 +++++++++-
 .../service/impl/PointsLogsServiceImpl.java   | 22 ++++++-------------
 .../resources/mapper/logs/PointsLogsDao.xml   | 22 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 17 deletions(-)

diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/dao/PointsLogsDao.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/dao/PointsLogsDao.java
index 5d9945a..b7e7297 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/dao/PointsLogsDao.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/dao/PointsLogsDao.java
@@ -18,9 +18,13 @@
 package com.elink.esua.epdc.modules.logs.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.logs.PointsLogsDTO;
 import com.elink.esua.epdc.modules.logs.entity.PointsLogsEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 积分日志表
  *
@@ -29,5 +33,11 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface PointsLogsDao extends BaseDao<PointsLogsEntity> {
-
+    /**
+     * 志愿者管理 积分记录页面分页查询
+     *
+     * @param params
+     * @return
+     */
+    List<PointsLogsDTO> selectListVolunteerPointsLog(Map<String, Object> params);
 }
diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
index fce148a..8ab08c5 100644
--- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
+++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/modules/logs/service/impl/PointsLogsServiceImpl.java
@@ -71,17 +71,9 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
 
     @Override
     public PageData<PointsLogsDTO> page(Map<String, Object> params) {
-        String volunteerId = (String) params.get("volunteerId");
-        String behaviorCode = (String) params.get("behaviorCode");
-        QueryWrapper<PointsLogsEntity> wrapper = new QueryWrapper<>();
-        wrapper.eq(StringUtils.isNotBlank(volunteerId), "VOLUNTEER_ID", volunteerId)
-                .eq(StringUtils.isNotBlank(behaviorCode), "BEHAVIOR_CODE", behaviorCode);
-
-        IPage<PointsLogsEntity> page = baseDao.selectPage(
-                getPage(params, FieldConstant.CREATED_TIME, false),
-                wrapper
-        );
-        return getPageData(page, PointsLogsDTO.class);
+        IPage<PointsLogsDTO> page = getPage(params);
+        List<PointsLogsDTO> list = baseDao.selectListVolunteerPointsLog(params);
+        return new PageData<>(list, page.getTotal());
     }
 
     @Override
@@ -91,8 +83,8 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
         return ConvertUtils.sourceToTarget(entityList, PointsLogsDTO.class);
     }
 
-    private QueryWrapper<PointsLogsEntity> getWrapper(Map<String, Object> params){
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+    private QueryWrapper<PointsLogsEntity> getWrapper(Map<String, Object> params) {
+        String id = (String) params.get(FieldConstant.ID_HUMP);
 
         QueryWrapper<PointsLogsEntity> wrapper = new QueryWrapper<>();
         wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@@ -138,10 +130,10 @@ public class PointsLogsServiceImpl extends BaseServiceImpl<PointsLogsDao, Points
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Result confirmAdjustPoint(EpdcAdjustVolunteerPointsDTO formDto) {
-        if(formDto.getOperatePoints()== NumConstant.ZERO){
+        if (formDto.getOperatePoints() == NumConstant.ZERO) {
             return new Result().error("操作积分不能为0");
         }
-        PointsLogsEntity pointsLogsEntity=new PointsLogsEntity();
+        PointsLogsEntity pointsLogsEntity = new PointsLogsEntity();
         pointsLogsEntity.setVolunteerId(formDto.getId());
         pointsLogsEntity.setUserId(formDto.getUserId());
         pointsLogsEntity.setOperationTime(new Date());
diff --git a/epdc-cloud-points/src/main/resources/mapper/logs/PointsLogsDao.xml b/epdc-cloud-points/src/main/resources/mapper/logs/PointsLogsDao.xml
index 1412307..f9996c9 100644
--- a/epdc-cloud-points/src/main/resources/mapper/logs/PointsLogsDao.xml
+++ b/epdc-cloud-points/src/main/resources/mapper/logs/PointsLogsDao.xml
@@ -25,5 +25,25 @@
         <result property="behaviorCode" column="BEHAVIOR_CODE"/>
     </resultMap>
 
-
+    <select id="selectListVolunteerPointsLog" resultType="com.elink.esua.epdc.dto.logs.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 !='' and behaviorCode != null">
+            and l.BEHAVIOR_CODE = #{behaviorCode}
+        </if>
+    ORDER BY
+	l.CREATED_TIME DESC
+    </select>
 </mapper>