From e15f561a1f9eddfde503d59baf45a860b131928e Mon Sep 17 00:00:00 2001
From: fei.wang <wf18701153496@163.com>
Date: 星期三, 13 八月 2025 14:22:50 +0800
Subject: [PATCH] 更新最新版代码

---
 src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java |   45 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java b/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java
index b163f12..2fcf977 100644
--- a/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java
+++ b/src/main/java/com/flow/service/impl/TbFuwuqiServiceImpl.java
@@ -5,7 +5,9 @@
 import com.flow.mapper.CardMapper;
 import com.flow.mapper.TbFuwuqiMapper;
 import com.flow.pojo.Card;
+import com.flow.pojo.OperationLog;
 import com.flow.pojo.TbFuwuqi;
+import com.flow.service.OperationLogService;
 import com.flow.service.TbFuwuqiService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -27,37 +29,70 @@
     @Autowired
     TbFuwuqiMapper tbFuwuqiMapper;
 
+    @Autowired
+    OperationLogService operationLogService;
+
     @Override
-    public PageInfo<TbFuwuqi> FindTbFuwuqi(Integer page, Integer limit) {
+    public PageInfo<TbFuwuqi> FindTbFuwuqi(Integer page, Integer limit,String entry) {
+        System.out.println(entry);
         PageHelper.startPage(page, limit);
-        List<TbFuwuqi> cardList = this.tbFuwuqiMapper.findAllUsers();
-        PageInfo<TbFuwuqi> info = new PageInfo(cardList);
-        return info;
+        if (entry!=null&& entry!=""){
+            List<TbFuwuqi> cardList = this.tbFuwuqiMapper.findAllUsers(entry);
+            System.out.println(cardList.size());
+            PageInfo<TbFuwuqi> info = new PageInfo(cardList);
+            return info;
+        }else{
+            List<TbFuwuqi> cardList = this.tbFuwuqiMapper.findAllUsers1();
+            PageInfo<TbFuwuqi> info = new PageInfo(cardList);
+            return info;
+        }
+
     }
 
     public PageInfo<TbFuwuqi> findTbFuwuqiZi(String Zong, Integer page, Integer limit) {
 
         PageHelper.startPage(page, limit);
+        System.out.println("333333333333333");
+        System.out.println(Zong);
         List<TbFuwuqi> tbFuwuqiistList = this.tbFuwuqiMapper.findTbFuwuqiZi(Zong);
         PageInfo<TbFuwuqi> info = new PageInfo(tbFuwuqiistList);
         return info;
     }
 
     public int addTbFuwuqi(TbFuwuqi tbFuwuqi) {
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鏂板");
+        operationLog.setCaozuocontent("鏂板鏈嶅姟鍣細"+tbFuwuqi.getServername());
+        operationLog.setCaozuoname(tbFuwuqi.getCaozuoname());
+        tbFuwuqi.setEntryclerk(tbFuwuqi.getCaozuoname());
+        operationLogService.addOperationLog(operationLog);
         return ((TbFuwuqiMapper) this.baseMapper).insert(tbFuwuqi);
     }
 
     public int UpdateTbFuwuqi(TbFuwuqi tbFuwuqi) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("id", tbFuwuqi.getId());
+        TbFuwuqi tbFuwuqi1 = (TbFuwuqi)((TbFuwuqiMapper)this.baseMapper).selectOne(queryWrapper);
+//        OperationLog operationLog = new OperationLog();
+//        operationLog.setCaozuotype("淇敼");
+//        operationLog.setCaozuocontent("淇敼鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+//        operationLogService.addOperationLog(operationLog);
+
         return ((TbFuwuqiMapper) this.baseMapper).update(tbFuwuqi, queryWrapper);
     }
 
-    public int DeleteTbFuwuqi(String id) {
+    public int DeleteTbFuwuqi(String id ,String caozuoname) {
         QueryWrapper queryWrapper = new QueryWrapper();
         queryWrapper.eq("id", id);
         TbFuwuqi tbFuwuqi = new TbFuwuqi();
         tbFuwuqi.setNone("1");
+        TbFuwuqi tbFuwuqi1 = (TbFuwuqi)((TbFuwuqiMapper)this.baseMapper).selectOne(queryWrapper);
+        OperationLog operationLog = new OperationLog();
+        operationLog.setCaozuotype("鍒犻櫎");
+        operationLog.setCaozuocontent("鍒犻櫎鏈嶅姟鍣細"+tbFuwuqi1.getServername());
+        operationLog.setCaozuoname(caozuoname);
+
+        operationLogService.addOperationLog(operationLog);
         return ((TbFuwuqiMapper) this.baseMapper).update(tbFuwuqi, queryWrapper);
     }
 

--
Gitblit v1.9.3