From f9f4ea4b98f12860ff085c1a21c419b29356b2f3 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 22 Mar 2022 14:50:55 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/PointsLogsController.java | 12 ++- .../elink/esua/epdc/dao/PointsLogsDao.java | 10 +++ .../esua/epdc/excel/PointsLogsExcel.java | 83 ++++++++++--------- .../esua/epdc/service/PointsLogsService.java | 10 +++ .../service/impl/PointsLogsServiceImpl.java | 7 ++ .../main/resources/mapper/PointsLogsDao.xml | 23 +++++ 6 files changed, 105 insertions(+), 40 deletions(-) diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java index 31ae96f..b9f98d3 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/controller/PointsLogsController.java @@ -25,6 +25,7 @@ import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.commons.tools.validator.group.AddGroup; import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup; import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup; +import com.elink.esua.epdc.dao.PointsLogsDao; import com.elink.esua.epdc.dto.EpdcAdjustUserPointsDTO; import com.elink.esua.epdc.dto.PointsLogsDTO; import com.elink.esua.epdc.dto.UserDTO; @@ -53,12 +54,21 @@ public class PointsLogsController { @Autowired private PointsLogsService pointsLogsService; + @Autowired + private PointsLogsDao pointsLogsDao; + @GetMapping("page") public Result> page(@RequestParam Map params){ PageData page = pointsLogsService.page(params); return new Result>().ok(page); } + @GetMapping("logpage") + public Result> logpage(@RequestParam Map params){ + PageData page = pointsLogsService.logpage(params); + return new Result>().ok(page); + } + @GetMapping("{id}") public Result get(@PathVariable("id") String id){ PointsLogsDTO data = pointsLogsService.get(id); @@ -95,7 +105,7 @@ public class PointsLogsController { @GetMapping("export") public void export(@RequestParam Map params, HttpServletResponse response) throws Exception { - List list = pointsLogsService.list(params); + List list = pointsLogsDao.selectListVolunteerPointsLogPage(params); ExcelUtils.exportExcelToTarget(response, null, list, PointsLogsExcel.class); } diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java index 9714220..b8c0a9c 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/dao/PointsLogsDao.java @@ -98,6 +98,16 @@ public interface PointsLogsDao extends BaseDao { **/ List selectListVolunteerPointsLog(Map params); + /** + * 志愿者管理 积分记录页面分页查询 + * @param params + * param userId 必选 用户ID + * @return java.util.List + * @Author zhangyong + * @Date 15:31 2020-05-12 + **/ + List selectListVolunteerPointsLogPage(Map params); + /** * 积分排行接口（0 周排行、1 月排行） - 查询用户个人排名名次 及 积分 * diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java index 5351c3f..2d001a0 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/excel/PointsLogsExcel.java @@ -31,56 +31,61 @@ import java.util.Date; @Data public class PointsLogsExcel { - @Excel(name = "ID") - private String id; - - @Excel(name = "用户ID") - private String userId; - - @Excel(name = "关联表ID") - private String referenceId; - - @Excel(name = "积分规则编码") - private String ruleCode; + @Excel(name = "操作描述") + private String operationDesc; - @Excel(name = "积分行为编码") + @Excel(name = "积分行为") private String behaviorCode; - @Excel(name = "积分操作类型 0-减积分，1-加积分") - private String operationType; + @Excel(name = "操作时间", format = "yyyy-MM-dd HH:mm:ss") + private Date operationTime; - @Excel(name = "操作积分值") + @Excel(name = "积分变化") private Integer points; - @Excel(name = "操作描述") - private String operationDesc; - - @Excel(name = "操作时间") - private Date operationTime; - - @Excel(name = "操作方式 user-用户操作，admin-管理员操作，sys-系统操作") - private String operationMode; + @Excel(name = "操作类型", replace = {"减积分_0","加积分_1"}) + private String operationType; - @Excel(name = "剩余积分值") + @Excel(name = "剩余积分") private Integer lavePoints; - @Excel(name = "乐观锁") - private Integer revision; - - @Excel(name = "删除标识 0-否，1-是") - private String delFlag; - - @Excel(name = "创建人") - private String createdBy; - @Excel(name = "创建时间") - private Date createdTime; - @Excel(name = "更新人") - private String updatedBy; - @Excel(name = "更新时间") - private Date updatedTime; -} \ No newline at end of file +// @Excel(name = "ID") +// private String id; +// +// @Excel(name = "用户ID") +// private String userId; +// +// @Excel(name = "关联表ID") +// private String referenceId; +// +// @Excel(name = "积分规则编码") +// private String ruleCode; +// +// @Excel(name = "操作方式 user-用户操作，admin-管理员操作，sys-系统操作") +// private String operationMode; +// +// @Excel(name = "乐观锁") +// private Integer revision; +// +// @Excel(name = "删除标识 0-否，1-是") +// private String delFlag; +// +// @Excel(name = "创建人") +// private String createdBy; +// +// @Excel(name = "创建时间") +// private Date createdTime; +// +// @Excel(name = "更新人") +// private String updatedBy; +// +// @Excel(name = "更新时间") +// private Date updatedTime; + + +} diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java index 257dfa2..3cac59c 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/PointsLogsService.java @@ -49,6 +49,16 @@ public interface PointsLogsService extends BaseService { */ PageData page(Map params); + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-04-29 + */ + PageData logpage(Map params); + /** * 默认查询 * diff --git a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java index 3be05f0..f6ae19e 100644 --- a/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java +++ b/epdc-cloud-points/src/main/java/com/elink/esua/epdc/service/impl/PointsLogsServiceImpl.java @@ -91,6 +91,13 @@ public class PointsLogsServiceImpl extends BaseServiceImpl(list, page.getTotal()); } + @Override + public PageData logpage(Map params) { + IPage page = getPage(params); + List list = baseDao.selectListVolunteerPointsLogPage(params); + return new PageData<>(list, page.getTotal()); + } + @Override public List list(Map params) { List entityList = baseDao.selectList(getWrapper(params)); diff --git a/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml b/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml index 2af9c9e..acef416 100644 --- a/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml +++ b/epdc-cloud-points/src/main/resources/mapper/PointsLogsDao.xml @@ -128,6 +128,29 @@ l.CREATED_TIME DESC + +