From 036a6d241cf1cfc0345ddf28e748a3d6deda08df Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 15 十二月 2025 20:35:09 +0800
Subject: [PATCH] 新增出入库审批页面

---
 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java |   76 +++++++++++++++----------------------
 1 files changed, 31 insertions(+), 45 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 7aba052..cd30cbe 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.fzzy.igds.constant.AuditStatus;
 import com.fzzy.igds.constant.Constant;
 import com.fzzy.igds.data.NoticeDto;
 import com.fzzy.igds.data.NoticeParam;
@@ -62,22 +63,22 @@
 
     /**
      * 鏍规嵁鏉′欢鏌ヨ
-     * @param companyId
-     * @param deptId
-     * @param completeStatus
      * @return
      */
-    public List<InoutNoticeIn> getNoticeIn(String companyId, String deptId, String completeStatus) {
+    public List<InoutNoticeIn> getNoticeIn(NoticeParam param) {
 
         QueryWrapper<InoutNoticeIn> queryWrapper = new QueryWrapper<>();
-        if(StringUtils.isNotBlank(companyId)){
-            queryWrapper.eq("company_id", companyId);
+        if(StringUtils.isNotBlank(param.getCompanyId())){
+            queryWrapper.eq("company_id", param.getCompanyId());
         }
-        if(StringUtils.isNotBlank(deptId)){
-            queryWrapper.eq("dept_id", deptId);
+        if(StringUtils.isNotBlank(param.getDeptId())){
+            queryWrapper.eq("dept_id", param.getDeptId());
         }
-        if(StringUtils.isNotBlank(completeStatus)){
-            queryWrapper.eq("complete_status", completeStatus);
+        if(StringUtils.isNotBlank(param.getCompleteStatus())){
+            queryWrapper.eq("complete_status", param.getCompleteStatus());
+        }
+        if(StringUtils.isNotBlank(param.getKey())){
+            queryWrapper.like("name", param.getKey());
         }
         queryWrapper.orderByDesc("create_time");
         
@@ -97,16 +98,6 @@
     }
 
     /**
-     * 鏌ヨ鏁版嵁
-     * @param companyId
-     * @param deptId
-     * @return
-     */
-    public List<InoutNoticeIn> listNoticeIn(String companyId, String deptId) {
-        return this.getNoticeIn(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
-    }
-
-    /**
      *  鏌ヨ鏁版嵁
      * @param companyId
      * @return
@@ -115,7 +106,10 @@
         if (StringUtils.isEmpty(companyId)) {
             companyId = ContextUtil.getCompanyId();
         }
-        return this.getNoticeIn(companyId, null, Constant.COMPLETE_STATUS_NONE);
+        NoticeParam param = new NoticeParam();
+        param.setCompanyId(companyId);
+        param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+        return this.getNoticeIn(param);
     }
 
     /**
@@ -130,7 +124,7 @@
             data.setUpdateTime(new Date());
             data.setCreateBy(ContextUtil.getLoginUserName());
             data.setCreateTime(new Date());
-            data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
+            data.setAuditStatus(AuditStatus.STATUS_10.getCode());
             data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
             noticeInMapper.insert(data);
         } else {
@@ -183,22 +177,21 @@
 
     /**
      * 鏍规嵁鏉′欢鏌ヨ
-     * @param companyId
-     * @param deptId
-     * @param completeStatus
      * @return
      */
-    public List<InoutNoticeOut> getNoticeOut(String companyId, String deptId, String completeStatus) {
-
+    public List<InoutNoticeOut> getNoticeOut(NoticeParam param) {
         QueryWrapper<InoutNoticeOut> queryWrapper = new QueryWrapper<>();
-        if(StringUtils.isNotBlank(companyId)){
-            queryWrapper.eq("company_id", companyId);
+        if(StringUtils.isNotBlank(param.getCompanyId())){
+            queryWrapper.eq("company_id", param.getCompanyId());
         }
-        if(StringUtils.isNotBlank(deptId)){
-            queryWrapper.eq("dept_id", deptId);
+        if(StringUtils.isNotBlank(param.getDeptId())){
+            queryWrapper.eq("dept_id", param.getDeptId());
         }
-        if(StringUtils.isNotBlank(completeStatus)){
-            queryWrapper.eq("complete_status", completeStatus);
+        if(StringUtils.isNotBlank(param.getCompleteStatus())){
+            queryWrapper.eq("complete_status", param.getCompleteStatus());
+        }
+        if(StringUtils.isNotBlank(param.getKey())){
+            queryWrapper.like("name", param.getKey());
         }
         queryWrapper.orderByDesc("create_time");
 
@@ -218,16 +211,6 @@
     }
 
     /**
-     * 鏌ヨ鏁版嵁
-     * @param companyId
-     * @param deptId
-     * @return
-     */
-    public List<InoutNoticeOut> listNoticeOut(String companyId, String deptId) {
-        return this.getNoticeOut(companyId, deptId, Constant.COMPLETE_STATUS_NONE);
-    }
-
-    /**
      * Mybatis-plus 鑾峰彇淇℃伅
      * @param companyId
      * @return
@@ -236,7 +219,10 @@
         if (StringUtils.isEmpty(companyId)) {
             companyId = ContextUtil.getCompanyId();
         }
-        return this.getNoticeOut(companyId, null,Constant.COMPLETE_STATUS_NONE);
+        NoticeParam param = new NoticeParam();
+        param.setCompanyId(companyId);
+        param.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
+        return this.getNoticeOut(param);
     }
 
     /**
@@ -251,7 +237,7 @@
             data.setUpdateTime(new Date());
             data.setCreateBy(ContextUtil.getLoginUserName());
             data.setCreateTime(new Date());
-            data.setAuditStatus(Constant.COMPLETE_STATUS_NONE);
+            data.setAuditStatus(AuditStatus.STATUS_10.getCode());
             data.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
             noticeOutMapper.insert(data);
         } else {

--
Gitblit v1.9.3