From 1417536733d34bd935e02d66c92c53d370461fed Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期一, 05 九月 2022 16:49:03 +0800
Subject: [PATCH] 根据物料id查询返回附件文件夹下所有的文件列表

---
 src/main/java/com/whyc/service/DocLogService.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whyc/service/DocLogService.java b/src/main/java/com/whyc/service/DocLogService.java
index fe06c07..ddd9465 100644
--- a/src/main/java/com/whyc/service/DocLogService.java
+++ b/src/main/java/com/whyc/service/DocLogService.java
@@ -67,33 +67,36 @@
         ExcelUtil.exportExcel("UserLog-"+now,"娴嬭瘯sheet1",columnTitleArr,value,new HSSFWorkbook(),response);
     }
 
-    public void record(long uId, int operationType, String msg) {
+    public void record(long uId,String name, int operationType, String msg) {
         DocLog docLog = new DocLog();
         docLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
         docLog.setOprateDay(new Date());
         docLog.setId((int)(uId));
+        docLog.setName(name);
         docLog.setOprateType(operationType);
         docLog.setOprateMsg(msg);
         mapper.insert(docLog);
     }
 
-    public void record(long uId, int operationType, String msg,String msgDetail) {
+    public void record(long uId,String name, int operationType, String msg,String msgDetail) {
         DocLog docLog = new DocLog();
         docLog.setTerminalIp(ActionUtil.getRequest().getRemoteAddr());
         docLog.setOprateDay(new Date());
         docLog.setId((int)(uId));
+        docLog.setName(name);
         docLog.setOprateType(operationType);
         docLog.setOprateMsg(msg);
         docLog.setOperationDetail(msgDetail);
         mapper.insert(docLog);
     }
 
-    public void record2(HttpServletRequest request, long uId, int operationType, String msg, String msgDetail) {
+    public void record2(HttpServletRequest request,long uId, String name, int operationType, String msg, String msgDetail) {
         DocLog docLog = new DocLog();
         docLog.setTerminalIp(request.getRemoteAddr());
         //userLog.setTerminalIp(request.getRemoteAddr());
         docLog.setOprateDay(new Date());
         docLog.setId((int)(uId));
+        docLog.setName(name);
         docLog.setOprateType(operationType);
         docLog.setOprateMsg(msg);
         docLog.setOperationDetail(msgDetail);
@@ -118,13 +121,14 @@
             }
         }
         wrapper.ne("id", 0);
+        wrapper.ne("oprate_type",UserOperation.TYPE_EXCEPTION.getType());
         wrapper.orderByDesc("oprate_day");
         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,"鏁版嵁杩斿洖");
+        return new Response().setII(1,list.size()>0,pageInfo,"鏁版嵁杩斿洖");
     }
     //鎿嶄綔瀵瑰簲鍏崇郴
     public Response getOperate() {

--
Gitblit v1.9.1