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/SlEquipmentServiceImpl.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 50 insertions(+), 0 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
index a20514e..9fbdf4c 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -15,10 +15,14 @@
import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.service.SlEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.system.api.domain.SeBei;
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;
/**
* <p>
@@ -102,6 +106,7 @@
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());
+ slEquipmentVO.setStoreManagementName(slStoreManagement.getStoreManagementName());
slEquipmentVO.setProvinceName(slStoreManagement.getProvinceName());
slEquipmentVO.setProvinceCode(slStoreManagement.getProvinceCode());
slEquipmentVO.setCountyName(slStoreManagement.getCountyName());
@@ -112,4 +117,49 @@
return slEquipmentVO;
}
+
+ @Override
+ public Integer getequipmente(SeBei seBei) {
+ LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
+
+ List<Long> arr=new ArrayList<>();
+ wrapper.eq(SlStoreManagement::getDelFlag,0);
+ wrapper.eq(SlStoreManagement::getAdministratorId,seBei.getUserId());
+ List<SlStoreManagement> page = slStoreManagementMapper.selectList(wrapper);
+ for (SlStoreManagement a:page){
+ arr.add(a.getId());
+ }
+ LambdaQueryWrapper< SlStoreManagement> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlStoreManagement::getDelFlag,0);
+ wrapper1.eq(SlStoreManagement::getCompetentId,seBei.getUserId());
+ List<SlStoreManagement> page1 = slStoreManagementMapper.selectList(wrapper1);
+ for (SlStoreManagement a1:page1){
+ arr.add(a1.getId());
+ }
+ LambdaQueryWrapper< SlStoreManagement> wrapper2= Wrappers.lambdaQuery();
+ wrapper2.eq(SlStoreManagement::getDelFlag,0);
+ wrapper2.eq(SlStoreManagement::getDirectorId,seBei.getUserId());
+ List<SlStoreManagement> page2 = slStoreManagementMapper.selectList(wrapper2);
+ for (SlStoreManagement a2:page2){
+ arr.add(a2.getId());
+ }
+ Set<Long> set = new HashSet<>(arr);
+ arr.clear();
+ arr.addAll(set);
+
+ int i=1;
+ for (Long arr1:arr){
+ LambdaQueryWrapper< SlEquipment> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(SlEquipment::getManagementId,arr1);
+ wrapper3.eq(SlEquipment::getEquipmentNum,seBei.getSebei());
+ wrapper3.eq( SlEquipment::getDelFlag,0);
+ List<SlEquipment> page3 = this.list( wrapper3);
+ if (page3.size()>0){
+ i=2;
+ break;
+ }
+
+ }
+ return i;
+ }
}
--
Gitblit v1.7.1