From 454545bd4207d99d153e263c68f821f856f0e884 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 29 九月 2024 09:47:20 +0800
Subject: [PATCH] 430最终问题项修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 51 insertions(+), 4 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 6308a3a..1ee1cdb 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;
@@ -159,6 +160,9 @@
if(StringUtils.isNotBlank(equipment.getEquipmentCategoryId())){
queryWrapper.eq("equipment_category_id",equipment.getEquipmentCategoryId());
}
+ if(StringUtils.isNotBlank(equipment.getWorkCenterId())){
+ queryWrapper.eq("work_center_id",equipment.getWorkCenterId());
+ }
queryWrapper.isNull("line_id");
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
@@ -215,7 +219,7 @@
if(StringUtils.isNotBlank(equipment.getName())){
queryWrapper.like("name",equipment.getName());
}
- queryWrapper.eq("equipment_status","1");
+// queryWrapper.eq("equipment_status","1");
queryWrapper.in("technology_status","qualified","limitedUse");
queryWrapper.eq("status","1");
queryWrapper.eq("del_flag",0);
@@ -239,10 +243,33 @@
if(StringUtils.isNotBlank(equipment.getName())){
queryWrapper.like("name",equipment.getName());
}
- queryWrapper.eq("equipment_status","1");
+// queryWrapper.eq("equipment_status","1");
queryWrapper.in("technology_status","qualified","limitedUse");
queryWrapper.in("equipment_importance_id","A","B","C");
queryWrapper.eq("status","1");
+ queryWrapper.eq("del_flag",0);
+ queryWrapper.orderByDesc("create_time");
+
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
+
+
+ @ApiOperation(value="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ", notes="mom_eam_equipment-鍒嗛〉鍒楄〃鏌ヨ")
+ @GetMapping(value = "/queryEquipmentList")
+ public Result<IPage<Equipment>> queryEquipmentList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = new QueryWrapper<>();
+ if(StringUtils.isNotBlank(equipment.getNum())){
+ queryWrapper.like("num",equipment.getNum());
+ }
+ if(StringUtils.isNotBlank(equipment.getName())){
+ queryWrapper.like("name",equipment.getName());
+ }
+ queryWrapper.eq("use_id",equipment.getUseId());
queryWrapper.eq("del_flag",0);
queryWrapper.orderByDesc("create_time");
@@ -266,6 +293,22 @@
QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
+ return Result.OK(pageList);
+ }
+
+ /**
+ * 璁惧淇濅慨 鑾峰彇璁惧鍒楄〃缁勪欢
+ * qsw 2023-7-14
+ */
+ @GetMapping(value = "/getEquipmentTZList")
+ @PermissionData
+ public Result<IPage<Equipment>> getEquipmentTZList(Equipment equipment,
+ @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+ @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+ HttpServletRequest req) {
+ QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.getEquipmentTZList(page, equipment);
return Result.OK(pageList);
}
@@ -631,7 +674,9 @@
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;
@@ -841,12 +886,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