From 5667d14c708f9244fe2419707f98ff472ca23480 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 30 七月 2024 16:30:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java | 44 ++++++++++++++++----------------------------
1 files changed, 16 insertions(+), 28 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..4e872f8 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
@@ -20,10 +20,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;
/**
@@ -76,34 +73,26 @@
goodsSkuIdList1.add(0L);
wrapper.in(SlAudit::getSysId,goodsSkuIdList1);
}
- if (!data.getUserType().equals(00)){
+ if (!data.getUserType().equals("00")){
wrapper.in(SlAudit::getShenhId,userid);
}
- 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 +116,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());
@@ -152,14 +140,14 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
slAuditRecord2.setAuditId(slAudit.getId());
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecordMapper.insert(slAuditRecord2);
}
if (slAudit.getType()==2){
@@ -181,14 +169,14 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
slAuditRecord2.setAuditId(slAudit.getId());
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecordMapper.insert(slAuditRecord2);
}
if (slAudit.getType()==3){
SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAuditDTO.getRkId());
@@ -210,14 +198,14 @@
slAuditRecord1.setShenhId(byId.getCompetentId());
slAuditRecord1.setType(2);
slAuditRecord1.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecordMapper.insert(slAuditRecord1);
SlAuditRecord slAuditRecord2=new SlAuditRecord();
slAuditRecord2.setAuditId(slAudit.getId());
slAuditRecord2.setShenhId(byId.getDirectorId());
slAuditRecord2.setType(3);
slAuditRecord2.setState(1);
- slAuditRecordMapper.insert(slAuditRecord);
+ slAuditRecordMapper.insert(slAuditRecord2);
}
}
--
Gitblit v1.7.1