From f2b78d745d0a3c2604f0d60c30be815af315d53a Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 18 三月 2024 17:50:28 +0800
Subject: [PATCH] 修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
index 812878a..7ae9603 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java
@@ -852,20 +852,20 @@
String orgType = calibrationOrderService.findOrgType(productionCode);
if(ORG_TYPE_2.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ list = calibrationOrderService.getThisMonthMaintenanceList(area.getId(),"");
}else if(ORG_TYPE_3.equals(orgType)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
}
}
}else if(USER_TYPE_3.equals(userType)){
String code = calibrationOrderService.findProductionCode(user.getId());
if(StringUtils.isBlank(productionCode)){
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, code).eq(Area::getType, "1").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList(area.getId(),"");
+ list = calibrationOrderService.getThisMonthMaintenanceList(area.getId(),"");
}else{
Area area = areaService.getOne(new LambdaQueryWrapper<Area>().eq(Area::getNum, productionCode).eq(Area::getType, "3").eq(Area::getDelFlag, 0));
- list = calibrationOrderService.getReportRepairEquipmentList("",area.getId());
+ list = calibrationOrderService.getThisMonthMaintenanceList("",area.getId());
}
}
return Result.ok(list);
@@ -981,9 +981,9 @@
* qsw 2024-3-15
*/
@GetMapping("getTwoMaintenancePlanList")
- public Result<?> getTwoMaintenancePlanList() {
- List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList();
- return Result.ok();
+ public Result<?> getTwoMaintenancePlanList(String productionCode) {
+ List<Map<String, Object>> twoMaintenancePlanList = calibrationOrderService.getTwoMaintenancePlanList(productionCode);
+ return Result.ok(twoMaintenancePlanList);
}
}
--
Gitblit v1.9.3