From 2474cec7f04390c196c0f7c753d4b70f1d53fcac Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 06 六月 2025 18:43:29 +0800
Subject: [PATCH] 修改bug
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
index 44cf3d3..e6e5f0f 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/UserPointController.java
@@ -226,8 +226,8 @@
public R<PageInfo<UserPointStatisticsPageVO>> getUserPointStatisticsPageList(@RequestParam(value = "types",required = false) Collection<Integer> types,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "phone",required = false) String phone,
- @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,
- @RequestParam(value = "endTime",required = false) LocalDateTime endTime,
+ @RequestParam(value = "beginTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime,
@ApiParam("当前页")@RequestParam("pageCurr") Integer pageCurr,
@ApiParam("分页大小")@RequestParam("pageSize") Integer pageSize) {
//查找记录
@@ -243,8 +243,8 @@
public R<UserPointStatisticsTopVO> getUserPointStatisticsTop(@RequestParam(value = "types",required = false) Collection<Integer> types,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "phone",required = false) String phone,
- @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,
- @RequestParam(value = "endTime",required = false) LocalDateTime endTime
+ @RequestParam(value = "beginTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime
) {
UserPointStatisticsTopVO userPointStatisticsOutVO = new UserPointStatisticsTopVO();
//充值绿电分
@@ -269,8 +269,8 @@
@RequestParam(value = "types",required = false) Collection<Integer> types,
@RequestParam(value = "name",required = false) String name,
@RequestParam(value = "phone",required = false) String phone,
- @RequestParam(value = "beginTime",required = false) LocalDateTime beginTime,
- @RequestParam(value = "endTime",required = false) LocalDateTime endTime){
+ @RequestParam(value = "beginTime",required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime beginTime,
+ @RequestParam(value = "endTime",required = false)@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") LocalDateTime endTime){
List<UserPointExcel> exportList =userPointMapper.userPointExcel(types,name,phone,beginTime,endTime);
exportList.forEach(x->{
if (x.getType()==12||x.getType()==17){
--
Gitblit v1.7.1