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 { - + /** + * 志愿者管理 积分记录页面分页查询 + * + * @param params + * @return + */ + List selectListVolunteerPointsLog(Map 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 page(Map params) { - String volunteerId = (String) params.get("volunteerId"); - String behaviorCode = (String) params.get("behaviorCode"); - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(volunteerId), "VOLUNTEER_ID", volunteerId) - .eq(StringUtils.isNotBlank(behaviorCode), "BEHAVIOR_CODE", behaviorCode); - - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - wrapper - ); - return getPageData(page, PointsLogsDTO.class); + IPage page = getPage(params); + List list = baseDao.selectListVolunteerPointsLog(params); + return new PageData<>(list, page.getTotal()); } @Override @@ -91,8 +83,8 @@ public class PointsLogsServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -138,10 +130,10 @@ public class PointsLogsServiceImpl extends BaseServiceImpl - +