From a7ecb4b14c2e5a56f425f46decc9c203580edd35 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 25 七月 2024 10:56:56 +0800
Subject: [PATCH] 小修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java | 63 ++++++++++++++++++++++++++++++-
1 files changed, 61 insertions(+), 2 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 6b0ee06..18dfb59 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
@@ -159,6 +159,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 +218,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 +242,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 +292,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);
}
@@ -1008,5 +1050,22 @@
}
return Result.ok(equipmentListAllStandards);
}
+ @GetMapping(value = "/planEquipmentList")
+ @PermissionData
+ public Result<IPage<Equipment>> planEquipmentList(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());
+ //鏍规嵁涓嬫涓変繚鏃堕棿鎺掑簭
+ queryWrapper.orderByAsc("next_third_maintenance_time");
+ //濡傛灉startTime鍜宔ndTime涓嶄负绌猴紝鍒欐煡璇笅娆′笁淇濇椂闂村湪杩欎釜鏃堕棿娈靛唴鐨勮澶�
+ if(equipment.getStartTime()!=null && equipment.getEndTime()!=null){
+ queryWrapper.between("next_third_maintenance_time",equipment.getStartTime(),equipment.getEndTime());
+ }
+ Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
+ IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
+ return Result.OK(pageList);
+ }
}
--
Gitblit v1.9.3