From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决

---
 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java |   53 +++++++++++++++++++++++++----------------------------
 1 files changed, 25 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..1ddad21 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());
@@ -145,6 +133,7 @@
             slAuditRecord.setShenhId(byId.getAdministratorId());
             slAuditRecord.setType(1);
             slAuditRecord.setState(1);
+            slAuditRecord.setCreateTime(new Date());
             slAuditRecordMapper.insert(slAuditRecord);
 
             SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -152,14 +141,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 +165,7 @@
             slAuditRecord.setShenhId(byId.getAdministratorId());
             slAuditRecord.setType(1);
             slAuditRecord.setState(1);
+            slAuditRecord.setCreateTime(new Date());
             slAuditRecordMapper.insert(slAuditRecord);
 
             SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -181,14 +173,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 +197,7 @@
             slAuditRecord.setShenhId(byId.getAdministratorId());
             slAuditRecord.setType(1);
             slAuditRecord.setState(1);
+            slAuditRecord.setCreateTime(new Date());
             slAuditRecordMapper.insert(slAuditRecord);
 
             SlAuditRecord slAuditRecord1=new SlAuditRecord();
@@ -210,14 +205,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