From f012fc079c5f0d11be14db18f73bfa38b1b38a94 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期二, 04 三月 2025 16:12:33 +0800
Subject: [PATCH] art: 所有设备 台账 点检工单 根据设备id查询点检工单,并过滤掉已完成和已取消的点检工单
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 79 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 8 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 18dfb59..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
@@ -1,6 +1,7 @@
package org.jeecg.modules.eam.controller;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
@@ -305,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);
}
@@ -667,13 +700,17 @@
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();
String propertyStatus = equipmentImportVo.getPropertyStatus();
String abc = equipmentImportVo.getEquipmentImportanceId();
- if(StringUtils.isBlank(equipmentImportVo.getNum())){
+ Date thirdMaintenanceTime = equipmentImportVo.getThirdMaintenanceTime();
+ Date technologyStatusQualificationTime = equipmentImportVo.getTechnologyStatusQualificationTime();
+ if(StringUtils.isBlank(equipmentImportVo.getNum())){
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐�,鍘熷洜:缁熶竴缂栫爜缂哄け,璇峰～鍐欏繀濉」鍚庡啀瀵煎叆;";
exceptionNum++;
continue;
@@ -698,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;
}
@@ -790,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)){
@@ -801,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());
@@ -883,12 +944,14 @@
.setSourceCountry(equipmentImportVo.getSourceCountry())
.setModel(equipmentImportVo.getModel())
.setSpecification(equipmentImportVo.getSpecification())
- .setPropertyStatus(equipmentImportVo.getPropertyStatus())
+ .setPropertyStatus("normal")
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
.setIsLineEquip("no")
.setIsLine("no")
.setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
+ .setThirdMaintenanceTime(equipmentImportVo.getThirdMaintenanceTime())
+ .setTechnologyStatusQualificationTime(equipmentImportVo.getTechnologyStatusQualificationTime())
.setGpo(equipmentImportVo.getGpo());
if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
equipment.setCheckPeriod(365*3+"");
--
Gitblit v1.9.3