From 8ac3affc79126b0b8ec6f4f7e80b73a6b4a4634b Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 12 二月 2026 09:21:16 +0800
Subject: [PATCH] APP

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java |   44 +++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 43 insertions(+), 1 deletions(-)

diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
index a03f396..8aef70c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java
@@ -1,6 +1,7 @@
 package com.fzzy.igds.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.fzzy.igds.constant.Constant;
 import com.fzzy.igds.constant.InoutConstant;
 import com.fzzy.igds.data.*;
@@ -65,6 +66,11 @@
         param.setCompanyId(ContextUtil.getCompanyId());
 
         queryWrapper.eq("company_id", param.getCompanyId());
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.eq("dept_id", param.getDeptId());
+        }else {
+            queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
+        }
         if (StringUtils.isNotBlank(param.getCustomerName())) {
             queryWrapper.like("customer_name", param.getCustomerName());
         }
@@ -75,6 +81,7 @@
             queryWrapper.like("complete_status", param.getCompleteStatus());
         }
 
+        queryWrapper.orderByDesc("id");
         noticeInMapper.selectPage(page, queryWrapper);
     }
 
@@ -90,6 +97,9 @@
         }
         if (StringUtils.isNotBlank(param.getDeptId())) {
             queryWrapper.eq("dept_id", param.getDeptId());
+        }
+        if (StringUtils.isNotBlank(param.getAuditStatus())) {
+            queryWrapper.eq("audit_status", param.getAuditStatus());
         }
         if (StringUtils.isNotBlank(param.getCompleteStatus())) {
             queryWrapper.eq("complete_status", param.getCompleteStatus());
@@ -219,6 +229,18 @@
     }
 
     /**
+     * 鏇存柊瀹℃牳鐘舵��
+     * @param id
+     * @param status
+     */
+    public void updateNoticeInStatus(String id, String status) {
+        UpdateWrapper<InoutNoticeIn> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", id).set("audit_status", status);
+
+        noticeInMapper.update(null, updateWrapper);
+    }
+
+    /**
      *  - 鍒犻櫎鏁版嵁
      *
      * @param data
@@ -245,6 +267,11 @@
         param.setCompanyId(ContextUtil.getCompanyId());
 
         queryWrapper.eq("company_id", param.getCompanyId());
+        if (StringUtils.isNotBlank(param.getDeptId())) {
+            queryWrapper.eq("dept_id", param.getDeptId());
+        }else {
+            queryWrapper.likeRight("dept_id", ContextUtil.subDeptId(null));
+        }
         if (StringUtils.isNotBlank(param.getCustomerName())) {
             queryWrapper.like("customer_name", param.getCustomerName());
         }
@@ -254,7 +281,7 @@
         if (StringUtils.isNotBlank(param.getCompleteStatus())) {
             queryWrapper.like("complete_status", param.getCompleteStatus());
         }
-
+        queryWrapper.orderByDesc("id");
         noticeOutMapper.selectPage(page, queryWrapper);
     }
 
@@ -269,6 +296,9 @@
         }
         if (StringUtils.isNotBlank(param.getDeptId())) {
             queryWrapper.eq("dept_id", param.getDeptId());
+        }
+        if (StringUtils.isNotBlank(param.getAuditStatus())) {
+            queryWrapper.eq("audit_status", param.getAuditStatus());
         }
         if (StringUtils.isNotBlank(param.getCompleteStatus())) {
             queryWrapper.eq("complete_status", param.getCompleteStatus());
@@ -349,6 +379,18 @@
     }
 
     /**
+     * 鏇存柊瀹℃牳鐘舵��
+     * @param id
+     * @param status
+     */
+    public void updateNoticeOutStatus(String id, String status) {
+        UpdateWrapper<InoutNoticeOut> updateWrapper = new UpdateWrapper<>();
+        updateWrapper.eq("id", id).set("audit_status", status);
+
+        noticeOutMapper.update(null, updateWrapper);
+    }
+
+    /**
      * 鍒犻櫎鏁版嵁
      *
      * @param data

--
Gitblit v1.9.3