From 3f3e3cf98ccddd3426b5d11d705a2ae573508d77 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期四, 26 十月 2023 14:33:53 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/~whyclxw/CadDrawManager

---
 src/main/java/com/whyc/service/WorksheetMainService.java |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/whyc/service/WorksheetMainService.java b/src/main/java/com/whyc/service/WorksheetMainService.java
index 924551c..4357d74 100644
--- a/src/main/java/com/whyc/service/WorksheetMainService.java
+++ b/src/main/java/com/whyc/service/WorksheetMainService.java
@@ -892,4 +892,32 @@
             e.printStackTrace();
         }*/
     }
+
+    /**
+     * 鏌ヨ鎵�鏈夌殑宸ュ崟,鎵�鏈変汉鍙
+     * @param param
+     * @return
+     */
+    public Response getAllPage(WorksheetMain param) {
+        Integer pageNum = param.getPageNum();
+        Integer pageSize = param.getPageSize();
+        PageHelper.startPage(pageNum,pageSize);
+
+        int createUserId = param.getCreateUserId().intValue();
+        Date beginTime = param.getBeginTime();
+        Date endTime = param.getEndTime();
+        Integer type = param.getType();
+        QueryWrapper<WorksheetMain> query = Wrappers.query();
+        if(createUserId>0){
+            query.eq("create_user_id",createUserId);
+        }
+        query.ge("begin_time",beginTime);
+        query.le("begin_time",endTime);
+        if(type!=null && type>=0){
+            query.eq("type",type);
+        }
+        List<WorksheetMain> worksheetMains = mainMapper.selectList(query);
+        PageInfo pageInfo = new PageInfo(worksheetMains);
+        return new Response().set(1,pageInfo);
+    }
 }

--
Gitblit v1.9.1