From 19dbb9026527cdfba75b74e8048c46781fe91c9f Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 15:10:15 +0800
Subject: [PATCH] 优化通知单审核后状态更新
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java | 2 ++
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/InoutNoticeService.java | 31 +++++++++++++++++++++++++++++++
fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java | 9 ++++++---
fzzy-igdss-core/src/main/java/com/fzzy/igds/data/NoticeParam.java | 2 ++
4 files changed, 41 insertions(+), 3 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/NoticeParam.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/NoticeParam.java
index a6b3a65..0c9c4f5 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/NoticeParam.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/data/NoticeParam.java
@@ -37,6 +37,8 @@
private String type;
+ private String auditStatus;
+
private Double weight;// 閲嶉噺淇℃伅
private Double taskNum = 0.0;
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..0d4ecbe 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.*;
@@ -90,6 +91,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 +223,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
@@ -269,6 +285,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 +368,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
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
index 63afee6..31f4d2c 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/work/service/WorkOrderService.java
@@ -5,6 +5,7 @@
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.mapper.InoutNoticeInMapper;
import com.fzzy.igds.mapper.InoutNoticeOutMapper;
+import com.fzzy.igds.service.InoutNoticeService;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.fzzy.work.data.WorkNode;
@@ -34,6 +35,8 @@
public class WorkOrderService {
@Resource
private WorkOrderMapper workOrderMapper;
+ @Resource
+ private InoutNoticeService noticeService;
@Resource
private InoutNoticeInMapper noticeInMapper;
@Resource
@@ -249,12 +252,12 @@
//鏇存柊鍏ュ簱閫氱煡鍗曠姸鎬�
if (work.getBizType().equals(WorkBizType.TYPE_10.getCode())) {
- noticeInMapper.auditComplete(work.getBusinessId(), work.getStatus());
+ noticeService.updateNoticeInStatus(work.getBusinessId(), work.getStatus());
}
- //鏇存柊鍏ュ簱閫氱煡鍗曠姸鎬�
+ //鏇存柊鍑哄簱閫氱煡鍗曠姸鎬�
if (work.getBizType().equals(WorkBizType.TYPE_20.getCode())) {
- noticeOutMapper.auditComplete(work.getBusinessId(), work.getStatus());
+ noticeService.updateNoticeOutStatus(work.getBusinessId(), work.getStatus());
}
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
index c7fa01f..11ca6bf 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/InoutNoticePR.java
@@ -13,6 +13,7 @@
import com.fzzy.igds.domain.InoutNoticeIn;
import com.fzzy.igds.domain.InoutNoticeOut;
import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.work.data.WorkStatus;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
@@ -261,6 +262,7 @@
NoticeParam noticeParam = new NoticeParam();
noticeParam.setCompanyId(ContextUtil.getCompanyId());
noticeParam.setDeptId(ContextUtil.subDeptId(null));
+ noticeParam.setAuditStatus(WorkStatus.STATUS_50.getCode());
noticeParam.setCompleteStatus(Constant.COMPLETE_STATUS_NONE);
String key = (String)param.get("key");
if (StringUtils.isNotEmpty(key)) {
--
Gitblit v1.9.3