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 | 97 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 68 insertions(+), 29 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 c4e9fb4..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;
@@ -20,10 +21,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -57,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();
@@ -76,34 +78,63 @@
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;
}
- List state=new ArrayList<>();
- state.add(1);
- state.add(2);
- state.add(3);
- state.add(4);
- state.add(5);
- wrapper.eq(SlAudit::getState,state);
wrapper.eq(SlAudit::getType,auditRecordListQuery.getType());
- wrapper.eq( SlAudit::getDelFlag,0);
+ 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){
- SlAuditVO slAuditVO=new SlAuditVO();
SysUser data2 = sysUserClient.getSysUser(sl.getSysId()).getData();
- slAuditVO.setSysPhone(data2.getPhonenumber());
- slAuditVO.setSysName(data2.getNickName());
+ sl.setSysPhone(data2.getPhonenumber());
+ sl.setSysName(data2.getNickName());
SlStoreManagement byId = slStoreManagementService.getById(sl.getManagementId());
- slAuditVO.setStoreManagementName(byId.getStoreManagementName());
- slAuditVO.setStoreManagementNo(byId.getStoreManagementNo());
+ sl.setStoreManagementName(byId.getStoreManagementName());
+ sl.setStoreManagementNo(byId.getStoreManagementNo());
if (sl.getZymanagementId()!=null){
SlStoreManagement byId1 = slStoreManagementService.getById(sl.getZymanagementId());
- slAuditVO.setBstoreManagementName(byId1.getStoreManagementName());
- slAuditVO.setBstoreManagementNo(byId1.getStoreManagementNo());
+ sl.setBstoreManagementName(byId1.getStoreManagementName());
+ sl.setBstoreManagementNo(byId1.getStoreManagementNo());
}
}
return slEquipmentVOPageDTO;
@@ -127,11 +158,10 @@
}
this.removeById(page1);
}
-
-
SlAudit slAudit=new SlAudit();
slAudit.setType(slAuditDTO.getType());
slAudit.setState(1);
+ slAudit.setCreateTime(new Date());
slAudit.setRkId(slAuditDTO.getRkId());
if (slAudit.getType()==1){
SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAuditDTO.getRkId());
@@ -145,6 +175,7 @@
slAuditRecord.setShenhId(byId.getAdministratorId());
slAuditRecord.setType(1);
slAuditRecord.setState(1);
+ slAuditRecord.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord);
SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -152,14 +183,16 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecord1.setCreateTime(new Date());
+ slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
slAuditRecord2.setAuditId(slAudit.getId());
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecord2.setCreateTime(new Date());
+ slAuditRecordMapper.insert(slAuditRecord2);
}
if (slAudit.getType()==2){
@@ -174,6 +207,7 @@
slAuditRecord.setShenhId(byId.getAdministratorId());
slAuditRecord.setType(1);
slAuditRecord.setState(1);
+ slAuditRecord.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord);
SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -181,14 +215,16 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecord1.setCreateTime(new Date());
+ slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
slAuditRecord2.setAuditId(slAudit.getId());
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecord2.setCreateTime(new Date());
+ slAuditRecordMapper.insert(slAuditRecord2);
}
if (slAudit.getType()==3){
SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAuditDTO.getRkId());
@@ -203,6 +239,7 @@
slAuditRecord.setShenhId(byId.getAdministratorId());
slAuditRecord.setType(1);
slAuditRecord.setState(1);
+ slAuditRecord.setCreateTime(new Date());
slAuditRecordMapper.insert(slAuditRecord);
SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -210,14 +247,16 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecord1.setCreateTime(new Date());
+ slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
slAuditRecord2.setAuditId(slAudit.getId());
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecord2.setCreateTime(new Date());
+ slAuditRecordMapper.insert(slAuditRecord2);
}
}
--
Gitblit v1.7.1