From 064d686a81d8537cdcb462b2cd0743fbdfa9c663 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 01 九月 2025 16:46:54 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 163 +++++++++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 81 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 682dfd7..229d553 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
@@ -58,6 +58,7 @@
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.*;
+import java.util.function.Supplier;
import java.util.stream.Collectors;
/**
@@ -708,41 +709,62 @@
* */
@Override
public List<EchartsDto> selectList(String productionCode) {
- List<EchartsDto> echartsDtos = new ArrayList<>();
+ // 鎻愬墠鍒濆鍖栧洓涓粺璁￠」瀵硅薄锛岃缃粯璁ゅ��0
+ Map<String, EchartsDto> echartsMap = new LinkedHashMap<>();
+ echartsMap.put("bysbzs", new EchartsDto("bysbzs", "鏈湀涓変繚璁″垝鎬绘暟", "0", null, null));
+ echartsMap.put("bwc", new EchartsDto("bwc", "鏈湀瀹屾垚", "0", null, null));
+ echartsMap.put("xysb", new EchartsDto("xysb", "涓嬫湀涓変繚璁″垝", "0", null, null));
+ echartsMap.put("xxysb", new EchartsDto("xxysb", "涓嬩笅鏈堜笁淇濊鍒�", "0", null, null));
+
QueryWrapper<EamThirdMaintenanceOrder> queryWrapper = new QueryWrapper<>();
+ boolean hasValidCondition = false;
+
if (StrUtil.isEmpty(productionCode)) {
- // 鐢ㄦ埛鏁版嵁鏉冮檺妫�鏌�
LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
- if (sysUser == null) {
- return echartsDtos; // 杩斿洖绌哄垪琛ㄨ�岄潪null
- }
- // 璁惧杩囨护閫昏緫
- 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
+ if (sysUser != null) {
+ // 璁惧杩囨护閫昏緫
+ if (StringUtils.isNotBlank(sysUser.getEamEquipmentIds())) {
+ List<String> equipArr = Arrays.asList(sysUser.getEamEquipmentIds().split(","));
+ queryWrapper.in("e.equipment_code", equipArr);
+ hasValidCondition = true;
+ } else {
+ List<BaseFactoryUser> baseFactoryUserList = baseFactoryUserService.list(
+ new LambdaQueryWrapper<BaseFactoryUser>().eq(BaseFactoryUser::getUserId, sysUser.getId())
+ );
+ if (!CollectionUtils.isEmpty(baseFactoryUserList)) {
+ 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);
+ hasValidCondition = true;
+ }
}
- Set<String> factoryIds = baseFactoryUserList.stream().map(BaseFactoryUser::getFactoryId).collect(Collectors.toSet());
- Set<String> factoryCodes = baseFactoryService.listByIds(factoryIds).stream().map(BaseFactory::getOrgCode).collect(Collectors.toSet());
+ }
+ } 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)) {
+ Set<String> factoryCodes = new HashSet<>();
+ for (BaseFactory baseFactory : baseFactoryList) {
+ List<BaseFactory> factoryList = baseFactoryService.queryFactoryByPid(baseFactory.getId());
+ factoryCodes.addAll(factoryList.stream()
+ .map(BaseFactory::getOrgCode)
+ .collect(Collectors.toSet()));
+ }
queryWrapper.in("e.factory_org_code", factoryCodes);
+ hasValidCondition = true;
}
- }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);
+ }
+
+ // 濡傛灉娌℃湁鏈夋晥鏌ヨ鏉′欢锛岀洿鎺ヨ繑鍥為粯璁ゅ�煎垪琛�
+ if (!hasValidCondition) {
+ return new ArrayList<>(echartsMap.values());
}
// 鑾峰彇褰撳墠骞存湀鍜屼笅涓や釜鏈堢殑骞存湀瀛楃涓�
@@ -751,61 +773,40 @@
String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM"));
// 浠庡瓧鍏歌〃鑾峰彇閰嶇疆鍊�
- String bysbjh = sysDictService.queryEnableDictItemsByCode("eam_home_third_number_bysbzs").get(0).getValue();
- String bywc = sysDictService.queryEnableDictItemsByCode("eam_home_third_number_bwc").get(0).getValue();
- String xysb = sysDictService.queryEnableDictItemsByCode("eam_home_third_number_xysb").get(0).getValue();
- String xxysb = sysDictService.queryEnableDictItemsByCode("eam_home_third_number_xxysb").get(0).getValue();
+ Map<String, String> dictValues = new HashMap<>();
+ dictValues.put("bysbzs", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_bysbzs").get(0).getValue());
+ dictValues.put("bwc", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_bwc").get(0).getValue());
+ dictValues.put("xysb", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_xysb").get(0).getValue());
+ dictValues.put("xxysb", sysDictService.queryEnableDictItemsByCode("eam_home_third_number_xxysb").get(0).getValue());
- // 鏈湀涓変繚璁″垝鎬绘暟
- if ("0".equals(bysbjh)) {
- List<EamThirdMaintenanceOrder> currentMonthOrders = this.baseMapper.queryAsList(
- queryWrapper.clone().like("maintenance_date", currentYearMonth)
- );
- echartsDtos.add(new EchartsDto("bysbzs", "鏈湀涓変繚璁″垝鎬绘暟",
- String.valueOf(currentMonthOrders.size()), null, null));
+ // 鏇存柊缁熻椤癸紙浠呭湪閰嶇疆鍊间负"0"鏃舵煡璇㈠疄闄呮暟鎹級
+ updateEchartsValue(echartsMap, "bysbzs", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone().like("maintenance_date", currentYearMonth)).size());
+
+ updateEchartsValue(echartsMap, "bwc", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone()
+ .like("maintenance_date", currentYearMonth)
+ .eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name())
+ ).size());
+
+ updateEchartsValue(echartsMap, "xysb", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone().like("maintenance_date", nextMonth)).size());
+
+ updateEchartsValue(echartsMap, "xxysb", dictValues,
+ () -> this.baseMapper.queryAsList(queryWrapper.clone().like("maintenance_date", nextNextMonth)).size());
+
+ return new ArrayList<>(echartsMap.values());
+ }
+
+ // 杈呭姪鏂规硶锛氭洿鏂扮粺璁￠」鐨勫��
+ private void updateEchartsValue(Map<String, EchartsDto> echartsMap, String key,
+ Map<String, String> dictValues, Supplier<Integer> valueSupplier) {
+ if ("0".equals(dictValues.get(key))) {
+ int count = valueSupplier.get();
+ echartsMap.get(key).setValue(String.valueOf(count));
} else {
- echartsDtos.add(new EchartsDto("bysbzs", "鏈湀涓変繚璁″垝鎬绘暟",
- bysbjh, null, null));
+ echartsMap.get(key).setValue(dictValues.get(key));
}
-
- // 鏈湀瀹屾垚
- if ("0".equals(bywc)) {
- List<EamThirdMaintenanceOrder> currentMonthCompleted = this.baseMapper.queryAsList(
- queryWrapper.clone().like("maintenance_date", currentYearMonth)
- .eq("maintenance_status", ThirdMaintenanceStatusEnum.COMPLETE.name())
- );
- echartsDtos.add(new EchartsDto("bwc", "鏈湀瀹屾垚",
- String.valueOf(currentMonthCompleted.size()), null, null));
- } else {
- echartsDtos.add(new EchartsDto("bwc", "鏈湀瀹屾垚",
- bywc, null, null));
- }
-
- // 涓嬫湀涓変繚璁″垝
- if ("0".equals(xysb)) {
- List<EamThirdMaintenanceOrder> nextMonthOrders = this.baseMapper.queryAsList(
- queryWrapper.clone().like("maintenance_date", nextMonth)
- );
- echartsDtos.add(new EchartsDto("xysb", "涓嬫湀涓変繚璁″垝",
- String.valueOf(nextMonthOrders.size()), null, null));
- } else {
- echartsDtos.add(new EchartsDto("xysb", "涓嬫湀涓変繚璁″垝",
- xysb, null, null));
- }
-
- // 涓嬩笅鏈堜笁淇濊鍒�
- if ("0".equals(xxysb)) {
- List<EamThirdMaintenanceOrder> nextNextMonthOrders = this.baseMapper.queryAsList(
- queryWrapper.clone().like("maintenance_date", nextNextMonth)
- );
- echartsDtos.add(new EchartsDto("xxysb", "涓嬩笅鏈堜笁淇濊鍒�",
- String.valueOf(nextNextMonthOrders.size()), null, null));
- } else {
- echartsDtos.add(new EchartsDto("xxysb", "涓嬩笅鏈堜笁淇濊鍒�",
- xxysb, null, null));
- }
-
- return echartsDtos;
}
/**
--
Gitblit v1.9.3