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 |   30 ++++++++++++++++++++++++++----
 1 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/service/DocLogService.java b/src/main/java/com/whyc/service/DocLogService.java
index 72db61f..fe06c07 100644
--- a/src/main/java/com/whyc/service/DocLogService.java
+++ b/src/main/java/com/whyc/service/DocLogService.java
@@ -24,9 +24,10 @@
     @Autowired(required = false)
     private DocLogMapper mapper;
 
-    public void recordOperationLog(Long uId, Integer operationType, Date operationTime, String terminalIp, String operationMsg, String operationDetail) {
+    public void recordOperationLog(Long uId,String name, Integer operationType, Date operationTime, String terminalIp, String operationMsg, String operationDetail) {
         DocLog docLog=new DocLog();
         docLog.setId(uId.intValue());
+        docLog.setName(name);
         docLog.setOprateType(operationType);
         docLog.setOprateDay(operationTime);
         docLog.setTerminalIp(terminalIp);
@@ -99,13 +100,34 @@
         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,"鏁版嵁杩斿洖");
     }
+    //鎿嶄綔瀵瑰簲鍏崇郴
+    public Response getOperate() {
+        return new Response().setII(1,true,UserOperation.values(),"鏁版嵁杩斿洖");
+    }
 }

--
Gitblit v1.9.1