From ba6adfd27b202dd7484420c4d0fac6e7c2351c9a Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 22 一月 2026 14:16:51 +0800
Subject: [PATCH] yys 协同审批查询去掉租户id
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 32 ++++++++++++++++++++++++--------
1 files changed, 24 insertions(+), 8 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..8efd5f2 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,13 +58,16 @@
@Autowired
private DeviceRepairMapper deviceRepairMapper;
+ @Autowired
+ private SalesQuotationMapper salesQuotationMapper;
+
public ApproveProcess getApproveById(String id) {
LambdaQueryWrapper<ApproveProcess> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveProcess::getApproveId, id);
queryWrapper.eq(ApproveProcess::getApproveDelete, 0);
- queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
+// queryWrapper.eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId());
queryWrapper.last("limit 1");
ApproveProcess one = approveProcessMapper.selectOne(queryWrapper);
return one;
@@ -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());
@@ -98,14 +102,12 @@
LambdaQueryWrapper<ApproveNode> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ApproveNode::getApproveProcessId, id);
queryWrapper.eq(ApproveNode::getDeleteFlag, 0);
- queryWrapper.eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId());
List<ApproveNode> list = list(queryWrapper);
// 鎸夌収 approveNodeOrder 瀛楁鍗囧簭鎺掑簭
list.sort(Comparator.comparingInt(ApproveNode::getApproveNodeOrder));
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, id)
.eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
if(approveProcess != null && approveProcess.getApproveStatus() == 3){
@@ -131,7 +133,6 @@
LambdaQueryWrapper<ApproveProcess> approveProcessLambdaQueryWrapper = new LambdaQueryWrapper<>();
approveProcessLambdaQueryWrapper.eq(ApproveProcess::getApproveId, approveNode.getApproveProcessId())
.eq(ApproveProcess::getApproveDelete, 0)
- .eq(ApproveProcess::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.last("limit 1");
ApproveProcess approveProcess = approveProcessMapper.selectOne(approveProcessLambdaQueryWrapper);
if(approveProcess == null) throw new RuntimeException("瀹℃壒涓嶅瓨鍦�");
@@ -139,7 +140,6 @@
approveNodeLambdaQueryWrapper.eq(ApproveNode::getApproveProcessId, approveNode.getApproveProcessId())
.eq(ApproveNode::getApproveNodeOrder, approveNode.getApproveNodeOrder() + 1)
.eq(ApproveNode::getDeleteFlag, 0)
- .eq(ApproveNode::getTenantId, SecurityUtils.getLoginUser().getTenantId())
.last("limit 1");
ApproveNode approveNode1 = approveNodeMapper.selectOne(approveNodeLambdaQueryWrapper);
approveProcess.setApproveStatus(status);
@@ -163,6 +163,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