From 6d21c8f6f4cc834c5d309a9ee5005158a31c0722 Mon Sep 17 00:00:00 2001
From: cuijian <cuijian@xalxzn.com>
Date: 星期二, 24 十月 2023 18:45:29 +0800
Subject: [PATCH] 问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 44 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 41 insertions(+), 3 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 af7bacf..d59dbe5 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
@@ -62,10 +62,10 @@
@Autowired
private IProcessParametersTemplateDetailService processParametersTemplateDetailService;
- @Autowired
+ @Autowired
private IEquipmentProcessParametersService equipmentProcessParametersService;
- @Autowired
+ @Autowired
private IEquipmentPrecisionParametersService equipmentPrecisionParametersService;
@Autowired
@@ -523,7 +523,8 @@
queryWrapper.in("equipment_status",statusList);
IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
return Result.OK(pageList);
- }/**
+ }
+ /**
* 瀵煎叆
* @return
*/
@@ -705,7 +706,33 @@
.setPropertyStatus(equipmentImportVo.getPropertyStatus())
.setWarrantyStart(equipmentImportVo.getWarrantyStart())
.setWarrantyEnd(equipmentImportVo.getWarrantyEnd())
+ .setNextTechnologyStatusQualificationTime(equipmentImportVo.getNextTechnologyStatusQualificationTime())
.setGpo(equipmentImportVo.getGpo());
+ if(equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")){
+ equipment.setCheckPeriod(365*4+"");
+ }
+ if(equipmentCategory.getEquipmentCategoryUda1().equals("tester")){
+ equipment.setCheckPeriod(365*1+"");
+ }
+ if(
+ !equipmentCategory.getEquipmentCategoryUda1().equals("weldingMachine")
+ &&!equipmentCategory.getEquipmentCategoryUda1().equals("filesCarousel")
+ &&!equipmentCategory.getEquipmentCategoryUda1().equals("tester")
+ ){
+ if(equipmentImportVo.getEquipmentImportanceId().equals("A")){
+ equipment.setCheckPeriod(365*3+"");
+ }
+ if(
+ equipmentImportVo.getEquipmentImportanceId().equals("B")
+ ||equipmentImportVo.getEquipmentImportanceId().equals("C")
+ ||equipmentImportVo.getEquipmentImportanceId().equals("D")
+ ){
+ equipment.setCheckPeriod(365*4+"");
+ }
+ }
equipmentService.save(equipment);
}else {
exceptionInfo = exceptionInfo+"绗�"+(i+2)+"琛屽鍏ュけ璐ワ紝鍘熷洜锛氱粺涓�缂栫爜宸插瓨鍦紝鏁版嵁閲嶅瀵煎叆;";
@@ -734,6 +761,17 @@
}
return Result.error("鏂囦欢瀵煎叆澶辫触锛�");
}
+ @GetMapping(value = "/getEquipmentStansdardList")
+ @PermissionData
+ public Result<IPage<DailyInspectionStandardDetail>> getEquipmentStansdardList(DailyInspectionStandardDetail standardDetail,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<DailyInspectionStandardDetail> queryWrapper = QueryGenerator.initQueryWrapper(standardDetail, req.getParameterMap());
+ Page<DailyInspectionStandardDetail> page = new Page<DailyInspectionStandardDetail>(pageNo, pageSize);
+ IPage<DailyInspectionStandardDetail> pageList = equipmentService.getStandardList(page,standardDetail.getEquipmentId());
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3