From 1182b8b80bf3859cd962384ee4f01a43b1ecd139 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 01 九月 2025 16:09:50 +0800
Subject: [PATCH] 设备管理首页新增车间级控制权限
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 139 +++++++++++++++++++++++++---------------------
1 files changed, 76 insertions(+), 63 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
index abd8ec3..682dfd7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java
@@ -707,39 +707,41 @@
* @return
* */
@Override
- public List<EchartsDto> selectList() {
+ public List<EchartsDto> selectList(String productionCode) {
List<EchartsDto> echartsDtos = new ArrayList<>();
-
- // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (sysUser == null) {
- return echartsDtos; // 杩斿洖绌哄垪琛ㄨ�岄潪null
- }
-
QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
-
- // 璁惧杩囨护閫昏緫
- if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
- List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
- queryWrapper.in("e.equipment_code", equipArr);
- } else {
- List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService
- .list(new LambdaQueryWrapper<BaseFactoryUser>()
- .eq(BaseFactoryUser::getUserId, sysUser.getId()));
-
- if (CollectionUtils.isEmpty(baseFactoryUserList)) {
+ if (StrUtil.isEmpty(productionCode)) {
+ // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
return echartsDtos; // 杩斿洖绌哄垪琛ㄨ�岄潪null
}
-
- Set<String> factoryIds = baseFactoryUserList.stream()
- .map(BaseFactoryUser::getFactoryId)
- .collect(Collectors.toSet());
-
- Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds)
- .stream()
- .map(BaseFactory::getOrgCode)
- .collect(Collectors.toSet());
-
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
+ if (CollectionUtils.isEmpty(baseFactoryUserList)) {
+ return echartsDtos; // 杩斿洖绌哄垪琛ㄨ�岄潪null
+ }
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ }
+ }else {
+ //閫氳繃閫夋嫨鐨勮溅闂磋繃婊ゅ搴斾腑蹇�
+ List<BaseFactory> baseFactoryList = baseFactoryService.list(new LambdaQueryWrapper<BaseFactory>()
+ .like(BaseFactory::getRemark, productionCode).eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
+ if (CollectionUtils.isEmpty(baseFactoryList)) {
+ return echartsDtos;
+ }
+ //缁勮EAM鏁版嵁
+ Set<String> factoryCodes= new HashSet<>();
+ baseFactoryList.forEach(baseFactory -> {
+ List<BaseFactory> factoryList=baseFactoryService.queryFactoryByPid(baseFactory.getId());
+ factoryCodes.addAll(factoryList.stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()));
+ });
queryWrapper.in("e.factory_org_code", factoryCodes);
}
@@ -813,37 +815,41 @@
* @return
*/
@Override
- public IPage<EamThirdMaintenanceOrder> maintenanceList(String code, Page<EamThirdMaintenanceOrder> page){
- // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
- LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (sysUser == null) {
- return null;
- }
-
+ public IPage<EamThirdMaintenanceOrder> maintenanceList(String code,String productionCode, Page<EamThirdMaintenanceOrder> page){
+ IPage<EamThirdMaintenanceOrder> eamThirdMaintenanceOrderIPage=new Page<>();
QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
-
- // 璁惧杩囨护閫昏緫
- if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
- List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
- queryWrapper.in("e.equipment_code", equipArr);
- } else {
- List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService
- .list(new LambdaQueryWrapper<BaseFactoryUser>()
- .eq(BaseFactoryUser::getUserId, sysUser.getId()));
-
- if (CollectionUtils.isEmpty(baseFactoryUserList)) {
- return null;
+ if (StrUtil.isEmpty(productionCode)) {
+ // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
+ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+ if (sysUser == null) {
+ return eamThirdMaintenanceOrderIPage; // 杩斿洖绌哄垪琛ㄨ�岄潪null
}
-
- Set<String> factoryIds = baseFactoryUserList.stream()
- .map(BaseFactoryUser::getFactoryId)
- .collect(Collectors.toSet());
-
- Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds)
- .stream()
- .map(BaseFactory::getOrgCode)
- .collect(Collectors.toSet());
-
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.list(new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId()));
+ if (CollectionUtils.isEmpty(baseFactoryUserList)) {
+ return eamThirdMaintenanceOrderIPage; // 杩斿洖绌哄垪琛ㄨ�岄潪null
+ }
+ Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
+ Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ queryWrapper.in("e.factory_org_code", factoryCodes);
+ }
+ }else {
+ //閫氳繃閫夋嫨鐨勮溅闂磋繃婊ゅ搴斾腑蹇�
+ List<BaseFactory> baseFactoryList = baseFactoryService.list(new LambdaQueryWrapper<BaseFactory>()
+ .like(BaseFactory::getRemark, productionCode).eq(BaseFactory::getDelFlag, CommonConstant.DEL_FLAG_0.toString()));
+ if (CollectionUtils.isEmpty(baseFactoryList)) {
+ return eamThirdMaintenanceOrderIPage;
+ }
+ //缁勮EAM鏁版嵁
+ Set<String> factoryCodes= new HashSet<>();
+ baseFactoryList.forEach(baseFactory -> {
+ List<BaseFactory> factoryList=baseFactoryService.queryFactoryByPid(baseFactory.getId());
+ factoryCodes.addAll(factoryList.stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet()));
+ });
queryWrapper.in("e.factory_org_code", factoryCodes);
}
queryWrapper.orderByDesc("wmo.create_time");
@@ -852,23 +858,30 @@
switch (code){
case "bysbzs":
// 鏈湀涓変繚璁″垝鎬绘暟
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth));
+ break;
case "bwc":
// 鏈湀瀹屾垚
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth)
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", currentYearMonth)
.eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name()));
+ break;
case "xysb":
// 涓嬫湀涓変繚璁″垝
String nextMonth = LocalDate.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM"));
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextMonth));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextMonth));
+ break;
case "xxysb":
// 涓嬩笅鏈堜笁淇濊鍒�
String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM"));
- return this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextNextMonth));
+ eamThirdMaintenanceOrderIPage=this.baseMapper.queryPageList(page,queryWrapper.clone().like("maintenance_date", nextNextMonth));
+ break;
default:
break;
}
- return null;
+ eamThirdMaintenanceOrderIPage.getRecords().forEach(eamThirdMaintenanceOrder -> {
+ eamThirdMaintenanceOrder.setTechnologyStatus(eamEquipmentExtendService.getById(eamThirdMaintenanceOrder.getEquipmentId()).getTechnologyStatus());
+ });
+ return eamThirdMaintenanceOrderIPage;
}
/**
--
Gitblit v1.9.3