From ba11a11662a027e89f3e86d063b3234aeeb76d83 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 22 八月 2025 17:22:56 +0800 Subject: [PATCH] 设备管理首页 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 70 ++++++++++++++++++++++++----------- 1 files changed, 48 insertions(+), 22 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 ffdd2f4..f7736ea 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 @@ -704,7 +704,7 @@ /** * 璁惧绠$悊棣栭〉-涓変繚璁″垝 * @return - */ + * */ @Override public List<EchartsDto> selectList() { List<EchartsDto> echartsDtos = new ArrayList<>(); @@ -747,34 +747,60 @@ String nextMonth = LocalDate.now().plusMonths(1).format(DateTimeFormatter.ofPattern("yyyy-MM")); String nextNextMonth = LocalDate.now().plusMonths(2).format(DateTimeFormatter.ofPattern("yyyy-MM")); + // 浠庡瓧鍏歌〃鑾峰彇閰嶇疆鍊� + String bysbjh = sysDictService.queryDictTextByKey("eam_home_third_number_bysbzs", "bysbzs"); + String bywc = sysDictService.queryDictTextByKey("eam_home_third_number_bwc", "bwc"); + String xysb = sysDictService.queryDictTextByKey("eam_home_third_number_xysb", "xysb"); + String xxysb = sysDictService.queryDictTextByKey("eam_home_third_number_xxysb", "xxysb"); + // 鏈湀涓変繚璁″垝鎬绘暟 - List<EamThirdMaintenanceOrder> currentMonthOrders = this.baseMapper.queryAsList( - queryWrapper.clone().like("maintenance_date", currentYearMonth) - ); - echartsDtos.add(new EchartsDto("bysbzs", "鏈湀涓変繚璁″垝鎬绘暟", - String.valueOf(currentMonthOrders.size()), null, null)); + 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)); + } else { + echartsDtos.add(new EchartsDto("bysbzs", "鏈湀涓変繚璁″垝鎬绘暟", + bysbjh, null, null)); + } // 鏈湀瀹屾垚 - 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)); + 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)); + } // 涓嬫湀涓変繚璁″垝 - List<EamThirdMaintenanceOrder> nextMonthOrders = this.baseMapper.queryAsList( - queryWrapper.clone().like("maintenance_date", nextMonth) - ); - echartsDtos.add(new EchartsDto("xysb", "涓嬫湀涓変繚璁″垝", - String.valueOf(nextMonthOrders.size()), 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)); + } // 涓嬩笅鏈堜笁淇濊鍒� - List<EamThirdMaintenanceOrder> nextNextMonthOrders = this.baseMapper.queryAsList( - queryWrapper.clone().like("maintenance_date", nextNextMonth) - ); - echartsDtos.add(new EchartsDto("xxysb", "涓嬩笅鏈堜笁淇濊鍒�", - String.valueOf(nextNextMonthOrders.size()), 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