From e1cc0d03fadc2d251d36c0dc3650f75e830d5363 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 07 四月 2022 19:12:42 +0800
Subject: [PATCH] 功能完善

---
 app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java b/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
index 4183d53..1812f56 100644
--- a/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
+++ b/app/src/main/java/com/yeshi/makemoney/app/service/impl/money/ExtractServiceImpl.java
@@ -39,6 +39,7 @@
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -66,11 +67,10 @@
     @Override
     public List<Extract> list(ExtractQuery extractQuery, int page, int pageSize) {
         DaoQuery daoQuery = new DaoQuery();
-        try {
-            BeanUtil.copyProperties(extractQuery, daoQuery);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        daoQuery.uid = extractQuery.getUid();
+        daoQuery.minCreateTime = extractQuery.toStartTime();
+        daoQuery.maxCreateTime = extractQuery.toEndTime();
+        daoQuery.sortList = Arrays.asList(new String[]{"create_time desc"});
         daoQuery.start = (page - 1) * pageSize;
         daoQuery.count = pageSize;
         return extractMapper.list(daoQuery);
@@ -79,11 +79,9 @@
     @Override
     public long count(ExtractQuery extractQuery) {
         DaoQuery daoQuery = new DaoQuery();
-        try {
-            BeanUtil.copyProperties(extractQuery, daoQuery);
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        }
+        daoQuery.uid = extractQuery.getUid();
+        daoQuery.minCreateTime = extractQuery.toStartTime();
+        daoQuery.maxCreateTime = extractQuery.toEndTime();
         return extractMapper.count(daoQuery);
     }
 

--
Gitblit v1.8.0