From 8203359e4e68775b3ce0e540837bf3332d970798 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 09 五月 2025 11:38:49 +0800
Subject: [PATCH] art: 设备管理-维修看板-维修工排名统计
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
index 20a427c..3e184b8 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamDashboardController.java
@@ -13,10 +13,7 @@
import org.jeecg.modules.eam.constant.EquipmentMaintenanceStatus;
import org.jeecg.modules.eam.constant.EquipmentRepairStatus;
import org.jeecg.modules.eam.entity.EamEquipment;
-import org.jeecg.modules.eam.service.IEamEquipmentService;
-import org.jeecg.modules.eam.service.IEamInspectionOrderService;
-import org.jeecg.modules.eam.service.IEamReportRepairService;
-import org.jeecg.modules.eam.service.IEamWeekMaintenanceOrderService;
+import org.jeecg.modules.eam.service.*;
import org.jeecg.modules.eam.vo.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -43,9 +40,11 @@
private IEamWeekMaintenanceOrderService weekMaintenanceOrderService;
@Resource
private ObjectMapper objectMapper;
-
@Resource
private TranslateDictTextUtils translateDictTextUtils;
+ @Autowired
+ private IEamRepairOrderService repairOrderService;
+
@ApiOperation(value = "鐪嬫澘鎺ュ彛-缁翠繚鐘舵�佺粺璁�", notes = "鐪嬫澘鎺ュ彛-缁翠繚鐘舵�佺粺璁�")
@GetMapping(value = "/equipmentStatusStatistics")
@@ -194,6 +193,28 @@
@ApiOperation(value = "缁翠慨鐪嬫澘-缁翠慨宸ユ帓鍚�", notes = "缁翠慨鐪嬫澘-缁翠慨宸ユ帓鍚�")
@GetMapping(value = "/repairmanRanking")
public Result<?> repairmanRanking() {
- return null;
+ LocalDate today = LocalDate.now();
+ LocalDate end = today.plusDays(1);
+ LocalDate start = today.minusDays(30);
+ //鍙彇鍓�7鍚�
+ List<RepairmanRankingVO> list = repairOrderService.repairmanRanking(start.toString(), end.toString());
+ if(CollectionUtil.isEmpty(list)) {
+ return Result.ok(Collections.emptyList());
+ }
+ if(list.size() > 7) {
+ list = list.subList(0, 7);
+ }
+ List<JSONObject> items = new ArrayList<>();
+ try {
+ for(RepairmanRankingVO vo : list) {
+ String json = objectMapper.writeValueAsString(vo);
+ JSONObject item = JSONObject.parseObject(json, Feature.OrderedField);
+ translateDictTextUtils.translateField("repairer", vo.getRepairer(), item, "sys_user,realname,username");
+ items.add(item);
+ }
+ return Result.OK(items);
+ }catch (Exception e) {
+ return Result.error("鏁版嵁杞瘧澶辫触锛�");
+ }
}
}
--
Gitblit v1.9.3