From b5ef65d0103a71dc7af2b9be6d2ac43aca5bb726 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 27 八月 2024 08:59:57 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
index 1ddad21..ca23b4d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.PageDTO;
@@ -54,6 +55,10 @@
@Override
public PageDTO<SlAuditVO> getslAuditList(AuditRecordListQuery auditRecordListQuery) {
+ List<Long> rkglIds = new ArrayList<>();
+ List<Long> ckglIds = new ArrayList<>();
+ List<Long> zyglIds = new ArrayList<>();
+ List<Long> auditIds = new ArrayList<>();
Long userid = SecurityUtils.getUserId();
SysUser data = sysUserClient.getSysUser(userid).getData();
getVolumeProductionRkQuery getVolumeProductionRkQuer=new getVolumeProductionRkQuery();
@@ -73,13 +78,50 @@
goodsSkuIdList1.add(0L);
wrapper.in(SlAudit::getSysId,goodsSkuIdList1);
}
- if (!data.getUserType().equals("00")){
- wrapper.in(SlAudit::getShenhId,userid);
+
+ switch (auditRecordListQuery.getType()){
+ case 1:
+ rkglIds = slVolumeProductionRkglMapper.selectList(new QueryWrapper<SlVolumeProductionRkgl>()
+ .ne("audit_status", 7)).stream().map(SlVolumeProductionRkgl::getId).collect(Collectors.toList());
+ wrapper.in(SlAudit::getRkId,rkglIds);
+ if (!data.getUserType().equals("00")){
+ // 只查询相关的审核
+ auditIds = slAuditRecordMapper.selectList(new QueryWrapper<SlAuditRecord>()
+ .like("shenh_id", data.getUserId())).stream().map(SlAuditRecord::getAuditId).collect(Collectors.toList());
+ wrapper.in(SlAudit::getId,auditIds);
+ }
+
+ break;
+ case 2:
+ ckglIds = slVolumeProductionCKglMapper.selectList(new QueryWrapper<SlVolumeProductionCkgl>()
+ .ne("audit_status", 8)).stream().map(SlVolumeProductionCkgl::getId).collect(Collectors.toList());
+ wrapper.in(SlAudit::getRkId,ckglIds);
+ if (!data.getUserType().equals("00")){
+ // 只查询相关的审核
+ auditIds = slAuditRecordMapper.selectList(new QueryWrapper<SlAuditRecord>()
+ .like("shenh_id", data.getUserId())).stream().map(SlAuditRecord::getAuditId).collect(Collectors.toList());
+ wrapper.in(SlAudit::getId,auditIds);
+ }
+
+ break;
+ case 3:
+ zyglIds = slVolumeProductionZyglMapper.selectList(new QueryWrapper<SlVolumeProductionZygl>()
+ .ne("audit_status", 7)).stream().map(SlVolumeProductionZygl::getId).collect(Collectors.toList());
+ wrapper.in(SlAudit::getRkId,zyglIds);
+ if (!data.getUserType().equals("00")){
+ // 只查询相关的审核
+ auditIds = slAuditRecordMapper.selectList(new QueryWrapper<SlAuditRecord>()
+ .like("shenh_id", data.getUserId())).stream().map(SlAuditRecord::getAuditId).collect(Collectors.toList());
+ wrapper.in(SlAudit::getId,auditIds);
+ }
+
+ break;
}
wrapper.eq(SlAudit::getType,auditRecordListQuery.getType());
wrapper.eq(SlAudit::getDelFlag,0);
wrapper.orderByDesc(SlAudit::getCreateTime);
Page<SlAudit> page1 = this.page(page, wrapper);
+
PageDTO<SlAuditVO> slEquipmentVOPageDTO = PageDTO.of(page1, SlAuditVO.class);
List<SlAuditVO> list = slEquipmentVOPageDTO.getList();
for (SlAuditVO sl:list){
--
Gitblit v1.7.1