From cf7f2a00eb4e5fbfe90a403f6543d67daf447ff8 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期四, 21 七月 2022 09:51:36 +0800
Subject: [PATCH] 更新工作流
---
src/main/java/com/whyc/service/DocLogService.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/service/DocLogService.java b/src/main/java/com/whyc/service/DocLogService.java
index c0fa527..fe06c07 100644
--- a/src/main/java/com/whyc/service/DocLogService.java
+++ b/src/main/java/com/whyc/service/DocLogService.java
@@ -100,12 +100,29 @@
mapper.insert(docLog);
}
//鏃ュ織鏌ヨ
- public Response searchLog(int pageCurr, int pageSize) {
+ public Response searchLog(DocLog docLog,int pageCurr, int pageSize) {
PageHelper.startPage(pageCurr,pageSize);
QueryWrapper wrapper=new QueryWrapper();
- wrapper.notIn("oprate_type", UserOperation.TYPE_EXCEPTION.getType());
+ if(docLog!=null){
+ if(docLog.getName()!=null&&docLog.getName()!=""){
+ wrapper.like("name",docLog.getName());
+ }
+ if(docLog.getOprateType()!=null){
+ wrapper.eq("oprate_type",docLog.getOprateType());
+ }
+ if(docLog.getOprateDay()!=null){
+ wrapper.ge("oprate_day",docLog.getOprateDay());
+ }
+ if(docLog.getOprateDay2()!=null){
+ wrapper.le("oprate_day",docLog.getOprateDay2());
+ }
+ }
+ wrapper.ne("id", 0);
wrapper.orderByDesc("oprate_day");
- List list=mapper.selectList(wrapper);
+ List<DocLog> list=mapper.selectList(wrapper);
+ list.stream().forEach(dlog->{
+ dlog.setOperationTypeStr(UserOperation.getNameByType(dlog.getOprateType()));
+ });
PageInfo pageInfo=new PageInfo(list);
return new Response().setII(1,list.size()>0?true:false,pageInfo,"鏁版嵁杩斿洖");
}
--
Gitblit v1.9.1