From e41c3a2f9f64516a455819cde40f825b6a5dd9ef Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 22 八月 2025 18:02:02 +0800 Subject: [PATCH] 设备管理首页 --- lxzn-module-eam/src/main/java/org/jeecg/modules/eam/service/impl/EamThirdMaintenanceOrderServiceImpl.java | 71 ++++++++++++++++++++++++----------- 1 files changed, 49 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..49c94db 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 @@ -19,6 +19,7 @@ import org.jeecg.common.constant.CommonConstant; import org.jeecg.common.constant.DataBaseConstant; import org.jeecg.common.exception.JeecgBootException; +import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.StrUtils; import org.jeecg.common.util.oConvertUtils; @@ -704,7 +705,7 @@ /** * 璁惧绠$悊棣栭〉-涓変繚璁″垝 * @return - */ + * */ @Override public List<EchartsDto> selectList() { List<EchartsDto> echartsDtos = new ArrayList<>(); @@ -747,34 +748,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.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(); + // 鏈湀涓変繚璁″垝鎬绘暟 - 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