From 77c07fd5059ae9a6e447bb18ce3e5889fec41deb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 22 一月 2026 13:13:28 +0800
Subject: [PATCH] 流程审批bug
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 26 +++++++++++++++++++++++---
1 files changed, 23 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index 09c94a7..b303787 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -20,7 +20,10 @@
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.project.system.service.ISysNoticeService;
import com.ruoyi.sales.mapper.CommonFileMapper;
+import com.ruoyi.sales.mapper.SalesQuotationMapper;
+import com.ruoyi.sales.mapper.SalesQuotationProductMapper;
import com.ruoyi.sales.pojo.CommonFile;
+import com.ruoyi.sales.pojo.SalesQuotation;
import com.ruoyi.sales.service.impl.CommonFileServiceImpl;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +58,9 @@
@Autowired
private DeviceRepairMapper deviceRepairMapper;
+ @Autowired
+ private SalesQuotationMapper salesQuotationMapper;
+
public ApproveProcess getApproveById(String id) {
@@ -70,14 +76,12 @@
@Override
public void initApproveNodes(String approveUserIds,String approveID,Long tenantId) {
Long userId = SecurityUtils.getLoginUser().getUser().getUserId();
- ApproveProcess approve = getApproveById(approveID);
String[] names = approveUserIds.split(",");
- String approveId = approve.getApproveId();
for (int i = 0; i < names.length; i++) {
SysUser sysUser = sysUserMapper.selectUserById(Long.parseLong(names[i]));
if (sysUser == null) continue;
ApproveNode approveNode = new ApproveNode();
- approveNode.setApproveProcessId(approveId);
+ approveNode.setApproveProcessId(approveID);
approveNode.setApproveNodeOrder(i +1);
approveNode.setApproveNodeUser(sysUser.getNickName());
approveNode.setApproveNodeUserId(sysUser.getUserId());
@@ -163,6 +167,22 @@
}
deviceRepairMapper.updateById(deviceRepair);
}
+ // 閿�鍞姤浠风姸鎬佷慨鏀�
+ if(approveProcess.getApproveType().equals(6)){
+ SalesQuotation salesQuote = salesQuotationMapper.selectOne(new LambdaQueryWrapper<SalesQuotation>()
+ .eq(SalesQuotation::getQuotationNo, approveProcess.getApproveReason())
+ .last("limit 1"));
+ // 鍚屾剰
+ if(status.equals(2) && salesQuote != null){
+ salesQuote.setStatus("閫氳繃");
+ }else if(status.equals(3) && salesQuote != null){
+ salesQuote.setStatus("鎷掔粷");
+ }else if(status.equals(1) && salesQuote != null){
+ salesQuote.setStatus("瀹℃牳涓�");
+ }
+
+ salesQuotationMapper.updateById(salesQuote);
+ }
// 缁戝畾闄勪欢
if(!CollectionUtils.isEmpty(approveNode.getTempFileIds()) && approveNode.getApproveNodeStatus() == 1){
tempFileService.migrateTempFilesToFormal(approveNode.getId(), approveNode.getTempFileIds(), FileNameType.ApproveNode.getValue());
--
Gitblit v1.9.3