From a2f0f30bf158b6632e0d109276a78ca4831ea178 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 14 三月 2024 11:10:32 +0800
Subject: [PATCH] 问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/CalibrationOrderController.java | 84 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 84 insertions(+), 0 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 0598abc..ba43288 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
@@ -88,6 +88,9 @@
// private IUploadService uploadService;
private ISysBaseAPI sysBaseApi;
+
+ @Autowired
+ private IAreaService areaService;
/**
* 鍒嗛〉鍒楄〃鏌ヨ
*
@@ -671,4 +674,85 @@
calibrationOrderService.updateById(calibrationOrder);
return Result.OK("缂栬緫鎴愬姛!");
}
+
+ /**
+ *棣栭〉鎶�鏈姸鎬佹暟閲忕粺璁�
+ * qsw 2024-3-13
+ */
+ @GetMapping("getEquipmentTechnologyStatusList")
+ public Result<?> getEquipmentTechnologyStatusList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getEquipmentTechnologyStatusList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉璁惧鎶ヤ慨鎯呭喌缁熻
+ * qsw 2024-3-13
+ */
+ @GetMapping("getReportRepairEquipmentList")
+ public Result<?> getReportRepairEquipmentList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getReportRepairEquipmentList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉鏈湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getThisMonthMaintenanceList")
+ public Result<?> getThisMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getThisMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉涓嬫湀涓変繚璁″垝
+ * qsw 2024-3-14
+ */
+ @GetMapping("getNextMonthMaintenanceList")
+ public Result<?> getNextMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getNextMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
+ /**
+ *棣栭〉涓嬩笅鏈堜笁淇濊鍒�
+ * qsw 2024-3-14
+ */
+ @GetMapping("getNextNextMonthMaintenanceList")
+ public Result<?> getNextNextMonthMaintenanceList(@Param("factoryNum") String factoryNum) {
+ List<Area> areaList = areaService.lambdaQuery().eq(Area::getNum, factoryNum).eq(Area::getDelFlag, 0).list();
+ List<Map<String, Object>> list;
+ if(areaList.size()>0){
+ list = calibrationOrderService.getNextNextMonthMaintenanceList(areaList.get(0).getId());
+ }else{
+ list = null;
+ }
+ return Result.ok(list);
+ }
+
}
--
Gitblit v1.9.3