From dfadab4fecc90bd2ad720dc67eba44c4b69b155a Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 05 三月 2025 10:05:40 +0800
Subject: [PATCH] art: 所有设备 台账 维修工单 根据设备id查询维修工单,并过滤掉已完成的维修工单

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java |   70 ++++++++++++++++++++++++++++++++---
 1 files changed, 64 insertions(+), 6 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
index 1ee1cdb..252c5aa 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -306,9 +306,41 @@
 													  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 													  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 													  HttpServletRequest req) {
-		 QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+		 //QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
 		 Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
 		 IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
+		 List<Equipment> list = pageList.getRecords();
+		 list.forEach(equip -> {
+			 String id = equip.getId();
+			 List<DailyInspectionStandard> dailyInspectionStandards = dailyInspectionStandardService.lambdaQuery()
+					 .eq(DailyInspectionStandard::getEquipmentId, id)
+					 .eq(DailyInspectionStandard::getVersionStatus, "2")
+					 .list();
+			 if (dailyInspectionStandards.size() > 0) {
+				 equip.setYseNoInspectionStandard("0");
+			 } else {
+				 equip.setYseNoInspectionStandard("1");
+			 }
+			 List<MaintenanceStandard> maintenance2Standards = maintenanceStandardService.lambdaQuery()
+					 .eq(MaintenanceStandard::getEquipmentId, id)
+					 .eq(MaintenanceStandard::getMaintenanceType, "2")
+					 .eq(MaintenanceStandard::getVersionStatus, "2").list();
+			 if (maintenance2Standards.size() > 0) {
+				 equip.setYseNoMaintenance2Standard("0");
+			 } else {
+				 equip.setYseNoMaintenance2Standard("1");
+			 }
+
+			 List<MaintenanceStandard> maintenance3Standards = maintenanceStandardService.lambdaQuery()
+					 .eq(MaintenanceStandard::getEquipmentId, id)
+					 .eq(MaintenanceStandard::getMaintenanceType, "3")
+					 .eq(MaintenanceStandard::getVersionStatus, "2").list();
+			 if (maintenance3Standards.size() > 0) {
+				 equip.setYseNoMaintenance3Standard("0");
+			 } else {
+				 equip.setYseNoMaintenance3Standard("1");
+			 }
+		 });
 		 return Result.OK(pageList);
 	 }
 
@@ -668,7 +700,9 @@
                      EquipmentImportVo equipmentImportVo = list.get(i);
 					 String equipmentCategoryName = equipmentImportVo.getEquipmentCategoryName();
 					 String useId = equipmentImportVo.getUseId();
-					 String areaId = equipmentImportVo.getFactoryModelId();
+					 String workCenterId = equipmentImportVo.getWorkCenterId();//涓績
+					 String areaId = equipmentImportVo.getFactoryModelId();//宸ュ尯
+					 String productionId = equipmentImportVo.getAreaId();//宸ユ
 					 String manageId = equipmentImportVo.getManageId();
 					 String constructorId = equipmentImportVo.getConstructorId();
 					 String teamId = equipmentImportVo.getTeamId();
@@ -701,13 +735,18 @@
 						 exceptionNum++;
 						 continue;
 					 }
-					 else if(StringUtils.isBlank(equipmentImportVo.getModel())){
-						 exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;";
+//					 else if(StringUtils.isBlank(equipmentImportVo.getModel())){
+//						 exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:璁惧鍨嬪彿缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;";
+//						 exceptionNum++;
+//						 continue;
+//					 }
+					 else if(StringUtils.isBlank(useId)){
+						 exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;";
 						 exceptionNum++;
 						 continue;
 					 }
-					 else if(StringUtils.isBlank(useId)){
-						 exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:浣跨敤閮ㄩ棬缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;";
+					 else if(StringUtils.isBlank(workCenterId)){
+						 exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓績缂哄け,璇峰~鍐欏繀濉」鍚庡啀瀵煎叆;";
 						 exceptionNum++;
 						 continue;
 					 }
@@ -793,6 +832,18 @@
 							 exceptionNum++;
 							 continue;
 						 }
+						 //涓績
+						 Area workCenterArea = areaService.getOne(new QueryWrapper<Area>().eq("name",workCenterId.trim()).eq("del_flag",0));
+						 if(ObjectUtils.isNotNull(workCenterArea)){
+							 equipment.setWorkCenterId(workCenterArea.getId());
+//						 }else if(ObjectUtils.isNotNull(area1)) {
+//							 equipment.setFactoryModelId(area1.getId());
+						 }else {
+							 exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:涓嶅瓨鍦ㄨ涓績,璇风淮鎶や腑蹇冩暟鎹悗鍐嶅鍏�;";
+							 exceptionNum++;
+							 continue;
+						 }
+						 //宸ュ尯
 						 Area area = areaService.getOne(new QueryWrapper<Area>().eq("name",areaId.trim()).eq("del_flag",0));
 						 Area area1 = areaService.getOne(new QueryWrapper<Area>().eq("num",areaId.trim()).eq("del_flag",0));
 						 if(ObjectUtils.isNotNull(area)){
@@ -804,6 +855,13 @@
 							 exceptionNum++;
 							 continue;
 						 }
+
+						 //宸ユ
+						 Area productionArea = areaService.getOne(new QueryWrapper<Area>().eq("name",productionId.trim()).eq("del_flag",0));
+						 if(ObjectUtils.isNotNull(productionArea)){
+							 equipment.setAreaId(productionArea.getId());
+						 }
+
 						 SysDepart manage = departService.getOne(new QueryWrapper<SysDepart>().eq("depart_name",manageId.trim()).eq("del_flag",0));
 						 if(ObjectUtils.isNotNull(manage)){
 							 equipment.setManageId(manage.getId());

--
Gitblit v1.9.3